From c7befb896e72e6087d2d413990d319c990154c7e Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 6 May 2007 10:34:18 +0000
Subject: Generators use *.html.erb view template naming. Closes #8278.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6690 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/lib/rails_generator/generators/components/controller/USAGE   | 4 ++--
 .../generators/components/controller/controller_generator.rb          | 4 ++--
 .../generators/components/controller/templates/view.erb               | 2 --
 .../generators/components/controller/templates/view.html.erb          | 2 ++
 .../generators/components/controller/templates/view.rhtml             | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 railties/lib/rails_generator/generators/components/controller/templates/view.erb
 create mode 100644 railties/lib/rails_generator/generators/components/controller/templates/view.html.erb
 delete mode 100644 railties/lib/rails_generator/generators/components/controller/templates/view.rhtml

(limited to 'railties/lib/rails_generator/generators/components/controller')

diff --git a/railties/lib/rails_generator/generators/components/controller/USAGE b/railties/lib/rails_generator/generators/components/controller/USAGE
index ae7b8e022b..246a3d652b 100644
--- a/railties/lib/rails_generator/generators/components/controller/USAGE
+++ b/railties/lib/rails_generator/generators/components/controller/USAGE
@@ -15,7 +15,7 @@ Example:
 
     Credit card controller with URLs like /credit_card/debit.
         Controller: app/controllers/credit_card_controller.rb
-        Views:      app/views/credit_card/debit.erb [...]
+        Views:      app/views/credit_card/debit.html.erb [...]
         Helper:     app/helpers/credit_card_helper.rb
         Test:       test/functional/credit_card_controller_test.rb
 
@@ -24,7 +24,7 @@ Modules Example:
 
     Credit card admin controller with URLs /admin/credit_card/suspend.
         Controller: app/controllers/admin/credit_card_controller.rb
-        Views:      app/views/admin/credit_card/debit.erb [...]
+        Views:      app/views/admin/credit_card/debit.html.erb [...]
         Helper:     app/helpers/admin/credit_card_helper.rb
         Test:       test/functional/admin/credit_card_controller_test.rb
 
diff --git a/railties/lib/rails_generator/generators/components/controller/controller_generator.rb b/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
index f73e5a41b0..c37ff45836 100644
--- a/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
+++ b/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
@@ -28,8 +28,8 @@ class ControllerGenerator < Rails::Generator::NamedBase
 
       # View template for each action.
       actions.each do |action|
-        path = File.join('app/views', class_path, file_name, "#{action}.erb")
-        m.template 'view.erb', path,
+        path = File.join('app/views', class_path, file_name, "#{action}.html.erb")
+        m.template 'view.html.erb', path,
           :assigns => { :action => action, :path => path }
       end
     end
diff --git a/railties/lib/rails_generator/generators/components/controller/templates/view.erb b/railties/lib/rails_generator/generators/components/controller/templates/view.erb
deleted file mode 100644
index ad85431f98..0000000000
--- a/railties/lib/rails_generator/generators/components/controller/templates/view.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1><%= class_name %>#<%= action %></h1>
-<p>Find me in <%= path %></p>
diff --git a/railties/lib/rails_generator/generators/components/controller/templates/view.html.erb b/railties/lib/rails_generator/generators/components/controller/templates/view.html.erb
new file mode 100644
index 0000000000..ad85431f98
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/controller/templates/view.html.erb
@@ -0,0 +1,2 @@
+<h1><%= class_name %>#<%= action %></h1>
+<p>Find me in <%= path %></p>
diff --git a/railties/lib/rails_generator/generators/components/controller/templates/view.rhtml b/railties/lib/rails_generator/generators/components/controller/templates/view.rhtml
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3