diff options
Diffstat (limited to 'railties/lib/rails_generator/generators/components/scaffold_resource')
7 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb b/railties/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb index 502df6a567..a10f7f12b3 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb @@ -41,13 +41,13 @@ class ScaffoldResourceGenerator < Rails::Generator::NamedBase for action in scaffold_views m.template( - "view_#{action}.erb", - File.join('app/views', controller_class_path, controller_file_name, "#{action}.erb") + "view_#{action}.html.erb", + File.join('app/views', controller_class_path, controller_file_name, "#{action}.html.erb") ) end # Layout and stylesheet. - m.template('layout.erb', File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.erb")) + m.template('layout.html.erb', File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb")) m.template('style.css', 'public/stylesheets/scaffold.css') m.template('model.rb', File.join('app/models', class_path, "#{file_name}.rb")) diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb index ac53b6c10d..f28f364af0 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb @@ -5,7 +5,7 @@ class <%= controller_class_name %>Controller < ApplicationController @<%= table_name %> = <%= class_name %>.find(:all) respond_to do |format| - format.html # index.erb + format.html # index.html.erb format.xml { render :xml => @<%= table_name %> } end end @@ -16,7 +16,7 @@ class <%= controller_class_name %>Controller < ApplicationController @<%= file_name %> = <%= class_name %>.find(params[:id]) respond_to do |format| - format.html # show.erb + format.html # show.html.erb format.xml { render :xml => @<%= file_name %> } end end @@ -27,7 +27,7 @@ class <%= controller_class_name %>Controller < ApplicationController @<%= file_name %> = <%= class_name %>.new respond_to do |format| - format.html # new.erb + format.html # new.html.erb format.xml { render :xml => @<%= file_name %> } end end diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.html.erb index 5c1f304232..5c1f304232 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.erb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.html.erb index bf165e02be..bf165e02be 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.erb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.html.erb index 9ad899465c..9ad899465c 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.erb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.html.erb index b3b6f91453..b3b6f91453 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.erb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.html.erb index adecaf70c6..adecaf70c6 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.erb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.html.erb |