From c44cacb07077325d0434b571889ac032dfb026f6 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 9 Apr 2010 09:49:46 -0700 Subject: Include app name in layout title --- railties/lib/rails/generators/rails/app/app_generator.rb | 7 ++++++- .../rails/app/templates/app/views/layouts/application.html.erb | 9 +++++---- railties/test/generators/app_generator_test.rb | 4 ++-- 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 @@ - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> - <%= csrf_meta_tag %> + <%= app_const_base %> + <%%= stylesheet_link_tag :all %> + <%%= javascript_include_tag :defaults %> + <%%= csrf_meta_tag %> -<%= yield %> +<%%= yield %> 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 -- cgit v1.2.3