Generate scaffold layout in subdirectory appropriate to its module nesting. Closes #5511.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4527 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/CHANGELOG

 *SVN*
 
+* Generate scaffold layout in subdirectory appropriate to its module nesting. #5511 [nils@alumni.rice.edu]
+
 * Mongrel: script/server tails the rails log like it does with lighttpd. Prefer mongrel over lighttpd. #5541 [mike@clarkware.com]
 
 * Don't assume Active Record is available. #5497 [bob@sporkmonger.com]

railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -115,7 +115,11 @@ def manifest
                             "#{controller_file_name}_helper.rb")
 
       # Layout and stylesheet.
-      m.template 'layout.rhtml',  "app/views/layouts/#{controller_file_name}.rhtml"
+      m.template 'layout.rhtml',
+                  File.join('app/views/layouts',
+                            controller_class_path,
+                            "#{controller_file_name}.rhtml")
+
       m.template 'style.css',     'public/stylesheets/scaffold.css'