summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_footer.html.haml4
-rw-r--r--app/views/layouts/_navbar.html.haml13
2 files changed, 8 insertions, 9 deletions
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index 97bf483..2703844 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -14,6 +14,6 @@
%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.")
+ =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'))} (#{GsParameter.get('GEMEINSCHAFT_VERSION')})\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
+ = link_to '© AMOOMA GmbH', 'http://amooma.de' \ No newline at end of file
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index c2d9946..7084090 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -14,18 +14,16 @@
- if current_user && GemeinschaftSetup.any? && current_user.admin?
- if current_page?(page_help_path)
%li.active
- =link_to 'Admin-Doku', page_help_path
+ =link_to t('navigation.admin_docu'), page_help_path
- else
%li
- =link_to 'Admin-Doku', page_help_path
+ =link_to t('navigation.admin_docu'), page_help_path
- if current_user && current_user.sip_accounts.any?
%li
%a{:href => sip_account_call_histories_path(current_user.sip_accounts.first)}
- %i.icon-list-alt.icon-white
=t("call_histories.index.page_title")
%li
%a{:href => sip_account_voicemail_messages_path(current_user.sip_accounts.first)}
- %i.icon-volume-up.icon-white
=t("voicemail_messages.index.page_title")
- if current_user
@@ -48,7 +46,8 @@
%a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
= current_user
- %li
- %a.navbar-link{:href => log_out_path}
- %i.icon-off.icon-white
+ - if single_sign_on_system? == false
+ %li
+ %a.navbar-link{:href => log_out_path}
+ %i.icon-off.icon-white