Merge commit 'jose/generators'

railties/lib/generators/erb/scaffold/templates/_form.html.erb

@@ -2,12 +2,12 @@
   <%%= f.error_messages %>
 
 <% for attribute in attributes -%>
-  <div class="attribute">
+  <div class="field">
     <%%= f.label :<%= attribute.name %> %><br />
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
   </div>
 <% end -%>
-  <div class="action">
+  <div class="actions">
     <%% if @<%= singular_name %>.new_record? %>
       <%%= f.submit 'Create' %>
     <%% else %>

railties/lib/generators/rails/stylesheets/templates/scaffold.css

@@ -16,7 +16,7 @@ a { color: #000; }
 a:visited { color: #666; }
 a:hover { color: #fff; background-color:#000; }
 
-div.attribute, div.action {
+div.field, div.actions {
   margin-bottom: 10px;
 }
 

railties/test/generators/scaffold_generator_test.rb

@@ -75,6 +75,7 @@ def test_scaffold_on_invoke
       edit
       new
       show
+      _form
     ).each { |view| assert_file "app/views/product_lines/#{view}.html.erb" }
     assert_file "app/views/layouts/product_lines.html.erb"