Merge pull request #55 from elijh/feature/new-ui

Feature/new ui

1 files changed, 16 insertions, 12 deletions

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e6d22f0..d5adca9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,23 +1,27 @@
+- @show_navigation = true if @show_navigation.nil? && logged_in?
 !!!
 %html
   %head
     %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
-      %title= content_for?(:title) ? yield(:title) : "Leap Web"
+      %title= html_title
       %meta{:content => content_for?(:description) ? yield(:description) : "Leap Web", :name => "description"}
         = stylesheet_link_tag "application", :media => "all"
         = javascript_include_tag "application"
         = csrf_meta_tags
         = yield(:head)
   %body
-    %header.navbar.navbar-fixed-top
-      %nav.navbar-inner
-        .container
-          = render 'layouts/navigation'
-    #main{:role => "main"}
-      .container
-        .content
-          .row
+    #masthead
+      - if logged_in?
+        = render 'layouts/masthead'
+      - elsif params[:controller] != 'home'
+        = render 'layouts/masthead_noauth'
+    #main
+      .container-fluid
+        - if logged_in?
+          .row-fluid
             .span12
-              = render 'layouts/messages'
-              = yield
-          %footer
+              = render 'layouts/header'
+        .row-fluid
+          = render 'layouts/content'
+    #footer
+      = render 'layouts/footer'