diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
index d4738ec19fcd8..556c2e5693278 100644
--- a/railties/guides/source/layouts_and_rendering.textile
+++ b/railties/guides/source/layouts_and_rendering.textile
@@ -130,7 +130,8 @@ render "/u/apps/warehouse_app/current/app/views/products/show"
Rails determines that this is a file render because of the leading slash character. To be explicit, you can use the +:file+ option (which was required on Rails 2.2 and earlier):
-render :file => "/u/apps/warehouse_app/current/app/views/products/show"
+render :file =>
+ "/u/apps/warehouse_app/current/app/views/products/show"
The +:file+ option takes an absolute file-system path. Of course, you need to have rights to the view that you're using to render the content.
@@ -144,7 +145,8 @@ h5. Using render with :inline
The +render+ method can do without a view completely, if you're willing to use the +:inline+ option to supply ERB as part of the method call. This is perfectly valid:
-render :inline => "<% products.each do |p| %>
<%= p.name %>
<% end %>"
+render :inline =>
+ "<% products.each do |p| %>
<%= p.name %>
<% end %>"
WARNING: There is seldom any good reason to use this option. Mixing ERB into your controllers defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. Use a separate erb view instead.
@@ -152,7 +154,8 @@ WARNING: There is seldom any good reason to use this option. Mixing ERB into you
By default, inline rendering uses ERb. You can force it to use Builder instead with the +:type+ option:
-render :inline => "xml.p {'Horrid coding practice!'}", :type => :builder
+render :inline =>
+ "xml.p {'Horrid coding practice!'}", :type => :builder
h5. Using render with :update
@@ -165,7 +168,7 @@ render :update do |page|
end
-WARNING: Placing javascript updates in your controller may seem to streamline small updates, but it defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. I recommend using a separate rjs template instead, no matter how small the update.
+WARNING: Placing javascript updates in your controller may seem to streamline small updates, but it defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. We recommend using a separate rjs template instead, no matter how small the update.
h5. Rendering Text
@@ -251,7 +254,7 @@ render :status => 500
render :status => :forbidden
-Rails understands either numeric status codes or symbols for status codes. You can find its list of status codes in +actionpack/lib/action_controller/status_codes.rb+. You can also see there how it maps symbols to status codes in that file.
+Rails understands either numeric status codes or symbols for status codes. You can find its list of status codes in +actionpack/lib/action_controller/status_codes.rb+. You can also see there how Rails maps symbols to status codes.
h6. The :location Option
@@ -263,7 +266,7 @@ render :xml => photo, :location => photo_url(photo)
h5. Finding Layouts
-To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +/app/views/layouts/photos.html.erb+. If there is no such controller-specific layout, Rails will use +/app/views/layouts/application.html.erb+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
+To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +/app/views/layouts/photos.html.erb+ (or +app/views/layouts/photos.builder+). If there is no such controller-specific layout, Rails will use +/app/views/layouts/application.html.erb+ ot +/app/views/layouts/application.builder+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
h6. Specifying Layouts on a per-Controller Basis
@@ -507,17 +510,18 @@ Asset tags provide methods for generating HTML that links views to assets like i
* stylesheet_link_tag
* image_tag
-You can use these tags in layouts or other views, although the tags other than +image_tag+ are most commonly used in the ++ section of a layout.
+You can use these tags in layouts or other views, although the tags other than +image_tag+ are most commonly used in the section of a layout.
WARNING: The asset tags do _not_ verify the existence of the assets at the specified locations; they simply assume that you know what you're doing and generate the link.
h5. Linking to Feeds with auto_discovery_link_tag
-The +auto_discovery_link_tag helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
+The +auto_discovery_link_tag+ helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
-
-<%= auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "RSS Feed"}) %>
-
+
+<%= auto_discovery_link_tag(:rss, {:action => "feed"},
+ {:title => "RSS Feed"}) %>
+
There are three tag options available for +auto_discovery_link_tag+:
@@ -529,57 +533,58 @@ h5. Linking to Javascript Files with javascript_include_tag
The +javascript_include_tag+ helper returns an HTML +script+ tag for each source provided. Rails looks in +public/javascripts+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/javascripts/main.js+:
-
+
<%= javascript_include_tag "main" %>
-
+
To include +public/javascripts/main.js+ and +public/javascripts/columns.js+:
-
+
<%= javascript_include_tag "main", "columns" %>
-
+
To include +public/javascripts/main.js+ and +public/photos/columns.js+:
-
+
<%= javascript_include_tag "main", "/photos/columns" %>
-
+
To include +http://example.com/main.js+:
-
+
<%= javascript_include_tag "http://example.com/main.js" %>
-
+
The +defaults+ option loads the Prototype and Scriptaculous libraries:
-
+
<%= javascript_include_tag :defaults %>
-
+
The +all+ option loads every javascript file in +public/javascripts+, starting with the Prototype and Scriptaculous libraries:
-
+
<%= javascript_include_tag :all %>
-
+
You can supply the +:recursive+ option to load files in subfolders of +public/javascripts+ as well:
-
+
<%= javascript_include_tag :all, :recursive => true %>
-
+
If you're loading multiple javascript files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify +:cache => true+ in your +javascript_include_tag+:
-
+
<%= javascript_include_tag "main", "columns", :cache => true %>
-
+
By default, the combined file will be delivered as +javascripts/all.js+. You can specify a location for the cached asset file instead:
-
-<%= javascript_include_tag "main", "columns", :cache => 'cache/main/display' %>
-
+
+<%= javascript_include_tag "main", "columns",
+ :cache => 'cache/main/display' %>
+
You can even use dynamic paths such as "cache/#{current_site}/main/display"+.
@@ -587,79 +592,80 @@ h5. Linking to CSS Files with stylesheet_link_tag
The +stylesheet_link_tag+ helper returns an HTML ++ tag for each source provided. Rails looks in +public/stylesheets+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/stylesheets/main.cs+:
-
+
<%= stylesheet_link_tag "main" %>
-
+
To include +public/stylesheets/main.css+ and +public/stylesheets/columns.css+:
-
+
<%= stylesheet_link_tag "main", "columns" %>
-
+
To include +public/stylesheets/main.css+ and +public/photos/columns.css+:
-
+
<%= stylesheet_link_tag "main", "/photos/columns" %>
-
+
To include +http://example.com/main.cs+:
-
+
<%= stylesheet_link_tag "http://example.com/main.cs" %>
-
+
By default, +stylesheet_link_tag+ creates links with +media="screen" rel="stylesheet" type="text/css"+. You can override any of these defaults by specifying an appropriate option (:media, :rel, or :type):
-
+
<%= stylesheet_link_tag "main_print", media => "print" %>
-
+
The +all+ option links every CSS file in +public/stylesheets+:
-
+
<%= stylesheet_link_tag :all %>
-
+
You can supply the +:recursive+ option to link files in subfolders of +public/stylesheets+ as well:
-
+
<%= stylesheet_link_tag :all, :recursive => true %>
-
+
If you're loading multiple CSS files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify +:cache => true+ in your +stylesheet_link_tag+:
-
+
<%= stylesheet_link_tag "main", "columns", :cache => true %>
-
+
By default, the combined file will be delivered as +stylesheets/all.css+. You can specify a location for the cached asset file instead:
-
-<%= stylesheet_link_tag "main", "columns", :cache => 'cache/main/display' %>
-
+
+<%= stylesheet_link_tag "main", "columns",
+ :cache => 'cache/main/display' %>
+
You can even use dynamic paths such as "cache/#{current_site}/main/display"+.
h5. Linking to Images with image_tag
-The +image_tag+ helper builds an HTML ++ tag to the specified file. By default, files are loaded from +public/images+. If you don't specify an extension, .png is assumed by default:
+The +image_tag+ helper builds an HTML tag to the specified file. By default, files are loaded from +public/images+. If you don't specify an extension, .png is assumed by default:
-
+
<%= image_tag "header" %>
-
+
You can supply a path to the image if you like:
-
+
<%= image_tag "icons/delete.gif" %>
-
+
You can supply a hash of additional HTML options:
-
+
<%= image_tag "icons/delete.gif", :height => 45 %>
-
+
There are also three special options you can use with +image_tag+:
@@ -781,7 +787,8 @@ You can also pass local variables into partials, making them even more powerful
New zone
<%= error_messages_for :zone %>
-<%= render :partial => "form", :locals => { :button_label => "Create zone", :zone => @zone } %>
+<%= render :partial => "form", :locals =>
+ { :button_label => "Create zone", :zone => @zone } %>
* +edit.html.erb+
@@ -789,7 +796,8 @@ You can also pass local variables into partials, making them even more powerful
Editing zone
<%= error_messages_for :zone %>
-<%= render :partial => "form", :locals => { :button_label => "Update zone", :zone => @zone } %>
+<%= render :partial => "form", :locals =>
+ { :button_label => "Update zone", :zone => @zone } %>
* +_form.html.erb+
@@ -856,7 +864,8 @@ TIP: Rails also makes a counter variable available within a partial called by th
You can also specify a second partial to be rendered between instances of the main partial by using the +:spacer_template+ option:
-<%= render :partial => "product", :collection => @products, :spacer_template => "product_ruler" %>
+<%= render :partial => "product", :collection => @products,
+ :spacer_template => "product_ruler" %>
Rails will render the +_product_ruler+ partial (with no data passed in to it) between each pair of +_product+ partials.
@@ -882,7 +891,8 @@ Rails determines the name of the partial to use by looking at the model name in