diff options
| author | spag <spag@golwen.net> | 2012-12-29 17:42:35 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2012-12-29 17:42:35 +0100 |
| commit | 5cf46b6467679ea0367cc0c00787f6f1c86560e4 (patch) | |
| tree | b3f314d1ba574e328f1ce5a27aeadb6ae32980d5 /app/views/layouts | |
| parent | 929e7a391f139ed827e9bd3bea339789a82de6d4 (diff) | |
| parent | 8d20201910b1915cffa495e6474d50f9c8e8331d (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/application.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f2aff0a..2c7faec 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -20,7 +20,6 @@ %body #container = render :partial => "shared/header" - = render :partial => "shared/system_message" = render :partial => "shared/flash", :locals => { :flash => flash} #content{:role => 'main'} @@ -33,14 +32,16 @@ %footer#main %ul + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GEMEINSCHAFT_VERSION} - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) %li - %a{:href => "http://www.amooma.de"} Kommerzieller Support und Consulting + %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) %li %a{:href => "https://groups.google.com/group/gs5-users/"} Kostenlose Mailingliste .amooma-logo %span brought to you by - %a{ :target => '_blank', :href => "http://www.amooma.de/" } Amooma + %a{ :target => '_blank', :href => "http://amooma.de/" } Amooma |