From c7befb896e72e6087d2d413990d319c990154c7e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper 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/CHANGELOG | 2 ++ .../generators/components/controller/USAGE | 4 ++-- .../components/controller/controller_generator.rb | 4 ++-- .../components/controller/templates/view.erb | 2 -- .../components/controller/templates/view.html.erb | 2 ++ .../components/controller/templates/view.rhtml | 0 .../components/scaffold/scaffold_generator.rb | 18 +++++++-------- .../components/scaffold/templates/form.erb | 3 --- .../components/scaffold/templates/form.html.erb | 3 +++ .../components/scaffold/templates/form.rhtml | 0 .../scaffold/templates/form_scaffolding.erb | 1 - .../scaffold/templates/form_scaffolding.html.erb | 1 + .../scaffold/templates/form_scaffolding.rhtml | 0 .../components/scaffold/templates/layout.erb | 17 -------------- .../components/scaffold/templates/layout.html.erb | 17 ++++++++++++++ .../components/scaffold/templates/layout.rhtml | 0 .../components/scaffold/templates/view_edit.erb | 9 -------- .../scaffold/templates/view_edit.html.erb | 9 ++++++++ .../components/scaffold/templates/view_edit.rhtml | 0 .../components/scaffold/templates/view_list.erb | 27 ---------------------- .../scaffold/templates/view_list.html.erb | 27 ++++++++++++++++++++++ .../components/scaffold/templates/view_list.rhtml | 0 .../components/scaffold/templates/view_new.erb | 8 ------- .../scaffold/templates/view_new.html.erb | 8 +++++++ .../components/scaffold/templates/view_new.rhtml | 0 .../components/scaffold/templates/view_show.erb | 8 ------- .../scaffold/templates/view_show.html.erb | 8 +++++++ .../components/scaffold/templates/view_show.rhtml | 0 .../scaffold_resource_generator.rb | 6 ++--- .../scaffold_resource/templates/controller.rb | 6 ++--- .../scaffold_resource/templates/layout.erb | 17 -------------- .../scaffold_resource/templates/layout.html.erb | 17 ++++++++++++++ .../scaffold_resource/templates/view_edit.erb | 19 --------------- .../scaffold_resource/templates/view_edit.html.erb | 19 +++++++++++++++ .../scaffold_resource/templates/view_index.erb | 24 ------------------- .../templates/view_index.html.erb | 24 +++++++++++++++++++ .../scaffold_resource/templates/view_new.erb | 18 --------------- .../scaffold_resource/templates/view_new.html.erb | 18 +++++++++++++++ .../scaffold_resource/templates/view_show.erb | 10 -------- .../scaffold_resource/templates/view_show.html.erb | 10 ++++++++ 40 files changed, 184 insertions(+), 182 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 delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/form.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/form.rhtml delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.rhtml delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/layout.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_list.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_new.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_show.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_show.rhtml delete mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.html.erb diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ee72dec0bc..408253cb6e 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Generators use *.html.erb view template naming. #8278 [Tim Pope] + * Updated resource_scaffold and model generators to use short-hand style migrations [DHH] * Updated initializer to only load #{RAILS_ENV}.rb once. Added deprecation warning for config.breakpoint_server. [Nicholas Seckar] 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 @@ -

<%= class_name %>#<%= action %>

-

Find me in <%= path %>

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 @@ +

<%= class_name %>#<%= action %>

+

Find me in <%= path %>

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 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.erb deleted file mode 100644 index d15f0d4ec2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/form.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%%= error_messages_for '<%= singular_name %>' %> - -<%= template_for_inclusion %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb new file mode 100644 index 0000000000..d15f0d4ec2 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb @@ -0,0 +1,3 @@ +<%%= error_messages_for '<%= singular_name %>' %> + +<%= template_for_inclusion %> 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 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.erb deleted file mode 100644 index c7a87553ac..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.erb +++ /dev/null @@ -1 +0,0 @@ -<%= all_input_tags(@model_instance, @singular_name, {}) %> \ No newline at end of file diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb new file mode 100644 index 0000000000..c7a87553ac --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb @@ -0,0 +1 @@ +<%= all_input_tags(@model_instance, @singular_name, {}) %> \ No newline at end of file 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 diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.erb deleted file mode 100644 index 5c1f304232..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.erb +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - <%= controller_class_name %>: <%%= controller.action_name %> - <%%= stylesheet_link_tag 'scaffold' %> - - - -

<%%= flash[:notice] %>

- -<%%= yield %> - - - diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb new file mode 100644 index 0000000000..5c1f304232 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb @@ -0,0 +1,17 @@ + + + + + + <%= controller_class_name %>: <%%= controller.action_name %> + <%%= stylesheet_link_tag 'scaffold' %> + + + +

<%%= flash[:notice] %>

+ +<%%= yield %> + + + 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 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.erb deleted file mode 100644 index a86aa0b0d5..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.erb +++ /dev/null @@ -1,9 +0,0 @@ -

Editing <%= singular_name %>

- -<%% form_tag :action => 'update<%= @suffix %>', :id => @<%= singular_name %> do %> - <%%= render :partial => 'form' %> - <%%= submit_tag 'Edit' %> -<%% end %> - -<%%= link_to 'Show', :action => 'show<%= suffix %>', :id => @<%= singular_name %> %> | -<%%= link_to 'Back', :action => 'list<%= suffix %>' %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb new file mode 100644 index 0000000000..a86aa0b0d5 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb @@ -0,0 +1,9 @@ +

Editing <%= singular_name %>

+ +<%% form_tag :action => 'update<%= @suffix %>', :id => @<%= singular_name %> do %> + <%%= render :partial => 'form' %> + <%%= submit_tag 'Edit' %> +<%% end %> + +<%%= link_to 'Show', :action => 'show<%= suffix %>', :id => @<%= singular_name %> %> | +<%%= link_to 'Back', :action => 'list<%= suffix %>' %> 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 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.erb deleted file mode 100644 index 3e2a414485..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.erb +++ /dev/null @@ -1,27 +0,0 @@ -

Listing <%= plural_name %>

- - - - <%% for column in <%= model_name %>.content_columns %> - - <%% end %> - - -<%% for <%= singular_name %> in @<%= plural_name %> %> - - <%% for column in <%= model_name %>.content_columns %> - - <%% end %> - - - - -<%% end %> -
<%%= column.human_name %>
<%%=h <%= singular_name %>.send(column.name) %><%%= link_to 'Show', :action => 'show<%= suffix %>', :id => <%= singular_name %> %><%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => <%= singular_name %> %><%%= link_to 'Destroy', { :action => 'destroy<%= suffix %>', :id => <%= singular_name %> }, :confirm => 'Are you sure?', :method => :post %>
- -<%%= link_to 'Previous page', { :page => @<%= singular_name %>_pages.current.previous } if @<%= singular_name %>_pages.current.previous %> -<%%= link_to 'Next page', { :page => @<%= singular_name %>_pages.current.next } if @<%= singular_name %>_pages.current.next %> - -
- -<%%= link_to 'New <%= singular_name %>', :action => 'new<%= suffix %>' %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb new file mode 100644 index 0000000000..3e2a414485 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb @@ -0,0 +1,27 @@ +

Listing <%= plural_name %>

+ + + + <%% for column in <%= model_name %>.content_columns %> + + <%% end %> + + +<%% for <%= singular_name %> in @<%= plural_name %> %> + + <%% for column in <%= model_name %>.content_columns %> + + <%% end %> + + + + +<%% end %> +
<%%= column.human_name %>
<%%=h <%= singular_name %>.send(column.name) %><%%= link_to 'Show', :action => 'show<%= suffix %>', :id => <%= singular_name %> %><%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => <%= singular_name %> %><%%= link_to 'Destroy', { :action => 'destroy<%= suffix %>', :id => <%= singular_name %> }, :confirm => 'Are you sure?', :method => :post %>
+ +<%%= link_to 'Previous page', { :page => @<%= singular_name %>_pages.current.previous } if @<%= singular_name %>_pages.current.previous %> +<%%= link_to 'Next page', { :page => @<%= singular_name %>_pages.current.next } if @<%= singular_name %>_pages.current.next %> + +
+ +<%%= link_to 'New <%= singular_name %>', :action => 'new<%= suffix %>' %> 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 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.erb deleted file mode 100644 index 8222ea622f..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.erb +++ /dev/null @@ -1,8 +0,0 @@ -

New <%= singular_name %>

- -<%% form_tag :action => 'create<%= @suffix %>' do %> - <%%= render :partial => 'form' %> - <%%= submit_tag "Create" %> -<%% end %> - -<%%= link_to 'Back', :action => 'list<%= suffix %>' %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb new file mode 100644 index 0000000000..8222ea622f --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb @@ -0,0 +1,8 @@ +

New <%= singular_name %>

+ +<%% form_tag :action => 'create<%= @suffix %>' do %> + <%%= render :partial => 'form' %> + <%%= submit_tag "Create" %> +<%% end %> + +<%%= link_to 'Back', :action => 'list<%= suffix %>' %> 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 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.erb deleted file mode 100644 index c9245cdfda..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.erb +++ /dev/null @@ -1,8 +0,0 @@ -<%% for column in <%= model_name %>.content_columns %> -

- <%%= column.human_name %>: <%%=h @<%= singular_name %>.send(column.name) %> -

-<%% end %> - -<%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => @<%= singular_name %> %> | -<%%= link_to 'Back', :action => 'list<%= suffix %>' %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb new file mode 100644 index 0000000000..c9245cdfda --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb @@ -0,0 +1,8 @@ +<%% for column in <%= model_name %>.content_columns %> +

+ <%%= column.human_name %>: <%%=h @<%= singular_name %>.send(column.name) %> +

+<%% end %> + +<%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => @<%= singular_name %> %> | +<%%= link_to 'Back', :action => 'list<%= suffix %>' %> 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 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.erb deleted file mode 100644 index 5c1f304232..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.erb +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - <%= controller_class_name %>: <%%= controller.action_name %> - <%%= stylesheet_link_tag 'scaffold' %> - - - -

<%%= flash[:notice] %>

- -<%%= yield %> - - - diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.html.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.html.erb new file mode 100644 index 0000000000..5c1f304232 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.html.erb @@ -0,0 +1,17 @@ + + + + + + <%= controller_class_name %>: <%%= controller.action_name %> + <%%= stylesheet_link_tag 'scaffold' %> + + + +

<%%= flash[:notice] %>

+ +<%%= yield %> + + + 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.erb deleted file mode 100644 index bf165e02be..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.erb +++ /dev/null @@ -1,19 +0,0 @@ -

Editing <%= singular_name %>

- -<%%= error_messages_for :<%= singular_name %> %> - -<%% form_for(:<%= singular_name %>, :url => <%= singular_name %>_path(@<%= singular_name %>), :html => { :method => :put }) do |f| %> -<% for attribute in attributes -%> -

- <%= attribute.column.human_name %>
- <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %> -

- -<% end -%> -

- <%%= submit_tag "Update" %> -

-<%% end %> - -<%%= link_to 'Show', <%= singular_name %>_path(@<%= singular_name %>) %> | -<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.html.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.html.erb new file mode 100644 index 0000000000..bf165e02be --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.html.erb @@ -0,0 +1,19 @@ +

Editing <%= singular_name %>

+ +<%%= error_messages_for :<%= singular_name %> %> + +<%% form_for(:<%= singular_name %>, :url => <%= singular_name %>_path(@<%= singular_name %>), :html => { :method => :put }) do |f| %> +<% for attribute in attributes -%> +

+ <%= attribute.column.human_name %>
+ <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %> +

+ +<% end -%> +

+ <%%= submit_tag "Update" %> +

+<%% end %> + +<%%= link_to 'Show', <%= singular_name %>_path(@<%= singular_name %>) %> | +<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file 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.erb deleted file mode 100644 index 9ad899465c..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.erb +++ /dev/null @@ -1,24 +0,0 @@ -

Listing <%= plural_name %>

- - - -<% for attribute in attributes -%> - -<% end -%> - - -<%% for <%= singular_name %> in @<%= plural_name %> %> - -<% for attribute in attributes -%> - -<% end -%> - - - - -<%% end %> -
<%= attribute.column.human_name %>
<%%=h <%= singular_name %>.<%= attribute.name %> %><%%= link_to 'Show', <%= singular_name %>_path(<%= singular_name %>) %><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %><%%= link_to 'Destroy', <%= singular_name %>_path(<%= singular_name %>), :confirm => 'Are you sure?', :method => :delete %>
- -
- -<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %> \ No newline at end of file diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.html.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.html.erb new file mode 100644 index 0000000000..9ad899465c --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.html.erb @@ -0,0 +1,24 @@ +

Listing <%= plural_name %>

+ + + +<% for attribute in attributes -%> + +<% end -%> + + +<%% for <%= singular_name %> in @<%= plural_name %> %> + +<% for attribute in attributes -%> + +<% end -%> + + + + +<%% end %> +
<%= attribute.column.human_name %>
<%%=h <%= singular_name %>.<%= attribute.name %> %><%%= link_to 'Show', <%= singular_name %>_path(<%= singular_name %>) %><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %><%%= link_to 'Destroy', <%= singular_name %>_path(<%= singular_name %>), :confirm => 'Are you sure?', :method => :delete %>
+ +
+ +<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %> \ No newline at end of file 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.erb deleted file mode 100644 index b3b6f91453..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.erb +++ /dev/null @@ -1,18 +0,0 @@ -

New <%= singular_name %>

- -<%%= error_messages_for :<%= singular_name %> %> - -<%% form_for(:<%= singular_name %>, :url => <%= plural_name %>_path) do |f| %> -<% for attribute in attributes -%> -

- <%= attribute.column.human_name %>
- <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %> -

- -<% end -%> -

- <%%= submit_tag "Create" %> -

-<%% end %> - -<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.html.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.html.erb new file mode 100644 index 0000000000..b3b6f91453 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.html.erb @@ -0,0 +1,18 @@ +

New <%= singular_name %>

+ +<%%= error_messages_for :<%= singular_name %> %> + +<%% form_for(:<%= singular_name %>, :url => <%= plural_name %>_path) do |f| %> +<% for attribute in attributes -%> +

+ <%= attribute.column.human_name %>
+ <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %> +

+ +<% end -%> +

+ <%%= submit_tag "Create" %> +

+<%% end %> + +<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file 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.erb deleted file mode 100644 index adecaf70c6..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% for attribute in attributes -%> -

- <%= attribute.column.human_name %>: - <%%=h @<%= singular_name %>.<%= attribute.name %> %> -

- -<% end -%> - -<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> | -<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.html.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.html.erb new file mode 100644 index 0000000000..adecaf70c6 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.html.erb @@ -0,0 +1,10 @@ +<% for attribute in attributes -%> +

+ <%= attribute.column.human_name %>: + <%%=h @<%= singular_name %>.<%= attribute.name %> %> +

+ +<% end -%> + +<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> | +<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file -- cgit v1.2.3