diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
| commit | 8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch) | |
| tree | 1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /app/views/layouts/_navbar.html.haml | |
| parent | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff) | |
| parent | 600574759573e48da9f5f82d4ff8a863b6830c95 (diff) | |
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'app/views/layouts/_navbar.html.haml')
| -rw-r--r-- | app/views/layouts/_navbar.html.haml | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index d6f08cb..c2d9946 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -7,15 +7,26 @@ %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"} %span.icon-bar %span.icon-bar - %span.icon-bar + %span.icon-bar - - if current_user - .nav-collapse.collapse - %ul.nav + .nav-collapse.collapse + %ul.nav + - if current_user && GemeinschaftSetup.any? && current_user.admin? + - if current_page?(page_help_path) + %li.active + =link_to 'Admin-Doku', page_help_path + - else + %li + =link_to 'Admin-Doku', 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 => "#about"} About - %li.pull_right - %a{:href => "#contact"} Contact + %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 %ul.nav.pull-right |