From ad22017bdcc77793f9103eb01ebb6b4232206b72 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 9 Apr 2010 10:26:49 -0700 Subject: Use thor shorthand for indicating that application.html.erb is a template --- railties/lib/rails/generators/rails/app/app_generator.rb | 7 +------ .../rails/app/templates/app/views/layouts/.empty_directory | 0 .../app/templates/app/views/layouts/application.html.erb | 14 -------------- .../templates/app/views/layouts/application.html.erb.tt | 14 ++++++++++++++ 4 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory delete mode 100644 railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb create mode 100644 railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 192792d078..bb2a080286 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -78,12 +78,7 @@ module Rails::Generators end def create_app_files - directory "app/controllers" - directory "app/helpers" - directory "app/models" - inside "app/views/layouts" do - template "application.html.erb" - end + directory 'app' end def create_config_files diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 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 deleted file mode 100644 index 1dd112b4a6..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - <%= app_const_base %> - <%%= stylesheet_link_tag :all %> - <%%= javascript_include_tag :defaults %> - <%%= csrf_meta_tag %> - - - -<%%= yield %> - - - diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt new file mode 100644 index 0000000000..1dd112b4a6 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt @@ -0,0 +1,14 @@ + + + + <%= app_const_base %> + <%%= stylesheet_link_tag :all %> + <%%= javascript_include_tag :defaults %> + <%%= csrf_meta_tag %> + + + +<%%= yield %> + + + -- cgit v1.2.3