Avatar

1 files changed, 28 insertions, 15 deletions

diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 4005e28..d6a8422 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -1,21 +1,34 @@
 .navbar.navbar-inverse.navbar-fixed-top
   .navbar-inner
-    .container-fluid
+    .container
+      %a.brand{:href => (current_user.nil? ? '/' : tenant_path(current_user.current_tenant))}
+        Gemeinschaft 5
+
       %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
         %span.icon-bar
         %span.icon-bar
-        %span.icon-bar
-      %a.brand{:href => (current_user.nil? ? '/' : tenant_path(current_user.current_tenant))} Gemeinschaft 5
-      .nav-collapse.collapse
-        %p.navbar-text.pull-right
-          - if current_user
-            %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} 
-              = current_user
-        %ul.nav
-          %li.active
-            %a{:href => "#"} Home
-          %li
-            %a{:href => "#about"} About
+        %span.icon-bar   
+
+      - if current_user
+        .nav-collapse.collapse
+          %ul.nav
+            %li
+              %a{:href => "#about"} About
+            %li.pull_right
+              %a{:href => "#contact"} Contact
+
+      - if current_user
+        %ul.nav.pull-right
+          - 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)} 
+                = current_user
+          - else
+            %li
+              %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} 
+                = current_user
+
           %li
-            %a{:href => "#contact"} Contact
-      / /.nav-collapse
+            %a.navbar-link{:href => log_out_path} 
+              %i.icon-off.icon-white
+