spree_core 0.40.4 → 0.50.0

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

@@ -1,11 +1,11 @@
 <%= f.field_container :name do %>
-  <%= f.label :name, t("name") %><br />
+  <%= 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") %><br />
+  <%= f.label :presentation, t("presentation") %> <span class="required">*</span><br />
   <%= f.text_field :presentation %>
   <%= f.error_message_on :presentation %>
 <% end %>

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

@@ -3,7 +3,7 @@
 <div class='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'} %>
+      <%= button_link_to t("new_property"), new_admin_property_url, {:remote => true, :icon => 'add', 'data-update' => 'new_property', :id => 'new_property_link'} %>
     </li>
   </ul>
   <br class='clear' />
@@ -15,7 +15,7 @@
 
 <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
 
-<table class="index">
+<table class="index" id='listing_properties'>
   <thead>
     <tr>
       <th><%= t("name") %></th>
@@ -29,10 +29,10 @@
         <td><%= property.name %></td>
         <td><%= property.presentation %></td>
         <td class="actions">
-          <%= link_to_edit(property) %>
+          <%= link_to_edit(property, :class => 'edit') %>
           &nbsp;
           <%= link_to_delete(property) %>
-        </td>        
+        </td>
       </tr>
     <% end %>
   </tbody>

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

@@ -3,7 +3,7 @@
 <div class='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'} %>
+      <%= button_link_to t("new_prototype"), new_admin_prototype_url, {:remote => true, :icon => 'add', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
     </li>
   </ul>
   <br class='clear' />
@@ -15,7 +15,7 @@
 <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
 <div id="new_prototype"></div>
 
-<table class="index">
+<table class="index" id='listing_prototypes'>
   <thead>
     <tr>
       <th><%= t("name") %></th>
@@ -27,10 +27,10 @@
       <tr id="<%= dom_id prototype %>">
         <td><%= prototype.name %></td>
         <td class="actions">
-          <%= link_to_edit(prototype) %>
+          <%= link_to_edit(prototype, :class => 'admin_edit_prototype') %>
           &nbsp;
           <%= link_to_delete(prototype) %>
-        </td>        
+        </td>
       </tr>
     <% end %>
   </tbody>

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

@@ -57,7 +57,7 @@
         <%= f.label :country_id, t(:country)+':' %>
       </td>
       <td colspan="3">
-        <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, Country.all, :id, :name, {}, {:style => 'width:150px;'} %></span>
+        <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, {:style => 'width:150px;'} %></span>
       </td>
     </tr>
     <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">

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

@@ -2,7 +2,7 @@
   <legend><%= t('calculator') %></legend>
   <div id="preference-settings">
     <p>
-      <%= f.label(:calc_type, t("calculator")) %>
+      <%= f.label(:calc_type, t("calculator"), :for => "calc-type") %>
       <%= f.collection_select(:calculator_type, @calculators, :to_s, :description, {}, {:id => "calc-type"}) %>
     </p>
     <% if !@object.new_record? %>

data/app/views/admin/shared/_destroy.js.erb

@@ -1,3 +1,16 @@
-$('.flash.notice').html('<%= flash.notice %>');
-$('.flash.notice').show();
+notice_div = $('.flash.notice');
+<% notice = flash.delete(:notice)
+if notice %>
+  if (notice_div.length > 0) {
+    notice_div.html("<%= notice %>");
+    notice_div.show();
+  } else {
+    if ($("#content .toolbar").length > 0) {
+      $("#content .toolbar").before('<div class="flash notice"><%= notice %></div>');
+    } else {
+      $("#content h1").before('<div class="flash notice"><%= notice %></div>');
+    }
+  } <%
+end %>
+
 <%= render(:partial => "/admin/shared/update_order_state") if @order %>

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

@@ -14,7 +14,7 @@
   <br class="clear" />
 
   <ul class="sidebar">
-    <%= hook :admin_order_tabs do %>
+    <%= hook :admin_order_tabs, {:current => current} do %>
       <% unless @order.completed? %>
         <li<%== ' class="active"' if current == "Order Details" %>>
           <%= link_to t("order_details"), edit_admin_order_url(@order) %>

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

@@ -1,4 +1,4 @@
-<%= form_for @search do |s| %>
+<%= form_for @search, :url => sales_total_admin_reports_path  do |s| %>
     <label><%= t("date_range") %></label><br />
     <div class="yui-g date-range-filter">
       <div class="yui-u sub-field first">

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

@@ -17,7 +17,8 @@
             <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
                               :true,
                               (inventory_unit.shipment == @shipment),
-                              {:disabled => %w(shipped backordered returned).include?(inventory_unit.state)} %>
+                              { :disabled => %w(shipped backordered returned).include?(inventory_unit.state),
+                                :class => 'inventory_unit'} %>
           </td>
           <td valign="top" width="120px;"><%= inventory_unit.variant.sku %></td>
           <td width="300">
@@ -53,7 +54,10 @@
       <td>
         <%= shipment_form.label :shipping_method_id, t('shipping_method') + ":" %>
       </td>
-      <td><%= shipment_form.select :shipping_method_id, @shipping_methods.map {|sm| ["#{sm.name} - #{sm.zone.name}", sm.id] } %></td>
+      <td>
+        <%= shipment_form.select :shipping_method_id,
+                                        @shipping_methods.map {|sm| ["#{sm.name} - #{sm.zone.name}", sm.id] } %>
+      </td>
       <td>
         <%= shipment_form.label :tracking, t('tracking') + ":" %>
       </td>

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

@@ -28,7 +28,7 @@
 
       <%= hook :admin_shipment_edit_form_buttons do %>
         <p class="form-buttons">
-          <% if @shipment.editable_by?(current_user) %>
+          <% if self.respond_to?(:current_user) && @shipment.editable_by?(current_user) %>
             <%= button @order.cart? ? t('continue') : t('update') %>
             <%= t("or") %> <%= link_to t("cancel"), collection_url %>
           <% else %>

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

@@ -1,6 +1,6 @@
 <div class='toolbar'>
   <ul class='actions'>
-    <li>
+    <li id='new_shipment_section'>
       <%= button_link_to t("new_shipment"), new_object_url, :icon => 'add'  %>
     </li>
   </ul>
@@ -18,7 +18,9 @@
       <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
     <% end %>
     <th>
-      <%= hook :admin_shipments_index_header_actions %>
+      <%= hook :admin_shipments_index_header_actions do %>
+        <%= t("action") %>
+      <% end %>
     </th>
   </tr>
   <% @shipments.each do |shipment| %>

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

@@ -11,11 +11,13 @@
     <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {"style" => "width:200px"})  %>
     <%= error_message_on :shipping_method, :zone_id %>
   <% end %>
+
   <%= f.field_container :display_on do %>
     <%= f.label :display_on, t("display") %><br />
     <%= select(:shipping_method, :display_on, ShippingMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]})  %>
     <%= error_message_on :shipping_method, :display_on %>
   <% end %>
+
 <% end %>
 
 <%= hook :admin_shipping_method_form_calculator_fields, locals do %>

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

@@ -3,7 +3,8 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t("new_shipping_method"), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t("new_shipping_method"), new_object_url,  :icon => 'add',
+                                                                    :id => 'admin_new_shipping_method_link' %>
     </li>
   </ul>
   <br class='clear' />
@@ -11,7 +12,7 @@
 
 <h1><%= t("shipping_methods") %></h1>
 
-<table class="index">
+<table class="index" id='listing_shipping_methods'>
   <thead>
     <tr>
     <%= hook :admin_shipping_methods_index_headers do %>

data/app/views/admin/states/_state_list.html.erb

@@ -1,4 +1,4 @@
-<table class="index">
+<table class="index" id='listing_states'>
   <thead>
     <tr>
       <th><%= t("name") %></th>
@@ -7,13 +7,17 @@
     </tr>
   </thead>
   <tbody>
-    <% @states.each do |state| %>
+    <% @states.each do |state|
+         @edit_url = admin_country_state_path(@country, state)
+         @delete_url = admin_country_state_path(@country, state)
+    %>
       <tr id="<%= dom_id state %>">
         <td><%=state.name %></td>
         <td><%=state.abbr %></td>
         <td class="actions">
-          <%=link_to_with_icon 'edit', t("edit"), edit_admin_country_state_url(@country, state) %> &nbsp;
-          <%=link_to_delete state %>
+          <%= link_to_with_icon 'edit', t("edit"), edit_admin_country_state_url(@country, state), :class => 'edit' %>
+          &nbsp;
+          <%= link_to_delete state %>
         </td>
       </tr>
     <% end %>
@@ -24,5 +28,7 @@
 </table>
 <div id="new_state"></div>
 <p>
-  <%= button_link_to t("new_state"), new_admin_country_state_url(@country), {:remote => true, :icon => 'add'} %>
+  <%= button_link_to t("new_state"), new_admin_country_state_url(@country), {:remote => true,
+                                                                             :icon => 'add',
+                                                                              :id => 'new_state'} %>
 </p>

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

@@ -3,7 +3,9 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <p><%= button_link_to t("new_tax_category"), new_object_url, :icon => 'add' %></p>
+      <p><%= button_link_to t("new_tax_category"), new_object_url,  :icon => 'add',
+                                                                    :id => 'admin_new_tax_categories_link' %>
+    </p>
     </li>
   </ul>
   <br class='clear' />
@@ -11,7 +13,7 @@
 
 
 <h1><%=t("listing_tax_categories")%></h1>
-<table class="index">
+<table class="index" id='listing_tax_categories'>
   <thead>
     <tr>
       <th><%= t("name") %></th>
@@ -21,13 +23,16 @@
     </tr>
   </thead>
   <tbody>
-    <% @tax_categories.each do |tax_category|%>
+    <% @tax_categories.each do |tax_category|
+         @edit_url = edit_admin_tax_category_path(tax_category)
+         @delete_url = admin_tax_category_path(tax_category)
+    %>
       <tr id="<%= dom_id tax_category %>">
         <td><%= tax_category.name %></td>
         <td><%= tax_category.description %></td>
         <td><%= tax_category.is_default.to_s.titleize %></td>
         <td class="actions">
-          <%=link_to_edit tax_category %> &nbsp;
+          <%=link_to_edit tax_category, :class => 'edit' %> &nbsp;
           <%=link_to_delete tax_category %>
       </tr>
     <% end %>

data/app/views/admin/tax_settings/show.html.erb

@@ -2,9 +2,9 @@
 
 <h1><%= t("tax_settings") %></h1>
 
-<table>
+<table id='listing_tax_settings'>
   <tr>
-    <th scope="row"><%= t("show_price_inc_vat") %>:</th> 
+    <th scope="row"><%= t("show_price_inc_vat") %>:</th>
     <td><%=  Spree::Config[:show_price_inc_vat] %></td>
   </tr>
 </table>

data/app/views/admin/taxonomies/_list.html.erb

@@ -1,4 +1,4 @@
-<table class="index">
+<table class="index" id='listing_taxonomies'>
   <tr>
     <th><%= t("name") %></th>
     <th></th>
@@ -9,7 +9,9 @@
 	    <%= taxonomy.name %>
     </td>
     <td class="actions">
-      <%= link_to_edit taxonomy.id %> &nbsp; <%= link_to_delete taxonomy %>
+      <%= link_to_edit taxonomy.id, :class => 'edit' %>
+      &nbsp;
+      <%= link_to_delete taxonomy %>
     </td>
   </tr>
 <% end %>

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

@@ -3,13 +3,13 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t("new_taxonomy"), new_admin_taxonomy_url, :icon => 'add' %></p>
+      <%= button_link_to t("new_taxonomy"), new_admin_taxonomy_url, :icon => 'add', :id => 'admin_new_taxonomy_link' %></p>
     </li>
   </ul>
   <br class='clear' />
 </div>
 
-<h1><%= t("taxonomies") %></h1>	
+<h1><%= t("taxonomies") %></h1>
 
 <div id='list-taxonomies'>
 	<%= render :partial => 'list' %>

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

@@ -1,4 +1,4 @@
-<%= hook :admin_inside_taxon_form do %>
+<%= hook :admin_inside_taxon_form, {:f => f} do %>
   <%= f.field_container :name do %>
     <%= f.label :name, t("name") %> <span class="required">*</span><br />
     <%= error_message_on :taxon, :name, :class => 'fullwidth title'  %>

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

@@ -3,7 +3,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t("new_tracker"), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t("new_tracker"), new_object_url, :icon => 'add', :id => 'admin_new_tracker_link'  %>
     </li>
   </ul>
   <br class='clear' />
@@ -14,19 +14,19 @@
 <table class="index">
   <thead>
     <tr>
-    <%= hook :admin_trackers_index_headers do %>         
+    <%= hook :admin_trackers_index_headers do %>
       <th><%= t(:google_analytics_id) %></th>
       <th><%= t("environment") %></th>
-      <th><%= t("active") %></th>     
+      <th><%= t("active") %></th>
     <% end %>
       <th><%= t("action") %></th>
     </tr>
   </thead>
   <tbody>
     <% @trackers.each do |tracker|%>
-      <tr id="<%= dom_id tracker %>">     
+      <tr id="<%= dom_id tracker %>">
         <%- locals = {:tracker => tracker} %>
-        <%= hook :admin_trackers_index_rows, locals do %>        
+        <%= hook :admin_trackers_index_rows, locals do %>
           <td><%= tracker.analytics_id %></td>
           <td><%= tracker.environment.to_s.titleize %></td>
           <td><%= tracker.active ? t(:yes) : t(:no) %></td>

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

@@ -19,6 +19,8 @@
   <% end %>
 <% end %>
 
+
+<% if @user.respond_to?(:roles) %>
 <%= hook :admin_user_form_roles, locals do %>
   <p>
     <label><%= t("roles") %></label><br />
@@ -30,7 +32,4 @@
     <% end %>
   </p>
 <% end %>
-
-
-
-
+<% end %>

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

@@ -1,7 +1,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <p><%= button_link_to t("new_user"), new_object_url, :icon => 'add' %></p>
+      <p><%= button_link_to t("new_user"), new_object_url, :icon => 'add', :id => 'admin_new_user_link' %></p>
     </li>
   </ul>
   <br class='clear' />
@@ -11,11 +11,11 @@
 <h1><%= t("listing_users") %></h1>
 
 
-<table class="index">
+<table class="index" id='listing_users'>
   <thead>
   <tr>
     <%= hook :admin_users_index_headers do %>
-      <th><%= order @search, :by => :email, :as => t("user") %></th>
+      <th><%= sort_link @search,:email,t("user"),{}, {:title => 'users_email_title'} %></th>
       <th>
         <%= hook :admin_users_index_header_actions %>
       </th>
@@ -27,11 +27,11 @@
       <tr id="<%= dom_id user %>">
         <%- locals = {:user => user} %>
         <%= hook :admin_users_index_rows, locals do %>
-          <td width="350px"><%=link_to user.email, object_url(user) %></td>
+          <td width="350px" class='user_email'><%=link_to user.email, object_url(user) %></td>
         <% end %>
         <td>
           <%= hook :admin_users_index_row_actions, locals do %>
-            <%= link_to_edit user %> &nbsp;
+            <%= link_to_edit user, :class => "edit" %> &nbsp;
             <%= link_to_delete user %>
           <% end %>
         </td>
@@ -46,7 +46,8 @@
 <% content_for :sidebar do %>
   <div class="box">
     <h3><%= t(:search) %></h3>
-    <%= form_for @search do |f| %>
+    <% @search = User.search %>
+    <%= form_for [:admin, @search] do |f| %>
       <%- locals = {:f => f} %>
       <%= hook :admin_users_index_search, locals do %>
         <p>