spree_core 0.60.6 → 0.70.RC1

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

@@ -1,5 +1,5 @@
 notice_div = $('.flash.notice');
-<% notice = flash.delete(:notice)
+<% notice = flash.discard(:notice)
 if notice %>
   if (notice_div.length > 0) {
     notice_div.html("<%= notice %>");

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

@@ -1,4 +1,4 @@
-<p class="form-buttons">
+<p class="form-buttons" data-hook="buttons">
   <%= button t("update") %>
   <%= t("or") %> <%= link_to t("cancel"), collection_url %>
 </p>

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

@@ -2,7 +2,7 @@
   <% form_tag admin_product_groups_path do %>
     <%= hidden_field_tag "product_group[product_scopes_attributes][][name]", 'with_ids' %>
     <%= hidden_field_tag "product_group[product_scopes_attributes][][arguments][]", products.map(&:id).join(',') %>
-    <fieldset>
+    <fieldset data-hook="create_group">
       <legend><%= t('create_product_group_from_products') %></legend>
       <label><%= t('name') %></label>
       <%= text_field_tag "product_group[name]",  'New group' %>

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

@@ -0,0 +1,26 @@
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<%= csrf_meta_tags %>
+<title><%= "Spree #{t('administration')}: " %>
+<%= t(controller.controller_name, :default => controller.controller_name.titleize) %></title>
+
+<%= javascript_tag do %>
+  ajax_urls = <%== {
+    :product_search_json       => admin_products_url(:format => 'json'),
+    :product_search_basic_json => admin_products_url(:format => 'json', :json_format => 'basic', :limit => 10),
+    :user_search_basic_json    => admin_users_url(:format => 'json', :json_format => 'basic', :limit => 10)
+  }.to_json %>;
+
+  strings = <%==
+    [:no_results, :type_to_search, :searching].
+    inject({}){|memo, item| {item => t(item) }}.to_json
+  %>
+<% end %>
+
+<%= stylesheet_link_tag "admin/all" %>
+<%= javascript_include_tag "admin/all" %>
+<%= javascript_tag do %>
+  jQuery.alerts.dialogClass = 'spree';
+  <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
+<% end %>
+
+<%= yield :head %>

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

@@ -1,8 +1,8 @@
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li>
       <%= button_link_to t("new_adjustment"), new_admin_order_adjustment_url(@order), :icon => 'add' %>
     </li>
   </ul>
-  <br class='clear' />
-</div>
+  <br class="clear">
+</div>

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

@@ -1,4 +1,4 @@
-<p class="form-buttons">
+<p class="form-buttons" data-hook="buttons">
   <%= button t("actions.create") %>
   <%= t("or") %> <%= link_to t("actions.cancel"), collection_url %>
 </p>

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

@@ -1,3 +1,2 @@
 <%# This redirection is present ONLY to simplify overloading of the admin order summary format %>
 <%= render :partial => 'shared/order_details', :locals => {:order => order} %>
-

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

@@ -1,10 +1,10 @@
 <h1><%= t(:order) + " #{@order.number}" %></h1>
 
 <% content_for :sidebar do %>
-  <div id="order_tab_summary">
-    <h3 id="order_number"><%= "#{t(:order)} ##{@order.number} " %></h3>
-    <h5 id="order_status"><%= "#{t(:status)}: #{t("order_state.#{@order.state}")}" %></h5>
-    <h5 id="order_total"><%= "#{t(:total)}: #{number_to_currency(@order.total)}" %></h5>
+  <div id="order_tab_summary" data-hook>
+    <h3 id="order_number" data-hook><%= "#{t(:order)} ##{@order.number} " %></h3>
+    <h5 id="order_status" data-hook><%= "#{t(:status)}: #{t("order_state.#{@order.state}")}" %></h5>
+    <h5 id="order_total" data-hook><%= "#{t(:total)}: #{number_to_currency(@order.total)}" %></h5>
     <% if @order.completed? %>
       <h5 id="shipment_status"><%= "#{t(:shipment)}: #{t("shipment_states.#{@order.shipment_state}")}"  %></h5>
       <h5 id="payment_status"><%= "#{t(:payment)}: #{t("payment_states.#{@order.payment_state}")}" %></h5>
@@ -13,51 +13,46 @@
   </div>
   <br class="clear" />
 
-  <ul class="sidebar">
-    <%= 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) %>
-        </li>
-        <li<%== ' class="active"' if current == "Customer Details" %>>
-            <%= link_to t("customer_details"), user_admin_order_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == "Shipments" %>>
-           <%= link_to t("shipment"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : edit_admin_order_shipment_url(@order, @order.shipment) %>
-        </li>
-        <li<%== ' class="active"' if current == "Adjustments" %>>
-           <%= link_to t("adjustments"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : admin_order_adjustments_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == "Payments" %>>
-           <%= link_to t("payment"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : new_admin_order_payment_url(@order) %>
-        </li>
-
-      <% else %>
-        <li<%== ' class="active"' if current == "Order Details" %>>
-          <%= link_to t("order_details"), admin_order_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == "Customer Details" %>>
+  <ul class="sidebar" data-hook="admin_order_tabs">
+    <% unless @order.completed? %>
+      <li<%== ' class="active"' if current == "Order Details" %>>
+        <%= link_to t("order_details"), edit_admin_order_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == "Customer Details" %>>
           <%= link_to t("customer_details"), user_admin_order_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == "Adjustments" %>>
-           <%= link_to t("adjustments"), admin_order_adjustments_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == "Payments" %>>
-           <%= link_to t("payments"), admin_order_payments_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == "Shipments" %>>
-           <%= link_to t("shipments"), admin_order_shipments_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == "Return Authorizations" %>>
-           <%= link_to t("return_authorizations"), admin_order_return_authorizations_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == "History" %>>
-           <%= link_to t("history"), history_admin_order_url(@order) %>
-        </li>
-      <% end %>
-
-
+      </li>
+      <li<%== ' class="active"' if current == "Shipments" %>>
+         <%= link_to t("shipment"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : edit_admin_order_shipment_url(@order, @order.shipment) %>
+      </li>
+      <li<%== ' class="active"' if current == "Adjustments" %>>
+         <%= link_to t("adjustments"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : admin_order_adjustments_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == "Payments" %>>
+         <%= link_to t("payment"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : new_admin_order_payment_url(@order) %>
+      </li>
 
+    <% else %>
+      <li<%== ' class="active"' if current == "Order Details" %>>
+        <%= link_to t("order_details"), admin_order_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == "Customer Details" %>>
+        <%= link_to t("customer_details"), user_admin_order_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == "Adjustments" %>>
+         <%= link_to t("adjustments"), admin_order_adjustments_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == "Payments" %>>
+         <%= link_to t("payments"), admin_order_payments_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == "Shipments" %>>
+         <%= link_to t("shipments"), admin_order_shipments_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == "Return Authorizations" %>>
+         <%= link_to t("return_authorizations"), admin_order_return_authorizations_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == "History" %>>
+         <%= link_to t("history"), history_admin_order_url(@order) %>
+      </li>
     <% end %>
   </ul>
 

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

@@ -1,11 +1,9 @@
 <% content_for :sub_menu do %>
-  <ul id="sub_nav">
-    <%= hook :admin_product_sub_tabs do %>
-      <%= tab :products, :match_path => '/products' %>
-      <%= tab :option_types, :match_path => '/option_types' %>
-      <%= tab :properties %>
-      <%= tab :prototypes %>
-      <%= tab :product_groups, :match_path => '/product_groups', :css_class => 'last' %>
-    <% end %>
+  <ul id="sub_nav" data-hook="admin_product_sub_tabs">
+    <%= tab :products, :match_path => '/products' %>
+    <%= tab :option_types, :match_path => '/option_types' %>
+    <%= tab :properties %>
+    <%= tab :prototypes %>
+    <%= tab :product_groups, :match_path => '/product_groups', :css_class => 'last' %>
   </ul>
 <% end %>

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

@@ -5,29 +5,25 @@
   <h3><%= @product.name %><span class='sku'><%= @product.sku %></span></h3>
   <br class="clear" />
 
-  <ul class="sidebar product-menu">
-    <%= hook :admin_product_tabs, {:current => current} do %>
-
-      <li<%== ' class="active"' if current == "Product Details" %>>
-        <%= link_to t("product_details"), edit_admin_product_url(@product) %>
-      </li>
-      <li<%== ' class="active"' if current == "Images" %>>
-        <%= link_to t("images"), admin_product_images_url(@product) %>
-      </li>
-      <li<%== ' class="active"' if current == "Variants" %>>
-        <%= link_to t("variants"),  admin_product_variants_url(@product)  %>
-      </li>
-      <li<%== ' class="active"' if current == "Option Types" %>>
-        <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
-      </li>
-      <li<%== ' class="active"' if current == "Product Properties" %>>
-        <%= link_to t("product_properties"), admin_product_product_properties_url(@product) %>
-      </li>
-      <li<%== ' class="active"' if current == "Taxons" %>>
-        <%= link_to t("taxons"), selected_admin_product_taxons_url(@product) %>
-      </li>
-
-    <% end %>
+  <ul class="sidebar product-menu" data-hook="admin_product_tabs">
+    <li<%== ' class="active"' if current == "Product Details" %>>
+      <%= link_to t("product_details"), edit_admin_product_url(@product) %>
+    </li>
+    <li<%== ' class="active"' if current == "Images" %>>
+      <%= link_to t("images"), admin_product_images_url(@product) %>
+    </li>
+    <li<%== ' class="active"' if current == "Variants" %>>
+      <%= link_to t("variants"),  admin_product_variants_url(@product)  %>
+    </li>
+    <li<%== ' class="active"' if current == "Option Types" %>>
+      <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
+    </li>
+    <li<%== ' class="active"' if current == "Product Properties" %>>
+      <%= link_to t("product_properties"), admin_product_product_properties_url(@product) %>
+    </li>
+    <li<%== ' class="active"' if current == "Taxons" %>>
+      <%= link_to t("taxons"), selected_admin_product_taxons_url(@product) %>
+    </li>
   </ul>
   <br class="clear" />
 

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

@@ -2,11 +2,11 @@
     <label><%= t("date_range") %></label><br />
     <div class="yui-g date-range-filter">
       <div class="yui-u sub-field first">
-        <%= s.spree_date_picker :created_at_greater_than %><br />
+        <%= s.text_field :created_at_greater_than, :class => 'datepicker' %><br />
         <label class="sub"><%= t("start") %></label>
       </div>
       <div class="yui-u sub-field">
-        <%= s.spree_date_picker :created_at_less_than %><br />
+        <%= s.text_field :created_at_less_than, :class => 'datepicker' %><br />
         <label><%= t("stop") %></label>
       </div>
     </div>

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

@@ -1,5 +1,5 @@
-<p class="actions">
+<p class="actions" data-hook="actions">
 <%= link_to t("edit"), edit_object_url %> |
 <%= link_to t("back"), collection_url %> |
 <%= link_to t("delete"), object_url, :confirm => t('are_you_sure_you_want_to_delete_this_record'), :method => :delete %>
-</p>
+</p>

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

@@ -1,6 +1,6 @@
 <%= tab :overview, :route => :admin %>
 <%= tab :orders, :payments, :creditcard_payments, :shipments, :creditcards, :return_authorizations %>
-<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons %>
+<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :product_groups, :taxons %>
 <%= tab :reports %>
 <%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration' %>
 <%= tab :users %>

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

@@ -1,51 +1,47 @@
-<%- locals = {:shipment_form => shipment_form} %>
-
 <% unless @shipment.order.cart? %>
-  <%= hook :admin_shipment_form_inventory_units, locals do %>
-    <table class="index" style="width:100%;">
-      <tr>
-        <th width="130px"><%= t('include_in_shipment') %></th>
-        <th><%= t('sku') %></th>
-        <th><%= t('item_description') %></th>
-        <th><%= t('status') %></th>
-        <th><%= t('note') %></th>
-      </tr>
+  <table class="index" style="width:100%;" data-hook="admin_shipment_form_inventory_units">
+    <tr data-hook="shipments_header">
+      <th width="130px"><%= t('include_in_shipment') %></th>
+      <th><%= t('sku') %></th>
+      <th><%= t('item_description') %></th>
+      <th><%= t('status') %></th>
+      <th><%= t('note') %></th>
+    </tr>
 
-      <% @shipment.order.inventory_units.each do |inventory_unit| %>
-        <tr>
-          <td style="text-align:center;">
-            <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
-                              :true,
-                              (inventory_unit.shipment == @shipment),
-                              { :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">
-            <%=inventory_unit.variant.product.name %>
-            <%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>
-          </td>
-          <td><%= t(inventory_unit.state) %></td>
-          <td>
-            <% if inventory_unit.shipment == @shipment %>
-              <%= t('included_in_this_shipment') %>
-            <% elsif !inventory_unit.shipment_id.nil? %>
-              <%= t('included_in_other_shipment') %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment) %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </table>
-  <% end %>
+    <% @shipment.order.inventory_units.each do |inventory_unit| %>
+      <tr data-hook="shipments_row">
+        <td style="text-align:center;">
+          <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
+                            :true,
+                            (inventory_unit.shipment == @shipment),
+                            { :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">
+          <%=inventory_unit.variant.product.name %>
+          <%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>
+        </td>
+        <td><%= t(inventory_unit.state) %></td>
+        <td>
+          <% if inventory_unit.shipment == @shipment %>
+            <%= t('included_in_this_shipment') %>
+          <% elsif !inventory_unit.shipment.nil? %>
+            <%= t('included_in_other_shipment') %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment) %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
 <% end %>
 
-<%= hook :admin_shipment_form_address, locals do %>
+<div data-hook="admin_shipment_form_address">
   <% shipment_form.fields_for 'address' do |sa_form|  %>
     <%= render :partial => 'admin/shared/address_form', :locals => {:f => sa_form, :name => t("shipping_address"), :use_billing => false} %>
   <% end %>
-<% end %>
+</div>
 
-<%= hook :admin_shipment_form_details, locals do %>
+<div data-hook="admin_shipment_form_details">
   <table class="index">
     <tr>
       <th colspan="8"><%= t("shipment_details") %></th>
@@ -74,4 +70,4 @@
       </tr>
     <% end %>
   </table>
-<% end %>
+</div>

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

@@ -1,32 +1,30 @@
-<div class='toolbar'>
-  <ul class='actions'>
-    <%= hook :admin_shipment_edit_buttons do %>
-      <li>
-        <% if @shipment.can_ship? %>
-          <%= button_link_to(t('ship'), fire_admin_order_shipment_path(@order, @shipment, :e => 'ship'), :method => :put, :confirm => t("are_you_sure")) %>
-        <% end %>
-      </li>
-    <% end %>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions" data-hook="admin_shipment_edit_buttons">
+    <li>
+      <% if @shipment.can_ship? %>
+        <%= button_link_to(t('ship'), fire_admin_order_shipment_path(@order, @shipment, :e => 'ship'), :method => :put, :confirm => t("are_you_sure")) %>
+      <% end %>
+    </li>
   </ul>
   <br class='clear' />
 </div>
 
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
 
-<%= hook :admin_shipment_edit_header do %>
+<div data-hook="admin_shipment_edit_header">
   <h2><%= t('shipment') %> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :state_names, :default => @shipment.state.to_s.humanize) %>)</h2>
   <% if @shipment.cost %>
     <h3><%= t('charges') %> <%= number_to_currency @shipment.cost %></h3>
   <% end %>
 
   <%= render "shared/error_messages", :target => @shipment %>
-<% end %>
+</div>
 
-<%= hook :admin_shipment_edit_form do %>
+<div data-hook="admin_shipment_edit_form">
   <%= form_for(@shipment, :url => admin_order_shipment_path(@order, @shipment), :html => { :method => :put }) do |shipment_form| %>
       <%= render :partial => "form", :locals => { :shipment_form => shipment_form } %>
 
-      <%= hook :admin_shipment_edit_form_buttons do %>
+      <div data-hook="admin_shipment_edit_form_buttons">
         <p class="form-buttons">
           <% if self.respond_to?(:current_user) && @shipment.editable_by?(current_user) %>
             <%= button @order.cart? ? t('continue') : t('update') %>
@@ -35,6 +33,6 @@
             <%= link_to raw("&laquo; #{t("back")}"), edit_admin_order_shipment_path(@order) %>
           <% end %>
         </p>
-      <% end %>
+      </div>
   <% end %>
-<% end %>
+</div>

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

@@ -1,5 +1,5 @@
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li id='new_shipment_section'>
       <%= button_link_to t("new_shipment"), new_admin_order_shipment_url(@order), :icon => 'add'  %>
     </li>
@@ -8,37 +8,28 @@
 </div>
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
 <table class="index">
-  <tr>
-    <%= hook :admin_shipments_index_headers do %>
-      <th><%= t("shipment_number") %></th>
-      <th><%= t("shipping_method") %></th>
-      <th><%= t("shipping_cost") %></th>
-      <th><%= t("tracking") %></th>
-      <th><%= t("status") %></th>
-      <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-    <% end %>
-    <th>
-      <%= hook :admin_shipments_index_header_actions do %>
-        <%= t("action") %>
-      <% end %>
+  <tr data-hook="admin_shipments_index_headers">
+    <th><%= t("shipment_number") %></th>
+    <th><%= t("shipping_method") %></th>
+    <th><%= t("shipping_cost") %></th>
+    <th><%= t("tracking") %></th>
+    <th><%= t("status") %></th>
+    <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
+    <th data-hook="admin_shipments_index_header_actions">
+      <%= t("action") %>
     </th>
   </tr>
   <% @shipments.each do |shipment| %>
-    <tr id="<%= dom_id shipment %>">
-      <%- locals = {:shipment => shipment} %>
-      <%= hook :admin_shipments_index_rows, locals do %>
-        <td><%= shipment.number %></td>
-        <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
-        <td><%= number_to_currency shipment.cost %></td>
-        <td><%= shipment.tracking %></td>
-        <td><%= t(shipment.state.to_sym, :scope => :state_names, :default => shipment.state.to_s.humanize) %></td>
-        <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
-      <% end %>
-      <td class="actions">
-        <%= hook :admin_shipments_index_row_actions, locals do %>
-          <%= link_to_with_icon 'edit', t('edit'), edit_admin_order_shipment_url(@order, shipment) %>
-          <%= link_to_delete shipment, :url => admin_order_shipment_url(@order, shipment) %>
-        <% end %>
+    <tr id="<%= dom_id shipment %>" data-hook="admin_shipments_index_rows">
+      <td><%= shipment.number %></td>
+      <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
+      <td><%= number_to_currency shipment.cost %></td>
+      <td><%= shipment.tracking %></td>
+      <td><%= t(shipment.state.to_sym, :scope => :state_names, :default => shipment.state.to_s.humanize) %></td>
+      <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
+      <td class="actions" data-hook="admin_shipments_index_row_actions">
+        <%= link_to_with_icon 'edit', t('edit'), edit_admin_order_shipment_url(@order, shipment) %>
+        <%= link_to_delete shipment, :url => admin_order_shipment_url(@order, shipment) %>
       </td>
     </tr>
   <% end %>