<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>railties/lib/generators/erb/scaffold/templates/_form.html.erb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -45,7 +45,6 @@ module Rails
       },
 
       :erb =&gt; {
-        :form =&gt; false,
         :layout =&gt; true
       },
 </diff>
      <filename>railties/lib/generators.rb</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,6 @@ module Erb
 
       argument :attributes, :type =&gt; :array, :default =&gt; [], :banner =&gt; &quot;field:type field:type&quot;
 
-      class_option :form,      :type =&gt; :boolean
       class_option :layout,    :type =&gt; :boolean
       class_option :singleton, :type =&gt; :boolean, :desc =&gt; &quot;Supply to skip index view&quot;
 
@@ -33,7 +32,6 @@ module Erb
       end
 
       def copy_form_file
-        return unless options[:form]
         copy_view :_form
       end
 </diff>
      <filename>railties/lib/generators/erb/scaffold/scaffold_generator.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,18 +1,6 @@
 &lt;h1&gt;Editing &lt;%= singular_name %&gt;&lt;/h1&gt;
 
-&lt;%% form_for(@&lt;%= singular_name %&gt;) do |f| %&gt;
-  &lt;%%= f.error_messages %&gt;
-
-&lt;% for attribute in attributes -%&gt;
-  &lt;p&gt;
-    &lt;%%= f.label :&lt;%= attribute.name %&gt; %&gt;&lt;br /&gt;
-    &lt;%%= f.&lt;%= attribute.field_type %&gt; :&lt;%= attribute.name %&gt; %&gt;
-  &lt;/p&gt;
-&lt;% end -%&gt;
-  &lt;p&gt;
-    &lt;%%= f.submit 'Update' %&gt;
-  &lt;/p&gt;
-&lt;%% end %&gt;
+&lt;%%= render 'form' %&gt;
 
 &lt;%%= link_to 'Show', @&lt;%= singular_name %&gt; %&gt; |
-&lt;%%= link_to 'Back', &lt;%= plural_name %&gt;_path %&gt;
\ No newline at end of file
+&lt;%%= link_to 'Back', &lt;%= plural_name %&gt;_path %&gt;</diff>
      <filename>railties/lib/generators/erb/scaffold/templates/edit.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -1,17 +1,5 @@
 &lt;h1&gt;New &lt;%= singular_name %&gt;&lt;/h1&gt;
 
-&lt;%% form_for(@&lt;%= singular_name %&gt;) do |f| %&gt;
-  &lt;%%= f.error_messages %&gt;
+&lt;%%= render 'form' %&gt;
 
-&lt;% for attribute in attributes -%&gt;
-  &lt;p&gt;
-    &lt;%%= f.label :&lt;%= attribute.name %&gt; %&gt;&lt;br /&gt;
-    &lt;%%= f.&lt;%= attribute.field_type %&gt; :&lt;%= attribute.name %&gt; %&gt;
-  &lt;/p&gt;
-&lt;% end -%&gt;
-  &lt;p&gt;
-    &lt;%%= f.submit 'Create' %&gt;
-  &lt;/p&gt;
-&lt;%% end %&gt;
-
-&lt;%%= link_to 'Back', &lt;%= plural_name %&gt;_path %&gt;
\ No newline at end of file
+&lt;%%= link_to 'Back', &lt;%= plural_name %&gt;_path %&gt;</diff>
      <filename>railties/lib/generators/erb/scaffold/templates/new.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -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;</diff>
      <filename>railties/lib/generators/rails/stylesheets/templates/scaffold.css</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>0fc5c59b37b4e2a809213c63bc9018bee7dc4aaf</id>
    </parent>
  </parents>
  <author>
    <name>Jos&#233; Valim</name>
    <login>josevalim</login>
    <email>jose.valim@gmail.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/5d645c271b350c2a3ed7fd835e539322cda61d8c</url>
  <id>5d645c271b350c2a3ed7fd835e539322cda61d8c</id>
  <committed-date>2009-08-30T07:53:23-07:00</committed-date>
  <authored-date>2009-08-30T07:53:23-07:00</authored-date>
  <message>Change scaffold to use _form as partial and div's instead of paragraphs. [#1760 status:resolved]</message>
  <tree>b65504c9483bbfa9123fa7b6aefa5b80a2e3421d</tree>
  <committer>
    <name>Jos&#233; Valim</name>
    <login>josevalim</login>
    <email>jose.valim@gmail.com</email>
  </committer>
</commit>
