Error fix and some reformatting for Layouts/Rendering Guide

2 files changed, 131 insertions, 57 deletions

diff --git a/railties/doc/guides/html/layouts_and_rendering.html b/railties/doc/guides/html/layouts_and_rendering.html
index c650a3bc0b..1c9ef8ce24 100644
--- a/railties/doc/guides/html/layouts_and_rendering.html
+++ b/railties/doc/guides/html/layouts_and_rendering.html
@@ -642,6 +642,7 @@ end</tt></pre>
 <div class="para"><p>With those declarations, the <tt>inventory</tt> layout would be used only for the <tt>index</tt> method, the <tt>product</tt> layout would be used for everything else except the <tt>rss</tt> method, and the <tt>rss</tt> method will have its layout determined by the automatic layout rules.</p></div>

 <h5 id="_layout_inheritance">Layout Inheritance</h5>

 <div class="para"><p>Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example:</p></div>

+<div class="para"><p><tt>application.rb</tt>:</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 by Lorenzo Bettini

@@ -651,17 +652,35 @@ http://www.gnu.org/software/src-highlite -->
   layout <span style="color: #FF0000">"main"</span>

   <span style="font-style: italic"><span style="color: #9A1900">#...</span></span>

 <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

-

-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostsController <span style="color: #990000">&lt;</span> ApplicationController

+</tt></pre></div></div>

+<div class="para"><p><tt>posts_controller.rb</tt>:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostsController <span style="color: #990000">&lt;</span> ApplicationController

   <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>

 <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

-

-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> SpecialPostsController <span style="color: #990000">&lt;</span> PostsController

+</tt></pre></div></div>

+<div class="para"><p><tt>special_posts_controller.rb</tt>:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> SpecialPostsController <span style="color: #990000">&lt;</span> PostsController

   layout <span style="color: #FF0000">"special"</span>

   <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>

 <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>

-

-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> OldPostsController <span style="color: #990000">&lt;</span> SpecialPostsController

+</tt></pre></div></div>

+<div class="para"><p><tt>old_posts_controller.rb</tt>:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> OldPostsController <span style="color: #990000">&lt;</span> SpecialPostsController

   layout <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span>

 

   <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show

@@ -1195,26 +1214,33 @@ http://www.gnu.org/software/src-highlite -->
 <div class="para"><p>This would look for a partial named <tt>_link_area.html.erb</tt> and render it using the layout <tt>_graybar.html.erb</tt>. Note that layouts for partials follow the same leading-underscore naming as regular partials, and are placed in the same folder with the partial that they belong to (not in the master <tt>layouts</tt> folder).</p></div>

 <h4 id="_passing_local_variables">3.4.4. Passing Local Variables</h4>

 <div class="para"><p>You can also pass local variables into partials, making them even more powerful and flexible. For example, you can use this technique to reduce duplication between new and edit pages, while still keeping a bit of distinct content:</p></div>

+<div class="para"><p><tt>new.html.erb</tt>:</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 by Lorenzo Bettini

 http://www.lorenzobettini.it

 http://www.gnu.org/software/src-highlite -->

-<pre><tt>new.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>New zone<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>New zone<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

 &lt;%= error_messages_for :zone %&gt;

 &lt;%= render :partial =&gt; "form", :locals =&gt; { :button_label =&gt; "Create zone", :zone =&gt; @zone } %&gt;

-

-edit.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Editing zone<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

+</tt></pre></div></div>

+<div class="para"><p><tt>edit.html.erb</tt>:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Editing zone<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

 &lt;%= error_messages_for :zone %&gt;

 &lt;%= render :partial =&gt; "form", :locals =&gt; { :button_label =&gt; "Update zone", :zone =&gt; @zone } %&gt;

-

-_form.html.erb:

-

-&lt;% form_for(@zone) do |f| %&gt;

+</tt></pre></div></div>

+<div class="para"><p><tt>_form.html.erb:</tt></p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt>&lt;% form_for(zone) do |f| %&gt;

         <span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>

           <span style="font-weight: bold"><span style="color: #0000FF">&lt;b&gt;</span></span>Zone name<span style="font-weight: bold"><span style="color: #0000FF">&lt;/b&gt;&lt;br</span></span> <span style="font-weight: bold"><span style="color: #0000FF">/&gt;</span></span>

           &lt;%= f.text_field :name %&gt;

@@ -1253,19 +1279,22 @@ http://www.gnu.org/software/src-highlite -->
 <div class="para"><p>Assuming that the <tt>@customer</tt> instance variable contains an instance of the <tt>Customer</tt> model, this will use <tt>_customer.html.erb</tt> to render it.</p></div>

 <h4 id="_rendering_collections">3.4.5. Rendering Collections</h4>

 <div class="para"><p>Partials are very useful in rendering collections. When you pass a collection to a partial via the <tt>:collection</tt> option, the partial will be inserted once for each member in the collection:</p></div>

+<div class="para"><p><tt>index.html.erb</tt>:</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 by Lorenzo Bettini

 http://www.lorenzobettini.it

 http://www.gnu.org/software/src-highlite -->

-<pre><tt>index.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

 &lt;%= render :partial =&gt; "product", :collection =&gt; @products %&gt;

-

-_product.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Product Name: &lt;%= product.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>

+</tt></pre></div></div>

+<div class="para"><p><tt>_product.html.erb</tt>:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Product Name: &lt;%= product.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>

 </tt></pre></div></div>

 <div class="para"><p>When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is <tt>_product, and within the +_product</tt> partial, you can refer to <tt>product</tt> to get the instance that is being rendered. To use a custom local variable name within the partial, specify the <tt>:as</tt> option in the call to the partial:</p></div>

 <div class="listingblock">

@@ -1286,38 +1315,48 @@ http://www.gnu.org/software/src-highlite -->
 </tt></pre></div></div>

 <div class="para"><p>Rails will render the <tt>_product_ruler</tt> partial (with no data passed in to it) between each pair of <tt>_product</tt> partials.</p></div>

 <div class="para"><p>There's also a shorthand syntax available for rendering collections. For example, if <tt>@products</tt> is a collection of products, you can render the collection this way:</p></div>

+<div class="para"><p><tt>index.html.erb</tt>:</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 by Lorenzo Bettini

 http://www.lorenzobettini.it

 http://www.gnu.org/software/src-highlite -->

-<pre><tt>index.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

 &lt;%= render :partial =&gt; @products %&gt;

-

-_product.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Product Name: &lt;%= product.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>

+</tt></pre></div></div>

+<div class="para"><p><tt>_product.html.erb</tt>:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Product Name: &lt;%= product.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>

 </tt></pre></div></div>

 <div class="para"><p>Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection:</p></div>

+<div class="para"><p><tt>index.html.erb</tt>:</p></div>

 <div class="listingblock">

 <div class="content"><!-- Generator: GNU source-highlight 2.9

 by Lorenzo Bettini

 http://www.lorenzobettini.it

 http://www.gnu.org/software/src-highlite -->

-<pre><tt>index.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Contacts<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Contacts<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>

 &lt;%= render :partial =&gt; [customer1, employee1, customer2, employee2] %&gt;

-

-_customer.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Name: &lt;%= customer.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>

-

-_employee.html.erb:

-

-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Name: &lt;%= employee.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>

+</tt></pre></div></div>

+<div class="para"><p><tt>_customer.html.erb</tt>:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Name: &lt;%= customer.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>

+</tt></pre></div></div>

+<div class="para"><p><tt>_employee.html.erb</tt>:</p></div>

+<div class="listingblock">

+<div class="content"><!-- Generator: GNU source-highlight 2.9

+by Lorenzo Bettini

+http://www.lorenzobettini.it

+http://www.gnu.org/software/src-highlite -->

+<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Name: &lt;%= employee.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>

 </tt></pre></div></div>

 <div class="para"><p>In this case, Rails will use the customer or employee partials as appropriate for each member of the collection.</p></div>

 </div>

diff --git a/railties/doc/guides/source/layouts_and_rendering.txt b/railties/doc/guides/source/layouts_and_rendering.txt
index abf04d084d..2f39c70e8c 100644
--- a/railties/doc/guides/source/layouts_and_rendering.txt
+++ b/railties/doc/guides/source/layouts_and_rendering.txt
@@ -313,22 +313,39 @@ With those declarations, the +inventory+ layout would be used only for the +inde
 
 Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example:
 
++application.rb+:
+
 [source, ruby]
 -------------------------------------------------------
 class ApplicationController < ActionController::Base
   layout "main"
   #...
 end
+-------------------------------------------------------
+
++posts_controller.rb+:
 
+[source, ruby]
+-------------------------------------------------------
 class PostsController < ApplicationController
   # ...
 end
+-------------------------------------------------------
+
++special_posts_controller.rb+:
 
+[source, ruby]
+-------------------------------------------------------
 class SpecialPostsController < PostsController
   layout "special"
   # ...
 end
+-------------------------------------------------------
 
++old_posts_controller.rb+:
+
+[source, ruby]
+-------------------------------------------------------
 class OldPostsController < SpecialPostsController
   layout nil
 
@@ -777,23 +794,29 @@ This would look for a partial named +_link_area.html.erb+ and render it using th
 
 You can also pass local variables into partials, making them even more powerful and flexible. For example, you can use this technique to reduce duplication between new and edit pages, while still keeping a bit of distinct content:
 
++new.html.erb+:
+
 [source, html]
 -------------------------------------------------------
-new.html.erb:
-
 <h1>New zone</h1>
 <%= error_messages_for :zone %>
 <%= render :partial => "form", :locals => { :button_label => "Create zone", :zone => @zone } %>
+-------------------------------------------------------
 
-edit.html.erb:
++edit.html.erb+:
 
+[source, html]
+-------------------------------------------------------
 <h1>Editing zone</h1>
 <%= error_messages_for :zone %>
 <%= render :partial => "form", :locals => { :button_label => "Update zone", :zone => @zone } %>
+-------------------------------------------------------
 
-_form.html.erb:
++_form.html.erb:+
 
-<% form_for(@zone) do |f| %>
+[source, html]
+-------------------------------------------------------
+<% form_for(zone) do |f| %>
 	<p>
 	  <b>Zone name</b><br />
 	  <%= f.text_field :name %>
@@ -830,15 +853,18 @@ Assuming that the +@customer+ instance variable contains an instance of the +Cus
 
 Partials are very useful in rendering collections. When you pass a collection to a partial via the +:collection+ option, the partial will be inserted once for each member in the collection:
 
++index.html.erb+:
+
 [source, html]
 -------------------------------------------------------
-index.html.erb:
-
 <h1>Products</h1>
 <%= render :partial => "product", :collection => @products %>
+-------------------------------------------------------
 
-_product.html.erb:
++_product.html.erb+:
 
+[source, html]
+-------------------------------------------------------
 <p>Product Name: <%= product.name %></p>
 -------------------------------------------------------
 
@@ -862,33 +888,42 @@ Rails will render the +_product_ruler+ partial (with no data passed in to it) be
 
 There's also a shorthand syntax available for rendering collections. For example, if +@products+ is a collection of products, you can render the collection this way:
 
++index.html.erb+:
+
 [source, html]
 -------------------------------------------------------
-index.html.erb:
-
 <h1>Products</h1>
 <%= render :partial => @products %>
+-------------------------------------------------------
 
-_product.html.erb:
++_product.html.erb+:
 
+[source, html]
+-------------------------------------------------------
 <p>Product Name: <%= product.name %></p>
 -------------------------------------------------------
 
 Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection:
 
++index.html.erb+:
+
 [source, html]
 -------------------------------------------------------
-index.html.erb:
-
 <h1>Contacts</h1>
 <%= render :partial => [customer1, employee1, customer2, employee2] %>
+-------------------------------------------------------
 
-_customer.html.erb:
++_customer.html.erb+:
 
+[source, html]
+-------------------------------------------------------
 <p>Name: <%= customer.name %></p>
+-------------------------------------------------------
 
-_employee.html.erb:
++_employee.html.erb+:
 
+[source, html]
+-------------------------------------------------------
 <p>Name: <%= employee.name %></p>
 -------------------------------------------------------