From 18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 20:18:16 +0100 Subject: Started the migration to Twitter Bootstrap. --- app/views/layouts/_footer.html.haml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/views/layouts/_footer.html.haml (limited to 'app/views/layouts/_footer.html.haml') diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml new file mode 100644 index 0000000..dc74275 --- /dev/null +++ b/app/views/layouts/_footer.html.haml @@ -0,0 +1,3 @@ +%footer + %p + \© AMOOMA GmbH 2005 - #{Date.today.year.to_s} · Bachstr. 124 · 56566 Neuwied · Germany · #{mail_to 'info@amooma.de', 'info@amooma.de'} -- cgit v1.2.3 From 2ff26eb7e2649b15cac850bc0c4c0363211d3379 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 22:41:02 +0100 Subject: Footer --- app/views/layouts/_footer.html.haml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'app/views/layouts/_footer.html.haml') diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index dc74275..a0f2940 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,3 +1,13 @@ -%footer - %p - \© AMOOMA GmbH 2005 - #{Date.today.year.to_s} · Bachstr. 124 · 56566 Neuwied · Germany · #{mail_to 'info@amooma.de', 'info@amooma.de'} +- cache(['application_footer', I18n.locale]) do + %footer + %ul{:class => 'nav nav-pills'} + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) + %li + %a{:href => "http://amooma.de"} Support und Consulting + - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) + %li + %a{:href => "https://groups.google.com/group/gs5-users/"} Mailingliste + %li{:class => 'pull-right'} + = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de' \ No newline at end of file -- cgit v1.2.3 From 5d15c975b7d4509d786ab7b95ec61ed7ad166b14 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Tue, 22 Jan 2013 12:15:48 +0100 Subject: add GS_BUILDNAME as tooltip in the footer --- app/views/layouts/_footer.html.haml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/views/layouts/_footer.html.haml') diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index a0f2940..73f12e0 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,8 +1,12 @@ - cache(['application_footer', I18n.locale]) do %footer %ul{:class => 'nav nav-pills'} - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil? + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5", :ref => 'tooltip', :title => "Gemeinschaft Version " + GsParameter.get('GEMEINSCHAFT_VERSION') + "\nBuild #" + GsParameter.get('GEMEINSCHAFT_BUILDNAME')} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - else + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) %li %a{:href => "http://amooma.de"} Support und Consulting -- cgit v1.2.3 From 6f69c1a85055ec7c2515719d79d2a7a4e60cec50 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 15:31:47 +0100 Subject: UI improvements. --- app/views/layouts/_footer.html.haml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'app/views/layouts/_footer.html.haml') diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 73f12e0..61ea546 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,17 +1,17 @@ - cache(['application_footer', I18n.locale]) do - %footer - %ul{:class => 'nav nav-pills'} - - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil? - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5", :ref => 'tooltip', :title => "Gemeinschaft Version " + GsParameter.get('GEMEINSCHAFT_VERSION') + "\nBuild #" + GsParameter.get('GEMEINSCHAFT_BUILDNAME')} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - - else - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) - %li - %a{:href => "http://amooma.de"} Support und Consulting - - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) - %li - %a{:href => "https://groups.google.com/group/gs5-users/"} Mailingliste - %li{:class => 'pull-right'} - = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de' \ No newline at end of file + %footer + %ul{:class => 'nav nav-pills'} + - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil? + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5", :ref => 'tooltip', :title => "Gemeinschaft Version " + GsParameter.get('GEMEINSCHAFT_VERSION') + "\nBuild #" + GsParameter.get('GEMEINSCHAFT_BUILDNAME')} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - else + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) + %li + %a{:href => "http://amooma.de"} Support und Consulting + - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) + %li + %a{:href => "https://groups.google.com/group/gs5-users/"} Mailingliste + %li{:class => 'pull-right'} + = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de' \ No newline at end of file -- cgit v1.2.3