diff options
author | Peter Kozak <spag@golwen.net> | 2013-03-11 07:29:39 -0400 |
---|---|---|
committer | Peter Kozak <spag@golwen.net> | 2013-03-11 07:29:39 -0400 |
commit | 62293482479ff51c5044f536aa2aae88e5117f46 (patch) | |
tree | e4e643cabf14a58863715f8c112447b8e77e1fae /app/views/layouts/_navbar.html.haml | |
parent | 3e7b87d2839213cf5d29e2750b08a7b6cfd7d1c4 (diff) | |
parent | 64afdeacb1444b319abfcad6c9a8cfd656fe2dd4 (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/layouts/_navbar.html.haml')
-rw-r--r-- | app/views/layouts/_navbar.html.haml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index fe5f48f..3e1da1c 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -22,12 +22,8 @@ =t("call_histories.index.page_title") %li %a{:href => sip_account_voicemail_messages_path(current_user.sip_accounts.first)} - %i.icon-star.icon-white{:id => 'new_voicemail_indicator'} =t("voicemail_messages.index.page_title") - :javascript - $("#new_voicemail_indicator").hide() - = subscribe_to "/users/#{current_user.id}/messages/new" - + - if current_user %ul.nav.pull-right %li.display @@ -43,10 +39,18 @@ - if current_page?(tenant_user_path(current_user.current_tenant, current_user)) %li.active %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} + %i.icon-star.icon-white{:id => 'new_voicemail_or_fax_indicator'} + :javascript + $("#new_voicemail_or_fax_indicator").hide() + = subscribe_to "/users/#{current_user.id}/messages/new" = current_user - else %li %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} + %i.icon-star.icon-white{:id => 'new_voicemail_or_fax_indicator'} + :javascript + $("#new_voicemail_or_fax_indicator").hide() + = subscribe_to "/users/#{current_user.id}/messages/new" = current_user - if single_sign_on_system? == false |