Second (last) part of multiple foodcoop installation.
* When before_filter select_foodcoop is activated, the database and configs will be loaded on each request. * Replaced APP_CONFIG with new Foodsoft.config method.
This commit is contained in:
parent
1c24127928
commit
ffc3adf907
18 changed files with 51 additions and 57 deletions
|
|
@ -17,7 +17,7 @@
|
|||
#logo
|
||||
%a{:href => "/"}
|
||||
<span>food</span>soft
|
||||
%span{:style => "color:white; font-size:45%; letter-spacing: -1px;"}= APP_CONFIG[:name]
|
||||
%span{:style => "color:white; font-size:45%; letter-spacing: -1px;"}= Foodsoft.config[:name]
|
||||
#nav= render :partial => 'layouts/main_tabnav'
|
||||
|
||||
#main
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
|
||||
--
|
||||
FoodSoft: <%= @foodsoftUrl %>
|
||||
Foodcoop-Homepage: <%= APP_CONFIG[:base_url] %>
|
||||
Hilfe/Help: <%= APP_CONFIG[:help_url] %>
|
||||
Foodcoop-Homepage: <%= Foodsoft.config[:base_url] %>
|
||||
Hilfe/Help: <%= Foodsoft.config[:help_url] %>
|
||||
|
|
@ -12,4 +12,4 @@
|
|||
= yield
|
||||
#meta
|
||||
Foodcoop
|
||||
= link_to_if APP_CONFIG[:homepage], APP_CONFIG[:name], APP_CONFIG[:homepage]
|
||||
= link_to_if Foodsoft.config[:homepage], Foodsoft.config[:name], Foodsoft.config[:homepage]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue