The layout no longer renders the right_column if there is no content …

…for it, and instead makes the main_content area fill all 12 grid columns
dipth · Sep 5, 2011 · 34c28e0 · 34c28e0
1 parent 8c1a10d
commit 34c28e0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -27,8 +27,10 @@
       </div>
       <div class="grid_12" id="main_content_container">
         <%= yield :above_content %>
-        <div class="grid_9 alpha" id="main_content"><%= yield %></div>
-        <div class="grid_3 omega right_column" id="right_column"><%= yield :right_column %></div>
+        <div class="<%= content_for?(:right_column) ? "grid_9 alpha" : "grid_12 alpha omega" %>" id="main_content"><%= yield %></div>
+        <% if content_for?(:right_column) %>
+          <div class="grid_3 omega right_column" id="right_column"><%= yield :right_column %></div>
+        <% end %>
         <%= yield :below_content %>
       </div>
     </div>