default.html.haml in app_frame-0.5.7

- old
+ new

@@ -1,11 +1,10 @@
-- sidebar = render 'sidebar'
 !!! 5
 %html
   %head
     = render 'head'
-  %body
+  %body{:class => body_class}
     .navbar.navbar-inverse.navbar-fixed-top{:'data-dropdown'=>"dropdown"}
       .navbar-inner
         .container-fluid
           %a{:class=>"btn btn-navbar", :data => { :toggle => "collapse", :target => ".nav-collapse"}}
             %span.icon-bar
@@ -17,21 +16,19 @@
               = render 'top_menu'
             %ul.nav.pull-right
               = render 'secondary_menu'
     
     #main.container-fluid
-      - if sidebar.present?
-        .content
-          .page-header
-            = render 'page_header'
+      - if sidenav?
+        #sidenav
+          = sidenav
+      .page-header
+        = render 'page_header'
+      .row-fluid
+        %span{:class => "span#{content_cols}"}
           = render 'sub_menu'
           = render 'flashes'
           = yield
-        .sidebar
-          = sidebar
-      - else
-        .page-header
-          = render 'page_header'      
-        = render 'sub_menu'      
-        = render 'flashes'
-        = yield
-        
\ No newline at end of file
+        - if sidebar?
+          .span2.sidebar
+            = sidebar
+            