Merge branch 'develop' of github.com:amooma/GS5 into develop

2 files changed, 22 insertions, 21 deletions

diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index c498943..97bf483 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -1,18 +1,19 @@
-- cache(['application_footer', I18n.locale]) do
-  %footer
-    %ul{:class => 'nav nav-pills'}
-      - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil?
-        %li
-          %a{:href => '#', :rel => "tooltip", :title => "Build ##{GsParameter.get('GEMEINSCHAFT_BUILDNAME')}", :'data-trigger' => 'hover'}
-            = "Gemeinschaft Version #{GsParameter.get('GEMEINSCHAFT_VERSION')}"
-      - else
-        %li
-          %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft Version #{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 => '#', :rel => "tooltip", :title => "Build ##{GsParameter.get('GEMEINSCHAFT_BUILDNAME')}", :'data-trigger' => 'hover'}
+          = "GS #{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
+        = link_to t('misc.consulting'), "http://amooma.de"
+    - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user)
+      %li
+        = link_to 'GS5 Google Group', "https://groups.google.com/group/gs5-users/"
+      %li
+        =link_to t('misc.send_a_bugreport'), URI::escape("https://github.com/amooma/GS5/issues/new?title=Bugreport&body=URL which triggered the bugreport is: #{request.fullpath}\nGS5 buildname: #{(GsParameter.get('GEMEINSCHAFT_BUILDNAME').blank? ? 'unknown' : GsParameter.get('GEMEINSCHAFT_BUILDNAME'))}\n\nPlease provide your bugreport below this line and update the title of this issue to a more specific one.")
+    %li{:class => 'pull-right'}
+      = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de'
\ No newline at end of file
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 639a52a..c63c791 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -16,14 +16,14 @@
         %tbody
           %tr
             %td
-              %strong= t('users.show.user_name') + ":"
+              %strong= truncate(t('users.show.user_name'), :length => 7) + ":"
             %td
               = truncate(@user.user_name, :length => 14)
           %tr
             %td
-              %strong= t('users.show.email') + ":"
+              %strong= truncate(t('users.show.email'), :length => 7) + ":"
             %td
-              = truncate(@user.email, :length => 14)
+              = mail_to @user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + truncate(@user.email, :length => 16))
 
       %p.controls
         = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @tenant, :child => @user }