layout.html.erb in twitter-bootstrap-rails-2.1.4

- old
+ new

@@ -34,11 +34,11 @@
     <!-- Size should be 32 x 32 pixels -->
     <%%= favicon_link_tag 'images/favicon.ico', :rel => 'shortcut icon' %>
   </head>
   <body>
 
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-<%= layout_type %>-top">
       <div class="navbar-inner">
         <div class="<%= container_class %>">
           <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -73,27 +73,25 @@
           <%%= bootstrap_flash %>
           <%%= yield %>
         </div>
       </div><!--/row-->
       <%- else -%>
-      <div class="content">
         <div class="row">
-           <div class="span9">
-              <%%= yield %>
-            </div>
-            <div class="span3">
-              <div class="well sidebar-nav">
-                <h3>Sidebar</h3>
-                <ul class="nav nav-list">
-                  <li class="nav-header">Sidebar</li>
-                  <li><%%= link_to "Link1", "/path1"  %></li>
-                  <li><%%= link_to "Link2", "/path2"  %></li>
-                  <li><%%= link_to "Link3", "/path3"  %></li>
-                </ul>
-              </div><!--/.well -->
-            </div><!--/span-->
+          <div class="span9">
+             <%%= yield %>
+          </div>
+          <div class="span3">
+            <div class="well sidebar-nav">
+              <h3>Sidebar</h3>
+              <ul class="nav nav-list">
+                <li class="nav-header">Sidebar</li>
+                <li><%%= link_to "Link1", "/path1"  %></li>
+                <li><%%= link_to "Link2", "/path2"  %></li>
+                <li><%%= link_to "Link3", "/path3"  %></li>
+              </ul>
+            </div><!--/.well -->
+          </div><!--/span-->
         </div><!--/row-->
-      </div><!--/content-->
       <%- end -%>
 
       <footer>
         <p>&copy; Company 2012</p>
       </footer>