Merge remote-tracking branch 'upstream/pull/4221'

[rails.git] / app / views / layouts / _content.html.erb

diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb
index e6e737c216c94e0f7a92c4d56b0a600660ed0d87..cfb8d712cc7ebef8873640b03c6f1ebb151a467a 100644 (file)
--- a/app/views/layouts/_content.html.erb
+++ b/app/views/layouts/_content.html.erb
@@ -1,15 +1,19 @@
-<div id="content">
+<div id="content" class="<%= content_for :content_class %>">

   <% if content_for? :content %>
     <%= yield :content %>
   <% else %>
     <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
     <% if content_for? :heading %>
       <div class="content-heading">
   <% if content_for? :content %>
     <%= yield :content %>
   <% else %>
     <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
     <% if content_for? :heading %>
       <div class="content-heading">

-        <%= yield :heading %>
+        <div class="content-inner <%= yield :heading_class %>">
+          <%= yield :heading %>
+        </div>

       </div>
     <% end %>
     <div class="content-body">
       </div>
     <% end %>
     <div class="content-body">

-      <%= yield %>
+      <div class="content-inner">
+        <%= yield %>
+      </div>

     </div>
   <% end %>
 </div>
     </div>
   <% end %>
 </div>