spree_core 0.60.6 → 0.70.RC1

data/app/views/admin/products/{new.erb → new.html.erb}

@@ -2,8 +2,8 @@
 
 <%= render "shared/error_messages", :target => @product %>
 
-<%= form_for(:product,  :url => collection_url, :html => { :multipart => true }) do |f| %>
-<fieldset>
+<%= form_for([:admin, @product], :html => { :multipart => true }) do |f| %>
+<fieldset data-hook="new_product">
 
   <%= f.field_container :name do %>
     <%= f.label :name, t("name") %> <span class="required">*</span><br />
@@ -11,7 +11,7 @@
     <%= f.error_message_on :name %>
   <% end %>
 
-  <div class="yui-gb">
+  <div class="yui-gb"  data-hook="new_product_attrs">
     <div class="yui-u first">
 
       <% unless @product.has_variants? %>
@@ -39,7 +39,7 @@
       <p>
         <%= f.label :available_on, t("available_on") %><br />
         <%= f.error_message_on :available_on %>
-        <%= f.spree_date_picker :available_on, :style=>"width:150px" %>
+        <%= f.text_field :available_on, :class => 'datepicker', :style => "width:150px" %>
       </p>
 
 
@@ -50,4 +50,3 @@
 
 </fieldset>
 <% end %>
-<%= javascript_tag "datePickerController.create();" %>

data/app/views/admin/products/new.js.erb

@@ -0,0 +1,3 @@
+$("#new_product").html('<%= escape_javascript(render :template => "admin/products/new.html.erb") %>');
+handle_date_picker_fields();
+$("#admin_new_product").parent().hide();

data/app/views/admin/properties/_form.html.erb

@@ -1,12 +1,15 @@
-<%= f.field_container :name do %>
-  <%= f.label :name, t("name") %> <span class="required">*</span><br />
-  <%= f.text_field :name %>
-  <%= f.error_message_on :name %>
-<% end %>
+<div data-hook="admin_property_form">
 
-<%= f.field_container :presentation do %>
-  <%= f.label :presentation, t("presentation") %> <span class="required">*</span><br />
-  <%= f.text_field :presentation %>
-  <%= f.error_message_on :presentation %>
-<% end %>
+  <%= f.field_container :name do %>
+    <%= f.label :name, t("name") %> <span class="required">*</span><br />
+    <%= f.text_field :name %>
+    <%= f.error_message_on :name %>
+  <% end %>
 
+  <%= f.field_container :presentation do %>
+    <%= f.label :presentation, t("presentation") %> <span class="required">*</span><br />
+    <%= f.text_field :presentation %>
+    <%= f.error_message_on :presentation %>
+  <% end %>
+
+</div>

data/app/views/admin/properties/edit.html.erb

@@ -4,7 +4,7 @@
 
 <%= render 'shared/error_messages', :target => @property %>
 
-<%= form_for(:property, :url => object_url, :html => { :method => :put }) do |f| %>
+<%= form_for([:admin, @property]) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

data/app/views/admin/properties/index.html.erb

@@ -1,7 +1,7 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li id="new_property_link">
       <%= button_link_to t("new_property"), new_admin_property_url, {:remote => true, :icon => 'add', 'data-update' => 'new_property', :id => 'new_property_link'} %>
     </li>
@@ -15,9 +15,9 @@
 
 <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
 
-<table class="index" id='listing_properties'>
+<table class="index" id='listing_properties' data-hook>
   <thead>
-    <tr>
+    <tr data-hook="listing_properties_header">
       <th><%= t("name") %></th>
       <th><%= t("presentation") %></th>
       <th></th>
@@ -25,7 +25,7 @@
   </thead>
   <tbody>
     <% @properties.each do |property| %>
-      <tr id="<%= dom_id property %>">
+      <tr id="<%= dom_id property %>" data-hook="listing_properties_row">
         <td><%= property.name %></td>
         <td><%= property.presentation %></td>
         <td class="actions">

data/app/views/admin/properties/{new.erb → new.html.erb}

@@ -2,8 +2,8 @@
 
 <%= render 'shared/error_messages', :target => @property %>
 
-<%= form_for(:property, :url => collection_url) do |f| %>
-<fieldset>
+<%= form_for([:admin, @property]) do |f| %>
+<fieldset data-hook="new_property">
   <legend><%= t("new_property")%></legend>
   <%= render :partial => "form", :locals => { :f => f } %>
   <%= render :partial => 'admin/shared/new_resource_links' %>

data/app/views/admin/properties/new.js.erb

@@ -0,0 +1,2 @@
+$("#new_property").html('<%= escape_javascript(render :template => "admin/properties/new.html.erb") %>');
+$("#new_property_link").parent().hide();

data/app/views/admin/prototypes/_form.html.erb

@@ -6,39 +6,39 @@
 
 <h3><%= t("properties") %></h3>
 
-<ul class='checkbox-list' id='properties'>
-	<% Property.sorted.each do |property| %>
+<ul class='checkbox-list' id='properties' data-hook>
+<% Property.sorted.each do |property| %>
   <% selected = if @prototype.new_record?
     (params[:property] and params[:property][:id] and params[:property][:id].include?(property.id.to_s))
   else
     @prototype.properties.include?(property)
   end %>
-		<li>
-	  	<label>
-	  	  <%= check_box_tag "property[id][]", "#{property.id}", selected %>
-        <%= property.name %>
-      </label>
-		</li>
-	<% end %>
+  <li>
+    <label>
+      <%= check_box_tag "property[id][]", "#{property.id}", selected %>
+      <%= property.name %>
+    </label>
+  </li>
+<% end %>
 </ul>
 
 <hr />
 
 <h3><%= t("option_types") %></h3>
 
-<ul class='checkbox-list' id='properties'>
-	<% OptionType.all.each do |option_type| %>
+<ul class='checkbox-list' id='option_types' data-hook>
+<% OptionType.all.each do |option_type| %>
   <% selected = if @prototype.new_record?
     (params[:option_type] and params[:option_type][:id] and params[:option_type][:id].include?(option_type.id.to_s))
   else
     @prototype.option_types.include?(option_type)
   end %>
-		<li>
-	  	<label>
-	  	  <%= check_box_tag "option_type[id][]", "#{option_type.id}", selected %>
-        <%= option_type.name %>
-      </label>
-		</li>
-	<% end %>
+  <li>
+    <label>
+      <%= check_box_tag "option_type[id][]", "#{option_type.id}", selected %>
+      <%= option_type.name %>
+    </label>
+  </li>
+<% end %>
 </ul>
 <hr />

data/app/views/admin/prototypes/_prototypes.html.erb

@@ -0,0 +1,22 @@
+<table class="index">
+  <thead>
+    <tr data-hook="avilable_header">
+      <th><%= t("name") %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @prototypes.each do |prototype| %>
+      <tr id="row_<%= prototype.id %>" data-hook="available_row">
+        <td><%= prototype.name %></td>
+        <td class="actions">
+          <%= link_to icon('add') + ' ' + t("select"), select_admin_prototype_url(prototype), 
+                      :class => 'ajax iconlink select_properties_from_prototype' %>
+        </td>
+      </tr>
+    <% end %>
+    <% if @prototypes.empty? %>
+     <tr data-hook="available_none"><td colspan="2"><% t("none") %>.</td></tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/admin/prototypes/available.js.erb

@@ -0,0 +1,2 @@
+$("#prototypes").html('<%= escape_javascript(render :partial => "admin/prototypes/prototypes") %>');
+$("#new_ptype_link").hide();

data/app/views/admin/prototypes/edit.html.erb

@@ -3,7 +3,7 @@
 
 <%= render "shared/error_messages", :target => @prototype %>
 
-<%= form_for(:prototype, :url => object_url, :html => { :method => :put }) do |f| %>
+<%= form_for([:admin, @prototype]) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

data/app/views/admin/prototypes/index.html.erb

@@ -1,7 +1,7 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li id="new_prototype_link">
       <%= button_link_to t("new_prototype"), new_admin_prototype_url, {:remote => true, :icon => 'add', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
     </li>
@@ -12,19 +12,19 @@
 
 <h1><%=t("prototypes") %></h1>
 
-<%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
+<%= image_tag "spinner.gif", :plugin => "spree", :style => "display:none", :id => 'busy_indicator' %>
 <div id="new_prototype"></div>
 
-<table class="index" id='listing_prototypes'>
+<table class="index" id='listing_prototypes' data-hook>
   <thead>
-    <tr>
+    <tr data-hook="prototypes_header">
       <th><%= t("name") %></th>
       <th><%= t("action") %></th>
     </tr>
   </thead>
   <tbody>
     <% @prototypes.each do |prototype| %>
-      <tr id="<%= dom_id prototype %>">
+      <tr id="<%= dom_id prototype %>" data-hook="prototypes_row">
         <td><%= prototype.name %></td>
         <td class="actions">
           <%= link_to_edit(prototype, :class => 'admin_edit_prototype') %>

data/app/views/admin/prototypes/{new.erb → new.html.erb}

@@ -2,8 +2,8 @@
 
 <%= render 'shared/error_messages', :target => @prototype %>
 
-<%= form_for(:prototype, :url => collection_url) do |f| %>
-<fieldset>
+<%= form_for([:admin, @prototype]) do |f| %>
+<fieldset data-hook="new_prototype">
   <legend><%= t("new_prototype")%></legend>
   <%= render :partial => "form", :locals => { :f => f } %>
   <%= render :partial => 'admin/shared/new_resource_links' %>

data/app/views/admin/prototypes/new.js.erb

@@ -0,0 +1,2 @@
+$("#new_prototype").html('<%= escape_javascript(render :template => "admin/prototypes/new.html.erb") %>');
+$("#new_prototype_link").parent().hide();

data/app/views/admin/reports/index.html.erb

@@ -2,14 +2,14 @@
 
 <table class="index">
   <thead>
-    <tr>
+    <tr data-hook="reports_header">
       <th><%= t("name") %></th>
       <th><%= t("description") %></th>
     </tr>
   </thead>
   <tbody>
     <% @reports.each do |key, value| %>
-    <tr>
+    <tr data-hook="reports_row">
       <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
       <td><%= value[:description] %></td>
     </tr>

data/app/views/admin/reports/sales_total.html.erb

@@ -1,6 +1,6 @@
 <h1><%= t("sales_totals") %> </h1>
 
-<table class="admin-report">
+<table class="admin-report" data-hook="sales_total">
   <tbody>
     <tr>
       <th scope="row"><%= t("item_total") %>:</th>

data/app/views/admin/return_authorizations/_form.html.erb

@@ -1,12 +1,12 @@
 <table class="index">
-  <tr>
+  <tr data-hook="rma_header">
     <th><%= t("product") %></th>
     <th><%= t("quantity_shipped") %></th>
     <th><%= t("quantity_returned") %></th>
     <th><%= t("return_quantity") %></th>
   </tr>
   <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
-    <tr id="<%= dom_id(variant) %>">
+    <tr id="<%= dom_id(variant) %>" data-hook="rma_row">
       <td>
         <h4 style="margin-bottom:0px;"><%= variant.name %></h4>
         <%= variant.options_text %>

data/app/views/admin/return_authorizations/edit.html.erb

@@ -1,5 +1,5 @@
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li>
       <% if @return_authorization.can_receive? %>
         <%= button_link_to(t('receive'), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :confirm => t("are_you_sure")) %>
@@ -17,10 +17,10 @@
 <h2><%= t("return_authorization")%> <%= @return_authorization.number %> (<%= t(@return_authorization.state.downcase) %>)</h2>
 
 <%= render "shared/error_messages", :target => @return_authorization %>
-<%= form_for(@return_authorization, :url => object_url, :html => { :method => :put}) do |f| %>
+<%= form_for([:admin, @order, @return_authorization]) do |f| %>
   <%= render :partial => "form", :locals => {:f => f} %>
 
-  <p class="form-buttons">
+  <p class="form-buttons" data-hook="buttons">
     <%= button t('update') %>
     <%= t("or") %> <%= link_to t("actions.cancel"), admin_order_return_authorizations_url(@order) %>
   </p>

data/app/views/admin/return_authorizations/index.html.erb

@@ -1,6 +1,6 @@
 <% if @order.inventory_units.any? &:shipped? %>
-  <div class='toolbar'>
-    <ul class='actions'>
+  <div class="toolbar" data-hook="toolbar">
+    <ul class="actions">
       <li>
         <%= button_link_to t("new_return_authorization"), new_admin_order_return_authorization_url(@order), :icon => 'add' %>
       </li>
@@ -12,7 +12,7 @@
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Return Authorizations"} %>
 
 <table class="index">
-  <tr>
+  <tr data-hook="rma_header">
     <th><%= t("rma_number") %></th>
     <th><%= t("status") %></th>
     <th><%= t("amount") %></th>
@@ -20,7 +20,7 @@
     <th></th>
   </tr>
   <% @return_authorizations.each do |return_authorization| %>
-    <tr id="<%= dom_id(return_authorization) %>">
+    <tr id="<%= dom_id(return_authorization) %>" data-hook="rma_row">
       <td><%= return_authorization.number %></td>
       <td><%= t(return_authorization.state.downcase) %></td>
       <td><%= number_to_currency(return_authorization.amount) %></td>
@@ -36,7 +36,7 @@
     </tr>
   <% end %>
   <% unless @order.inventory_units.any? &:shipped? %>
-    <tr>
+    <tr data-hook="rma_cannont_create">
       <td colspan="5"><%= t("cannot_create_returns") %></td>
     </tr>
   <% end %>

data/app/views/admin/return_authorizations/new.html.erb

@@ -3,10 +3,10 @@
 <h2><%= t("new_return_authorization")%></h2>
 
 <%= render "shared/error_messages", :target => @return_authorization %>
-<%= form_for @return_authorization, :url => collection_url do |f| %>
+<%= form_for([:admin, @order, @return_authorization]) do |f| %>
   <%= render :partial => "form", :locals => {:f => f} %>
 
-  <p class="form-buttons">
+  <p class="form-buttons" data-hook="buttons">
     <%= button t('continue') %>
     <%= t("or") %> <%= link_to t("actions.cancel"), admin_order_return_authorizations_url(@order) %>
   </p>

data/app/views/admin/shared/_address.html.erb

@@ -1,4 +1,4 @@
-<p>
+<p data-hook="address">
   <%="#{address.firstname} #{address.lastname} (#{address.phone}" %><%= address.alternative_phone unless address.alternative_phone.blank? %>)<br />
   <%= address.address1 %> <%= ", #{address.address2}" unless address.address2.blank? %>
   <%= ", #{address.city}, #{address.state_text}, #{address.zipcode}, #{address.country.name}" %>

data/app/views/admin/shared/_address_form.html.erb

@@ -1,6 +1,6 @@
 <table class="index">
   <thead>
-    <tr>
+    <tr data-hook="use_billing">
       <th colspan="8">
         <%= name %>
         <span class="right">
@@ -11,7 +11,7 @@
       </th>
     </tr>
   </thead>
-  <tbody id="<%= name == t('shipping_address') ? "shipping" : "billing" %>" style="display:<%= (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address))) ? "none" : "" %>">
+  <tbody id="<%= name == t('shipping_address') ? "shipping" : "billing" %>" style="display:<%= (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address))) ? "none" : "" %>" data-hook="address_fields">
     <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
       <td class="lbl-col">
         <%= f.label :firstname, t(:first_name)+':' %>
@@ -70,9 +70,8 @@
 </table>
 
 <% content_for :head do %>
-  <%= javascript_include_tag '/states', 'admin/address_states' %>
   <script type="text/javascript">
-    jQuery(document).ready(function(){
+    $(document).ready(function(){
       $('span#<%= name==t('shipping_address') ? "s" : "b" %>country select').change(function() { update_state('<%= name==t('shipping_address') ? "s" : "b" %>'); });
     });
   </script>

data/app/views/admin/shared/_calculator_fields.html.erb

@@ -1,6 +1,6 @@
-<fieldset id="calculator_fields">
+<fieldset id="calculator_fields" data-hook>
   <legend><%= t('calculator') %></legend>
-  <div id="preference-settings">
+  <div id="preference-settings" data-hook>
     <p>
       <%= f.label(:calc_type, t("calculator"), :for => "calc-type") %>
       <%= f.collection_select(:calculator_type, @calculators, :to_s, :description, {}, {:id => "calc-type"}) %>
@@ -12,7 +12,7 @@
         <% end %>
       </div>
       <% if @object.calculator.respond_to?(:preferences) %>
-        <div id="calculator-settings-warning"><%= t('calculator_settings_warning')%></div>
+        <div class="calculator-settings-warning"><%= t('calculator_settings_warning')%></div>
       <% end %>
     <% end %>
   </div>

data/app/views/admin/shared/_configuration_menu.html.erb

@@ -3,20 +3,19 @@
   <h3><%= t("configurations") %></h3>
   <br class="clear" />
 
+  <ul class="sidebar" data-hook="admin_configurations_sidebar_menu">
+    <%= configurations_sidebar_menu_item t("general_settings"), admin_general_settings_path %>
+    <%= configurations_sidebar_menu_item t("mail_methods"), admin_mail_methods_path %>
+    <%= configurations_sidebar_menu_item t("tax_categories"), admin_tax_categories_path %>
+    <%= configurations_sidebar_menu_item t("zones"), admin_zones_path %>
+    <%= configurations_sidebar_menu_item t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %>
+    <%= configurations_sidebar_menu_item t("payment_methods"), admin_payment_methods_path %>
+    <%= configurations_sidebar_menu_item t("taxonomies"), admin_taxonomies_path %>
+    <%= configurations_sidebar_menu_item t("shipping_methods"), admin_shipping_methods_path %>
+    <%= configurations_sidebar_menu_item t("inventory_settings"), admin_inventory_settings_path %>
+    <%= configurations_sidebar_menu_item t("analytics_trackers"), admin_trackers_path %>
+  </ul>
   <ul class="sidebar">
-    <%= hook :admin_configurations_sidebar_menu do %>
-    <li<%== ' class="active"' if controller.controller_name == 'general_settings' %>><%= link_to t("general_settings"), admin_general_settings_path %></li>
-    <li<%== ' class="active"' if controller.controller_name == 'mail_methods' %>><%= link_to t("mail_methods"), admin_mail_methods_path %></li>
-    <li<%== ' class="active"' if controller.controller_name == 'tax_categories' %>><%= link_to t("tax_categories"), admin_tax_categories_path %></li>
-    <li<%== ' class="active"' if controller.controller_name == 'zones' %>><%= link_to t("zones"), admin_zones_path %></li>
-    <li<%== ' class="active"' if controller.controller_name == 'states' %>><%= link_to t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %></li>
-    <li<%== ' class="active"' if controller.controller_name == 'payment_methods' %>><%= link_to t("payment_methods"), admin_payment_methods_path %></li>
-    <li<%== ' class="active"' if ['taxonomies', 'taxons'].include? controller.controller_name %>><%= link_to t("taxonomies"), admin_taxonomies_path %></li>
-    <li<%== ' class="active"' if controller.controller_name == 'shipping_methods' %>><%= link_to t("shipping_methods"), admin_shipping_methods_path %></li>
-    <li<%== ' class="active"' if controller.controller_name == 'inventory_settings' %>><%= link_to t("inventory_settings"), admin_inventory_settings_path %></li>
-    <li<%== ' class="active"' if controller.controller_name == 'trackers' %>><%= link_to t("analytics_trackers"), admin_trackers_path %></li>
-    <% end %>
-    <li<%== ' class="active"' if controller.controller_name == 'configurations' %>><%= link_to t("complete_list"), admin_configurations_path %></li>
+    <li id="complete_settings_list"><%= link_to t("complete_list"), admin_configurations_path %>
   </ul>
-
 <% end %>