diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-06-12 05:33:23 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-06-12 05:33:23 +0000 |
| commit | 3cb26e9cb3c1f3a069e7654988c650ca12322ede (patch) | |
| tree | 1f60bc9bfb288f8fcb4c9576cdddf7b6708d2051 /actionpack/lib/action_controller/templates/scaffolds | |
| parent | dedb9c8483fc916bb5fd40d7e8a35af5f8e7a90b (diff) | |
| download | rails-3cb26e9cb3c1f3a069e7654988c650ca12322ede.tar.gz rails-3cb26e9cb3c1f3a069e7654988c650ca12322ede.tar.bz2 rails-3cb26e9cb3c1f3a069e7654988c650ca12322ede.zip | |
r2495@sedna: jeremy | 2005-05-27 22:07:18 -0700
Branch to have scaffold use new render methods
r2496@sedna: jeremy | 2005-05-28 10:50:51 -0700
axe unused process_request method
r2497@sedna: jeremy | 2005-05-28 10:51:58 -0700
sanity assertions in process method check that @controller, @request, @response are set
r2498@sedna: jeremy | 2005-05-28 10:53:42 -0700
clean up escaping. use instance_variable_get instead of instance_eval. put id in form action instead of hidden input (like the generated scaffolding)
r2499@sedna: jeremy | 2005-05-28 10:54:46 -0700
clean up interpolation, remove tabs from stylesheet
r2500@sedna: jeremy | 2005-05-28 10:56:40 -0700
modernize dynamic scaffolding. use params[:id] instead of @params[id]. use consolidated render method instead of render_action, render_file, etc. use builtin inflections rather than module methods.
r2501@sedna: jeremy | 2005-05-28 11:00:26 -0700
modernize generated scaffolding. use new-style assertions; use params[:id] instead of @params[id]; use consolidated render method instead of render_*
r2542@sedna: jeremy | 2005-06-12 02:24:06 -0700
use :id => model instead of :id => model.id. clean up the form helper method. use flash[:notice] instead of flash['notice'].
r2543@sedna: jeremy | 2005-06-12 02:33:22 -0700
whitespace
r2544@sedna: jeremy | 2005-06-12 02:56:57 -0700
update changelogs
r2545@sedna: jeremy | 2005-06-12 03:26:23 -0700
test dynamic form help when @post is not a new record
r2546@sedna: jeremy | 2005-06-12 03:44:14 -0700
touch up TestCase#process sanity assertions
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1404 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/templates/scaffolds')
5 files changed, 27 insertions, 27 deletions
diff --git a/actionpack/lib/action_controller/templates/scaffolds/edit.rhtml b/actionpack/lib/action_controller/templates/scaffolds/edit.rhtml index 31e15f7501..63dff602a1 100644 --- a/actionpack/lib/action_controller/templates/scaffolds/edit.rhtml +++ b/actionpack/lib/action_controller/templates/scaffolds/edit.rhtml @@ -1,7 +1,7 @@ <h1>Editing <%= @scaffold_singular_name %></h1> <%= error_messages_for(@scaffold_singular_name) %> -<%= form(@scaffold_singular_name, :action => "update" + @scaffold_suffix) %> +<%= form(@scaffold_singular_name, :action => "update#{@scaffold_suffix}") %> -<%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}").id %> | +<%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}") %> | <%= link_to "Back", :action => "list#{@scaffold_suffix}" %> diff --git a/actionpack/lib/action_controller/templates/scaffolds/layout.rhtml b/actionpack/lib/action_controller/templates/scaffolds/layout.rhtml index 300aa1d77a..80996985d2 100644 --- a/actionpack/lib/action_controller/templates/scaffolds/layout.rhtml +++ b/actionpack/lib/action_controller/templates/scaffolds/layout.rhtml @@ -28,40 +28,40 @@ #ErrorExplanation { width: 400px; - border: 2px solid 'red'; - padding: 7px; - padding-bottom: 12px; - margin-bottom: 20px; - background-color: #f0f0f0; + border: 2px solid 'red'; + padding: 7px; + padding-bottom: 12px; + margin-bottom: 20px; + background-color: #f0f0f0; } #ErrorExplanation h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px; - background-color: #c00; - color: #fff; + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px; + background-color: #c00; + color: #fff; } #ErrorExplanation p { - color: #333; - margin-bottom: 0; - padding: 5px; + color: #333; + margin-bottom: 0; + padding: 5px; } #ErrorExplanation ul li { - font-size: 12px; - list-style: square; + font-size: 12px; + list-style: square; } </style> </head> <body> -<p style="color: green"><%= flash['notice'] %></p> +<p style="color: green"><%= flash[:notice] %></p> <%= @content_for_layout %> </body> -</html>
\ No newline at end of file +</html> diff --git a/actionpack/lib/action_controller/templates/scaffolds/list.rhtml b/actionpack/lib/action_controller/templates/scaffolds/list.rhtml index 233e9da87d..d1196a1599 100644 --- a/actionpack/lib/action_controller/templates/scaffolds/list.rhtml +++ b/actionpack/lib/action_controller/templates/scaffolds/list.rhtml @@ -12,9 +12,9 @@ <% for column in @scaffold_class.content_columns %> <td><%= entry.send(column.name) %></td> <% end %> - <td><%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => entry.id %></td> - <td><%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => entry.id %></td> - <td><%= link_to "Destroy", :action => "destroy#{@scaffold_suffix}", :id => entry.id, :confirm => "Are you sure?" %></td> + <td><%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => entry %></td> + <td><%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => entry %></td> + <td><%= link_to "Destroy", :action => "destroy#{@scaffold_suffix}", :id => entry, :confirm => "Are you sure?" %></td> </tr> <% end %> </table> diff --git a/actionpack/lib/action_controller/templates/scaffolds/new.rhtml b/actionpack/lib/action_controller/templates/scaffolds/new.rhtml index 74db8468bd..66f6626f4e 100644 --- a/actionpack/lib/action_controller/templates/scaffolds/new.rhtml +++ b/actionpack/lib/action_controller/templates/scaffolds/new.rhtml @@ -1,6 +1,6 @@ <h1>New <%= @scaffold_singular_name %></h1> <%= error_messages_for(@scaffold_singular_name) %> -<%= form(@scaffold_singular_name, :action => "create" + @scaffold_suffix) %> +<%= form(@scaffold_singular_name, :action => "create#{@scaffold_suffix}") %> -<%= link_to "Back", :action => "list#{@scaffold_suffix}" %>
\ No newline at end of file +<%= link_to "Back", :action => "list#{@scaffold_suffix}" %> diff --git a/actionpack/lib/action_controller/templates/scaffolds/show.rhtml b/actionpack/lib/action_controller/templates/scaffolds/show.rhtml index 10c46342fd..46cdfdb493 100644 --- a/actionpack/lib/action_controller/templates/scaffolds/show.rhtml +++ b/actionpack/lib/action_controller/templates/scaffolds/show.rhtml @@ -5,5 +5,5 @@ </p> <% end %> -<%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}").id %> | +<%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}") %> | <%= link_to "Back", :action => "list#{@scaffold_suffix}" %> |