diff options
| -rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 11 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css | 11 |
2 files changed, 13 insertions, 9 deletions
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb index 01ec58c615..b0222b24e4 100644 --- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb @@ -1,5 +1,14 @@ <%%= form_for(@<%= singular_name %>) do |f| %> - <%%= f.error_messages %> + <%% if @<%= singular_name %>.errors.any? %> + <div id="errorExplanation"> + <h2>The following errors prohibited this form from being saved:</h2> + <ul> + <%% @<%= singular_name %>.errors.full_messages.each do |msg| %> + <li><%%= msg %></li> + <%% end %> + </ul> + </div> + <%% end %> <% for attribute in attributes -%> <div class="field"> diff --git a/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css index ea3dc9b8b5..f3f46d8b98 100644 --- a/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css +++ b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css @@ -35,10 +35,10 @@ div.field, div.actions { } #errorExplanation { - width: 400px; + width: 450px; border: 2px solid red; padding: 7px; - padding-bottom: 12px; + padding-bottom: 0; margin-bottom: 20px; background-color: #f0f0f0; } @@ -49,16 +49,11 @@ div.field, div.actions { padding: 5px 5px 5px 15px; font-size: 12px; margin: -7px; + margin-bottom: 0px; background-color: #c00; color: #fff; } -#errorExplanation p { - color: #333; - margin-bottom: 0; - padding: 5px; -} - #errorExplanation ul li { font-size: 12px; list-style: square; |