From 21187c0fb4fc559927a2f947f909dedd85969ffb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 21 Feb 2007 00:29:44 +0000 Subject: Apply the rest of Chads patch git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../scaffold_resource/templates/controller.rb | 4 ++-- .../scaffold_resource/templates/layout.erb | 17 +++++++++++++++ .../scaffold_resource/templates/layout.rhtml | 17 --------------- .../scaffold_resource/templates/view_edit.erb | 19 +++++++++++++++++ .../scaffold_resource/templates/view_edit.rhtml | 19 ----------------- .../scaffold_resource/templates/view_index.erb | 24 ++++++++++++++++++++++ .../scaffold_resource/templates/view_index.rhtml | 24 ---------------------- .../scaffold_resource/templates/view_new.erb | 18 ++++++++++++++++ .../scaffold_resource/templates/view_new.rhtml | 18 ---------------- .../scaffold_resource/templates/view_show.erb | 10 +++++++++ .../scaffold_resource/templates/view_show.rhtml | 10 --------- 11 files changed, 90 insertions(+), 90 deletions(-) create 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/view_edit.erb create 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_new.erb create mode 100644 railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.erb (limited to 'railties/lib/rails_generator/generators/components/scaffold_resource/templates') 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 4ca12d622f..413f7f7ccb 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.rhtml + format.html # index.erb format.xml { render :xml => @<%= table_name %>.to_xml } 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.rhtml + format.html # show.erb format.xml { render :xml => @<%= file_name %>.to_xml } 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 new file mode 100644 index 0000000000..5c1f304232 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.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/layout.rhtml b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.rhtml index 5c1f304232..e69de29bb2 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.rhtml +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/layout.rhtml @@ -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/view_edit.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.erb new file mode 100644 index 0000000000..bf165e02be --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.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_edit.rhtml b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.rhtml index bf165e02be..e69de29bb2 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.rhtml +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.rhtml @@ -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_index.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.erb new file mode 100644 index 0000000000..9ad899465c --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.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_index.rhtml b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.rhtml index 9ad899465c..e69de29bb2 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.rhtml +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.rhtml @@ -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_new.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.erb new file mode 100644 index 0000000000..b3b6f91453 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.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_new.rhtml b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.rhtml index b3b6f91453..e69de29bb2 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.rhtml +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.rhtml @@ -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_show.erb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.erb new file mode 100644 index 0000000000..adecaf70c6 --- /dev/null +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.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 diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml index adecaf70c6..e69de29bb2 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml @@ -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 -- cgit v1.2.3