aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/templates
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/templates')
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/edit.rhtml4
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/layout.rhtml38
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/list.rhtml6
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/new.rhtml4
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/show.rhtml2
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}" %>