diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-06 10:34:18 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-06 10:34:18 +0000 |
commit | c7befb896e72e6087d2d413990d319c990154c7e (patch) | |
tree | a6cde8d298baf86cdca519e67fe367a9a9274d6b /railties/lib/rails_generator/generators/components/scaffold | |
parent | e4c5ddd83954a04be72f738f2f1c60739aacdd76 (diff) | |
download | rails-c7befb896e72e6087d2d413990d319c990154c7e.tar.gz rails-c7befb896e72e6087d2d413990d319c990154c7e.tar.bz2 rails-c7befb896e72e6087d2d413990d319c990154c7e.zip |
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
Diffstat (limited to 'railties/lib/rails_generator/generators/components/scaffold')
15 files changed, 9 insertions, 9 deletions
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb index 855f9119d5..a3650c7e3a 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb @@ -81,12 +81,12 @@ class ScaffoldGenerator < Rails::Generator::NamedBase m.dependency 'model', [singular_name], :collision => :skip, :skip_migration => true # Scaffolded forms. - m.complex_template "form.erb", + m.complex_template "form.html.erb", File.join('app/views', controller_class_path, controller_file_name, - "_form.erb"), - :insert => 'form_scaffolding.erb', + "_form.html.erb"), + :insert => 'form_scaffolding.html.erb', :sandbox => lambda { create_sandbox }, :begin_mark => 'form', :end_mark => 'eoform', @@ -95,11 +95,11 @@ class ScaffoldGenerator < Rails::Generator::NamedBase # Scaffolded views. scaffold_views.each do |action| - m.template "view_#{action}.erb", + m.template "view_#{action}.html.erb", File.join('app/views', controller_class_path, controller_file_name, - "#{action}.erb"), + "#{action}.html.erb"), :assigns => { :action => action } end @@ -120,10 +120,10 @@ class ScaffoldGenerator < Rails::Generator::NamedBase "#{controller_file_name}_helper.rb") # Layout and stylesheet. - m.template 'layout.erb', + m.template 'layout.html.erb', File.join('app/views/layouts', controller_class_path, - "#{controller_file_name}.erb") + "#{controller_file_name}.html.erb") m.template 'style.css', 'public/stylesheets/scaffold.css' @@ -133,8 +133,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase path = File.join('app/views', controller_class_path, controller_file_name, - "#{action}.erb") - m.template "controller:view.erb", path, + "#{action}.html.erb") + m.template "controller:view.html.erb", path, :assigns => { :action => action, :path => path} end end diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/form.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb index d15f0d4ec2..d15f0d4ec2 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/form.erb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/form.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/form.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/form.rhtml +++ /dev/null diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb index c7a87553ac..c7a87553ac 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.erb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.rhtml +++ /dev/null diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb index 5c1f304232..5c1f304232 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.erb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml +++ /dev/null diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb index a86aa0b0d5..a86aa0b0d5 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.erb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml +++ /dev/null diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb index 3e2a414485..3e2a414485 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.erb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml +++ /dev/null diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb index 8222ea622f..8222ea622f 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.erb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml +++ /dev/null diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb index c9245cdfda..c9245cdfda 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.erb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.rhtml +++ /dev/null |