Change scaffold to use _form as partial and div's instead of paragraphs. [#1760 status:resolved]

railties/lib/generators.rb

@@ -45,7 +45,6 @@ module Generators
       },
 
       :erb => {
-        :form => false,
         :layout => true
       },
 

railties/lib/generators/erb/scaffold/scaffold_generator.rb

@@ -7,7 +7,6 @@ class ScaffoldGenerator < Base
 
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
-      class_option :form,      :type => :boolean
       class_option :layout,    :type => :boolean
       class_option :singleton, :type => :boolean, :desc => "Supply to skip index view"
 
@@ -33,7 +32,6 @@ def copy_new_file
       end
 
       def copy_form_file
-        return unless options[:form]
         copy_view :_form
       end
 

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

@@ -0,0 +1,17 @@
+<%% form_for(@<%= singular_name %>) do |f| %>
+  <%%= f.error_messages %>
+
+<% for attribute in attributes -%>
+  <div class="attribute">
+    <%%= f.label :<%= attribute.name %> %><br />
+    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+  </div>
+<% end -%>
+  <div class="action">
+    <%% if @<%= singular_name %>.new_record? %>
+      <%%= f.submit 'Create' %>
+    <%% else %>
+      <%%= f.submit 'Update' %>
+    <%% end %>
+  </div>
+<%% end %>

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

@@ -1,18 +1,6 @@
 <h1>Editing <%= singular_name %></h1>
 
-<%% form_for(@<%= singular_name %>) do |f| %>
-  <%%= f.error_messages %>
-
-<% for attribute in attributes -%>
-  <p>
-    <%%= f.label :<%= attribute.name %> %><br />
-    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
-  </p>
-<% end -%>
-  <p>
-    <%%= f.submit 'Update' %>
-  </p>
-<%% end %>
+<%%= render 'form' %>
 
 <%%= link_to 'Show', @<%= singular_name %> %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Back', <%= plural_name %>_path %>

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

@@ -1,17 +1,5 @@
 <h1>New <%= singular_name %></h1>
 
-<%% form_for(@<%= singular_name %>) do |f| %>
-  <%%= f.error_messages %>
+<%%= render 'form' %>
 
-<% for attribute in attributes -%>
-  <p>
-    <%%= f.label :<%= attribute.name %> %><br />
-    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
-  </p>
-<% end -%>
-  <p>
-    <%%= f.submit 'Create' %>
-  </p>
-<%% end %>
-
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Back', <%= plural_name %>_path %>

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

@@ -16,6 +16,10 @@ a { color: #000; }
 a:visited { color: #666; }
 a:hover { color: #fff; background-color:#000; }
 
+div.attribute, div.action {
+  margin-bottom: 10px;
+}
+
 .fieldWithErrors {
   padding: 2px;
   background-color: red;