diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-04-25 05:16:22 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-04-25 05:16:22 +0000 |
| commit | abc2dba1ed15d9b30900890fdf4dee10c4f60a02 (patch) | |
| tree | ad808a72df6f2b335c4713b10293cce9ac802f60 /railties | |
| parent | 7bb20659c295d2b6a2820295b948ae3a2c0fa99e (diff) | |
| download | rails-abc2dba1ed15d9b30900890fdf4dee10c4f60a02.tar.gz rails-abc2dba1ed15d9b30900890fdf4dee10c4f60a02.tar.bz2 rails-abc2dba1ed15d9b30900890fdf4dee10c4f60a02.zip | |
Change the scaffolding layout to use yield rather than @content_for_layout.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4263 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ba15544d74..9aa4969a6b 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *1.1.2* (April 9th, 2005) +* Change the scaffolding layout to use yield rather than @content_for_layout. [Marcel Molina Jr.] + * Added rake rails:update:configs to update config/boot.rb from the latest (also included in rake rails:update) [DHH] * Fixed that boot.rb would set RAILS_GEM_VERSION twice, not respect an uncommented RAILS_GEM_VERSION line, and not use require_gem [DHH] diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml index 3e969b9ac4..b5ba9a4e99 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml @@ -7,7 +7,7 @@ <p style="color: green"><%%= flash[:notice] %></p> -<%%= @content_for_layout %> +<%%= yield %> </body> </html> |