diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-09 09:49:46 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-09 09:49:46 -0700 |
| commit | c44cacb07077325d0434b571889ac032dfb026f6 (patch) | |
| tree | dd3d4350143f008b804bbb5e379d0b007690bc88 /railties | |
| parent | ea6a67cbdf5a05a78aedf214e5a7457d2b791567 (diff) | |
| download | rails-c44cacb07077325d0434b571889ac032dfb026f6.tar.gz rails-c44cacb07077325d0434b571889ac032dfb026f6.tar.bz2 rails-c44cacb07077325d0434b571889ac032dfb026f6.zip | |
Include app name in layout title
Diffstat (limited to 'railties')
3 files changed, 13 insertions, 7 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index df6e98f38d..f7644c3280 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -78,7 +78,12 @@ module Rails::Generators end def create_app_files - directory "app" + directory "app/controllers" + directory "app/helpers" + directory "app/models" + inside "app/views/layouts" do + template "application.html.erb" + end end def create_config_files diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb index 705865ce19..1dd112b4a6 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb +++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb @@ -1,13 +1,14 @@ <!DOCTYPE html> <html> <head> - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> - <%= csrf_meta_tag %> + <title><%= app_const_base %></title> + <%%= stylesheet_link_tag :all %> + <%%= javascript_include_tag :defaults %> + <%%= csrf_meta_tag %> </head> <body> -<%= yield %> +<%%= yield %> </body> </html> diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 64579c1205..24e6d541c2 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -54,8 +54,8 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_application_controller_and_layout_files run_generator assert_file "app/controllers/application_controller.rb", /layout 'application'/ - assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag 'application'/ - assert_file "public/stylesheets/application.css" + assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag :all/ + assert_no_file "public/stylesheets/application.css" end def test_name_collision_raises_an_error |