diff options
author | Mike Gunderloy <MikeG1@larkfarm.com> | 2009-03-24 20:06:59 -0500 |
---|---|---|
committer | Mike Gunderloy <MikeG1@larkfarm.com> | 2009-03-24 20:06:59 -0500 |
commit | fab9d3b59dc87faec96aa01ce89402a9c3e57df8 (patch) | |
tree | fc40fe92aac64a926ba5edd868a031b28f320c61 /railties/guides/source/layouts_and_rendering.textile | |
parent | 4e27ca4c28432cd735a8ccb82bbaff37941a9d3b (diff) | |
parent | 0e6b9695aff6500ad48c4dd9ab61343d7090b030 (diff) | |
download | rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.tar.gz rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.tar.bz2 rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.zip |
Merge branch 'master' of git@github.com:lifo/docrails
Conflicts:
railties/guides/source/2_3_release_notes.textile
Diffstat (limited to 'railties/guides/source/layouts_and_rendering.textile')
-rw-r--r-- | railties/guides/source/layouts_and_rendering.textile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile index 69faa1b449..809d2b2172 100644 --- a/railties/guides/source/layouts_and_rendering.textile +++ b/railties/guides/source/layouts_and_rendering.textile @@ -959,7 +959,7 @@ On pages generated by +NewsController+, you want to hide the top menu and add a <div id="right_menu">Right menu items here</div> <%= yield(:news_content) or yield %> <% end -%> -<% render :file => 'layouts/application' %> +<%= render :file => 'layouts/application' %> </erb> That's it. The News views will use the new layout, hiding the top menu and adding a new right menu inside the "content" div. |