aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/action_view_overview.md
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-04-11 22:58:14 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-04-11 22:58:14 +0530
commitb15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0 (patch)
tree573c2401b48841a28209e93664af131146eea31e /guides/source/action_view_overview.md
parenta24ef8611d19bce9c98aa21ee59d9dd0a08ecec5 (diff)
parent8a347d925d08a4fe648c6fe7c5e8c948e186c9bb (diff)
downloadrails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.tar.gz
rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.tar.bz2
rails-b15ce4a006756a0b6cacfb9593d88c9a7dfd8eb0.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: guides/source/action_mailer_basics.md
Diffstat (limited to 'guides/source/action_view_overview.md')
-rw-r--r--guides/source/action_view_overview.md9
1 files changed, 2 insertions, 7 deletions
diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md
index 3b5963efc2..dea1ddef71 100644
--- a/guides/source/action_view_overview.md
+++ b/guides/source/action_view_overview.md
@@ -172,7 +172,7 @@ That code will pull in the partial from `app/views/shared/_menu.html.erb`.
#### Using Partials to simplify Views
-One way to use partials is to treat them as the equivalent of subroutines: as a way to move details out of a view so that you can grasp what's going on more easily. For example, you might have a view that looked like this:
+One way to use partials is to treat them as the equivalent of subroutines; a way to move details out of a view so that you can grasp what's going on more easily. For example, you might have a view that looks like this:
```html+erb
<%= render "shared/ad_banner" %>
@@ -269,12 +269,7 @@ Rails will render the `_product_ruler` partial (with no data passed to it) betwe
### Layouts
-TODO...
-
-Using Templates, Partials and Layouts "The Rails Way"
---------------------------------------------------------
-
-TODO...
+Layouts can be used to render a common view template around the results of Rails controller actions. Typically, every Rails has a couple of overall layouts that most pages are rendered within. For example, a site might have a layout for a logged in user, and a layout for the marketing or sales side of the site. The logged in user layout might include top-level navigation that should be present across many controller actions. The sales layout for a SaaS app might include top-level navigation for things like "Pricing" and "Contact Us." You would expect each layout to have a different look and feel. You can read more details about Layouts in the [Layouts and Rendering in Rails](layouts_and_rendering.html) guide.
Partial Layouts
---------------