diff options
| author | spag <spag@golwen.net> | 2013-02-14 10:42:39 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-02-14 10:42:39 +0100 |
| commit | 41303b0a2a07b897f7373eebba25708da89085a1 (patch) | |
| tree | 88e48da31bdd92d80af76c18d0df992f7d09f91b /app/views/layouts/_navbar.html.haml | |
| parent | a1aafe9eec98f91fd76d104964ad98fcafc94a80 (diff) | |
| parent | a9bf3a7e1fd802025824668e477a5ec14ce81d5a (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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index 7084090..8e09859 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -28,9 +28,9 @@ - if current_user %ul.nav.pull-right - %li + %li.display - if current_user.image? - =image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded') + = image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded') - else - if current_user.male? = image_tag 'icons/user-male-16x.png', :class => 'img-rounded' @@ -39,15 +39,15 @@ - 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)} + %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} = current_user - else %li - %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} + %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} = current_user - if single_sign_on_system? == false %li - %a.navbar-link{:href => log_out_path} + %a.navbar-link{:href => log_out_path} %i.icon-off.icon-white - + |