<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>.gitignore</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,15 +1,15 @@
 &lt;% if @order -%&gt;
-&lt;%= hidden_field &quot;order&quot;, &quot;id&quot; %&gt;
-&lt;%= hidden_field &quot;order&quot;, &quot;status&quot; %&gt;
+&lt;%= form.hidden_field :id %&gt;
+&lt;%= form.hidden_field :status %&gt;
 &lt;% end -%&gt;
 &lt;table class=&quot;form&quot;&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Licensee Name:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;licensee_name&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :licensee_name %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Email:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;email&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :email %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Items:&lt;/td&gt;
@@ -21,47 +21,46 @@
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Company:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;company&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :company %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Billing First Name:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;first_name&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :first_name %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Billing Last Name:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;last_name&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :last_name %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Address 1:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;address1&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :address1 %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Address 2:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;address2&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :address2 %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;City:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;city&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :city %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;State:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;state&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :state %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Postal/Zipcode:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;zipcode&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :zipcode %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Country 2 letter Code:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;country&quot;, :size =&gt; 2 %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :country, :size =&gt; 2 %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Comment:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;comment&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :comment %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 	&lt;tr&gt;
 		&lt;td&gt;Payment Method:&lt;/td&gt;
-		&lt;td&gt;&lt;%= text_field &quot;order&quot;, &quot;payment_type&quot; %&gt;&lt;/td&gt;
+		&lt;td&gt;&lt;%= form.text_field :payment_type %&gt;&lt;/td&gt;
 	&lt;/tr&gt;
 &lt;/table&gt;
-</diff>
      <filename>app/views/admin/orders/_form.rhtml</filename>
    </modified>
    <modified>
      <diff>@@ -2,8 +2,8 @@
 
 &lt;%= error_messages_for :order %&gt;
 
-&lt;% form_for(:order, :url =&gt; order_path(@order), :html =&gt; { :method =&gt; :put }) do |f| %&gt;
-&lt;%= render :partial =&gt; &quot;form&quot; -%&gt;
+&lt;% form_for(:order, :url =&gt; order_path(@order), :html =&gt; {:method =&gt; :put}) do |f| %&gt;
+  &lt;%= render :partial =&gt; &quot;form&quot;, :object =&gt; f -%&gt;
   &lt;p&gt;
     &lt;%= submit_tag &quot;Update&quot; %&gt;
   &lt;/p&gt;</diff>
      <filename>app/views/admin/orders/edit.rhtml</filename>
    </modified>
    <modified>
      <diff>@@ -3,10 +3,8 @@
 &lt;%= error_messages_for :order %&gt;
 
 &lt;% form_for(:order, :url =&gt; orders_path) do |f| %&gt;
-&lt;%= render :partial =&gt; &quot;form&quot; -%&gt;
+&lt;%= render :partial =&gt; &quot;form&quot;, :object =&gt; f -%&gt;
   &lt;p&gt;
     &lt;%= submit_tag &quot;Create&quot; %&gt;
   &lt;/p&gt;
-&lt;% end %&gt;
-
-
+&lt;% end %&gt;
\ No newline at end of file</diff>
      <filename>app/views/admin/orders/new.rhtml</filename>
    </modified>
    <modified>
      <diff>@@ -1,28 +1,25 @@
 &lt;%= error_messages_for 'product' %&gt;
 
-&lt;!--[form:product]--&gt;
 &lt;p&gt;&lt;label for=&quot;product_code&quot;&gt;Code&lt;/label&gt;&lt;br/&gt;
-&lt;%= text_field 'product', 'code'  %&gt;&lt;/p&gt;
+&lt;%= form.text_field :code %&gt;&lt;/p&gt;
 
 &lt;p&gt;&lt;label for=&quot;product_name&quot;&gt;Name&lt;/label&gt;&lt;br/&gt;
-&lt;%= text_field 'product', 'name'  %&gt;&lt;/p&gt;
+&lt;%= form.text_field :name %&gt;&lt;/p&gt;
 
 &lt;p&gt;&lt;label for=&quot;product_price&quot;&gt;Price&lt;/label&gt;&lt;br/&gt;
-&lt;%= text_field 'product', 'price'  %&gt;&lt;/p&gt;
+&lt;%= form.text_field :price %&gt;&lt;/p&gt;
 
 &lt;p&gt;&lt;label for=&quot;product_image_path&quot;&gt;Image path&lt;/label&gt;&lt;br/&gt;
-&lt;%= text_area 'product', 'image_path' , {&quot;cols&quot; =&gt; 40, &quot;rows&quot; =&gt; 3} %&gt;&lt;/p&gt;
+&lt;%= form.text_field :image_path , {&quot;cols&quot; =&gt; 40, &quot;rows&quot; =&gt; 3} %&gt;&lt;/p&gt;
 
 &lt;p&gt;&lt;label for=&quot;product_url&quot;&gt;Url&lt;/label&gt;&lt;br/&gt;
-&lt;%= text_area 'product', 'url' , {&quot;cols&quot; =&gt; 40, &quot;rows&quot; =&gt; 3} %&gt;&lt;/p&gt;
+&lt;%= form.text_field :url , {&quot;cols&quot; =&gt; 40, &quot;rows&quot; =&gt; 3} %&gt;&lt;/p&gt;
 
 &lt;p&gt;&lt;label for=&quot;product_download_url&quot;&gt;Download url&lt;/label&gt;&lt;br/&gt;
-&lt;%= text_area 'product', 'download_url' , {&quot;cols&quot; =&gt; 40, &quot;rows&quot; =&gt; 3} %&gt;&lt;/p&gt;
+&lt;%= form.text_field :download_url , {&quot;cols&quot; =&gt; 40, &quot;rows&quot; =&gt; 3} %&gt;&lt;/p&gt;
 
 &lt;p&gt;&lt;label for=&quot;product_license_url_scheme&quot;&gt;License url scheme&lt;/label&gt;&lt;br/&gt;
-&lt;%= text_area 'product', 'license_url_scheme' , {&quot;cols&quot; =&gt; 40, &quot;rows&quot; =&gt; 3}  %&gt;&lt;/p&gt;
+&lt;%= form.text_field :license_url_scheme , {&quot;cols&quot; =&gt; 40, &quot;rows&quot; =&gt; 3} %&gt;&lt;/p&gt;
 
 &lt;p&gt;&lt;label for=&quot;product_active&quot;&gt;Active&lt;/label&gt;&lt;br/&gt;
-&lt;%= check_box 'product', 'active' , {} , &quot;1&quot;, &quot;0&quot; %&gt;&lt;/p&gt;
-&lt;!--[eoform:product]--&gt;
-
+&lt;%= form.check_box :active , {} , &quot;1&quot;, &quot;0&quot; %&gt;&lt;/p&gt;</diff>
      <filename>app/views/admin/products/_form.rhtml</filename>
    </modified>
    <modified>
      <diff>@@ -1,8 +1,8 @@
 &lt;h1&gt;Editing product&lt;/h1&gt;
 
-&lt;% form_tag :action =&gt; 'update', :id =&gt; @product do %&gt;
-  &lt;%= render :partial =&gt; 'form' %&gt;
-  &lt;%= submit_tag 'Edit' %&gt;
+&lt;% form_for(:product, :url =&gt; product_path(@product), :html =&gt; {:method =&gt; :put}) do |f| %&gt;
+    &lt;%= render :partial =&gt; 'form', :object =&gt; f %&gt;
+    &lt;%= submit_tag &quot;Update&quot; %&gt;
 &lt;% end %&gt;
 
 &lt;%= link_to 'Show', product_path %&gt; |</diff>
      <filename>app/views/admin/products/edit.rhtml</filename>
    </modified>
    <modified>
      <diff>@@ -1,8 +1,10 @@
 &lt;h1&gt;New product&lt;/h1&gt;
 
-&lt;% form_tag :action =&gt; 'create' do %&gt;
-  &lt;%= render :partial =&gt; 'form' %&gt;
-  &lt;%= submit_tag &quot;Create&quot; %&gt;
+&lt;%= error_messages_for :product %&gt;
+
+&lt;% form_for(:product, :url =&gt; products_path) do |f| %&gt;
+    &lt;%= render :partial =&gt; 'form', :object =&gt; f %&gt;
+    &lt;%= submit_tag &quot;Create&quot; %&gt;
 &lt;% end %&gt;
 
 &lt;%= link_to 'Back', products_path %&gt;</diff>
      <filename>app/views/admin/products/new.rhtml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>c7d3517ed15a46c6decab1e47e3600b40fdfb7f3</id>
    </parent>
  </parents>
  <author>
    <name>andykim78</name>
    <email>andykim78@25f2d1f3-9e33-0410-bf15-d1b47774bbb0</email>
  </author>
  <url>http://github.com/potionfactory/potionstore/commit/dcff117ceda1069c28bf6d75f24fa550d2340d58</url>
  <id>dcff117ceda1069c28bf6d75f24fa550d2340d58</id>
  <committed-date>2007-09-29T17:41:47-07:00</committed-date>
  <authored-date>2007-09-29T17:41:47-07:00</authored-date>
  <message>modified admin forms to use some resource shortcuts


git-svn-id: https://potionstore.googlecode.com/svn/tags/v0.3@48 25f2d1f3-9e33-0410-bf15-d1b47774bbb0</message>
  <tree>20d9077bbb02dbf8cf5997de56c7d3cddde5516a</tree>
  <committer>
    <name>andykim78</name>
    <email>andykim78@25f2d1f3-9e33-0410-bf15-d1b47774bbb0</email>
  </committer>
</commit>
