From 1e471e5e22dc740a7b0875e10e6ef3cd076f9b62 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Mon, 2 Jul 2012 16:28:31 +1000 Subject: [PATCH] Name all form-containing partials with _form, tweak admin new product form --- app/overrides/add_distributor_to_admin_product.rb | 8 ++++---- app/overrides/add_supplier_to_admin_product.rb | 14 +++++++------- ...tors.html.haml => _distributors_form.html.haml} | 0 ...supplier.html.haml => _supplier_form.html.haml} | 0 4 files changed, 11 insertions(+), 11 deletions(-) rename app/views/spree/admin/products/{_distributors.html.haml => _distributors_form.html.haml} (100%) rename app/views/spree/admin/products/{_supplier.html.haml => _supplier_form.html.haml} (100%) diff --git a/app/overrides/add_distributor_to_admin_product.rb b/app/overrides/add_distributor_to_admin_product.rb index f0fdcae265..649f21f386 100644 --- a/app/overrides/add_distributor_to_admin_product.rb +++ b/app/overrides/add_distributor_to_admin_product.rb @@ -1,9 +1,9 @@ Deface::Override.new(:virtual_path => "spree/admin/products/_form", - :insert_bottom => "[data-hook='admin_product_form_additional_fields']", - :partial => "spree/admin/products/distributors", + :insert_bottom => "[data-hook='admin_product_form_additional_fields']", + :partial => "spree/admin/products/distributors_form", :name => "distributors") Deface::Override.new(:virtual_path => "spree/admin/products/new", - :insert_bottom => ".left", - :partial => "spree/admin/products/distributors", + :insert_after => "[data-hook='new_product_attrs']", + :partial => "spree/admin/products/distributors_form", :name => "distributors") diff --git a/app/overrides/add_supplier_to_admin_product.rb b/app/overrides/add_supplier_to_admin_product.rb index 1607872d6d..b5e2e6ae8f 100644 --- a/app/overrides/add_supplier_to_admin_product.rb +++ b/app/overrides/add_supplier_to_admin_product.rb @@ -1,9 +1,9 @@ -Deface::Override.new(:virtual_path => "spree/admin/products/_form", - :insert_top => "[data-hook='admin_product_form_right']", - :partial => "spree/admin/products/supplier", - :name => "supplier") +Deface::Override.new(:virtual_path => "spree/admin/products/_form", + :insert_top => "[data-hook='admin_product_form_right']", + :partial => "spree/admin/products/supplier_form", + :name => "supplier") Deface::Override.new(:virtual_path => "spree/admin/products/new", - :insert_bottom => ".left", - :partial => "spree/admin/products/supplier", - :name => "supplier") \ No newline at end of file + :insert_bottom => ".right", + :partial => "spree/admin/products/supplier_form", + :name => "supplier") diff --git a/app/views/spree/admin/products/_distributors.html.haml b/app/views/spree/admin/products/_distributors_form.html.haml similarity index 100% rename from app/views/spree/admin/products/_distributors.html.haml rename to app/views/spree/admin/products/_distributors_form.html.haml diff --git a/app/views/spree/admin/products/_supplier.html.haml b/app/views/spree/admin/products/_supplier_form.html.haml similarity index 100% rename from app/views/spree/admin/products/_supplier.html.haml rename to app/views/spree/admin/products/_supplier_form.html.haml