spree_core 0.60.6 → 0.70.0

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

@@ -1,29 +1,29 @@
 <% 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' %>
+        <%= button_link_to t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :icon => 'add' %>
       </li>
     </ul>
-    <br class='clear' />
+    <br class="clear" />
   </div>
 <% end %>
 
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Return Authorizations"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Return Authorizations'} %>
 
 <table class="index">
-  <tr>
-    <th><%= t("rma_number") %></th>
-    <th><%= t("status") %></th>
-    <th><%= t("amount") %></th>
+  <tr data-hook="rma_header">
+    <th><%= t(:rma_number) %></th>
+    <th><%= t(:status) %></th>
+    <th><%= t(:amount) %></th>
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
     <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>
+      <td><%= number_to_currency return_authorization.amount %></td>
       <td><%= return_authorization.created_at.to_s(:date_time24) %></td>
       <td>
         <%= link_to_edit return_authorization %>
@@ -36,10 +36,10 @@
     </tr>
   <% end %>
   <% unless @order.inventory_units.any? &:shipped? %>
-    <tr>
-      <td colspan="5"><%= t("cannot_create_returns") %></td>
+    <tr data-hook="rma_cannont_create">
+      <td colspan="5"><%= t(:cannot_create_returns) %></td>
     </tr>
   <% end %>
 </table>
 
-<%= button_link_to t('continue'), admin_orders_url %>
+<%= button_link_to t(:continue), admin_orders_url %>

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

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

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

@@ -1,5 +1,5 @@
 <p>
-  <%= label controller.controller_name.singularize, field[:name], t("activerecord.attributes.variant." + field[:name].downcase, :default => field[:name].titleize)%><br />
+  <%= label controller.controller_name.singularize, field[:name], t('activerecord.attributes.variant.' + field[:name].downcase, :default => field[:name].titleize)%><br />
   <%= additional_field_for(controller, field) %>
   <%= error_message_on controller.controller_name.singularize, attribute_name_for(field[:name]) %>
 </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,68 +1,68 @@
 <table class="index">
   <thead>
-    <tr>
+    <tr data-hook="use_billing">
       <th colspan="8">
         <%= name %>
         <span class="right">
           <% if use_billing %>
-            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> <%= t("use_billing_address") %>
+            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> <%= t(:use_billing_address) %>
           <% end %>
         </span>
       </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" : "" %>">
-    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
+  <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)+':' %>
+        <%= f.label :firstname, t(:first_name) + ':' %>
       </td>
       <td class="val-col" colspan="3"><%= f.text_field :firstname %></td>
       <td class="lbl-col">
-        <%= f.label :lastname, t(:last_name)+':' %>
+        <%= f.label :lastname, t(:last_name) + ':' %>
       </td>
       <td class="val-col" colspan="3"><%= f.text_field :lastname %></td>
     </tr>
-    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
+    <tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
       <td class="lbl-col">
-        <%= f.label :address1, t(:street_address)+':' %>
+        <%= f.label :address1, t(:street_address) + ':' %>
       </td>
       <td colspan="3"><%= f.text_field :address1, :class => "fullwidth" %></td>
       <td class="lbl-col">
-        <%= f.label :address2, t(:street_address_2)+':' %>
+        <%= f.label :address2, t(:street_address_2) + ':' %>
       </td>
       <td colspan="3"><%= f.text_field :address2, :class => "fullwidth" %></td>
     </tr>
-    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
+    <tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
       <td class="lbl-col">
-        <%= f.label :city, t(:city)+':' %>
+        <%= f.label :city, t(:city) + ':' %>
       </td>
       <td colspan="3"><%= f.text_field :city %></td>
       <td class="lbl-col">
-        <%= f.label :zipcode, t(:zip)+':' %>
+        <%= f.label :zipcode, t(:zip) + ':' %>
       </td>
-      <td colspan="3"><%= f.text_field :zipcode, :style => "width:100px;" %></td>
+      <td colspan="3"><%= f.text_field :zipcode, :style => 'width: 100px;' %></td>
     </tr>
-    <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">
+    <tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
       <td class="lbl-col">
-        <%= f.label :state_id, t(:state)+':' %>
+        <%= f.label :state_id, t(:state) + ':' %>
       </td>
       <td colspan="3">
-        <span id="<%= name==t('shipping_address') ? "s" : "b" %>state">
+        <span id="<%= name == t(:shipping_address) ? 's' : 'b' %>state">
 
-          <%= f.text_field :state_name, :style => "width:150px;display:#{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty? %>
-          <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:style=> "width:150px;display:#{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
+          <%= f.text_field :state_name, :style => "width:150px; display: #{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty? %>
+          <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:style => "width:150px; display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
         </span>
       </td>
       <td class="lbl-col">
-        <%= f.label :country_id, t(:country)+':' %>
+        <%= f.label :country_id, t(:country) + ':' %>
       </td>
       <td colspan="3">
-        <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, available_countries, :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" %>">
+    <tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
       <td class="lbl-col">
-        <%= f.label :phone, t(:phone)+':' %>
+        <%= f.label :phone, t(:phone) + ':' %>
       </td>
       <td colspan="7"><%= f.text_field :phone %></td>
     </tr>
@@ -70,10 +70,9 @@
 </table>
 
 <% content_for :head do %>
-  <%= javascript_include_tag '/states', 'admin/address_states' %>
-  <script type="text/javascript">
-    jQuery(document).ready(function(){
-      $('span#<%= name==t('shipping_address') ? "s" : "b" %>country select').change(function() { update_state('<%= name==t('shipping_address') ? "s" : "b" %>'); });
+  <%= javascript_tag do -%>
+    $(document).ready(function(){
+      $('span#<%= name == t(:shipping_address) ? 's' : 'b' %>country select').change(function() { update_state('<%= name == t(:shipping_address) ? 's' : 'b' %>'); });
     });
-  </script>
+  <% end -%>
 <% end %>

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

@@ -1,9 +1,9 @@
-<fieldset id="calculator_fields">
-  <legend><%= t('calculator') %></legend>
-  <div id="preference-settings">
+<fieldset id="calculator_fields" data-hook>
+  <legend><%= t(:calculator) %></legend>
+  <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"}) %>
+      <%= 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? %>
       <div class="calculator-settings">
@@ -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

@@ -1,22 +1,21 @@
 <% content_for :sidebar do %>
 
-  <h3><%= t("configurations") %></h3>
+  <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 %>

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 %>");
@@ -13,4 +13,4 @@ if notice %>
   } <%
 end %>
 
-<%= render(:partial => "/admin/shared/update_order_state") if @order %>
+<%= render :partial => '/admin/shared/update_order_state' if @order %>

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

@@ -1,4 +1,4 @@
-<p class="form-buttons">
-  <%= button t("update") %>
-  <%= t("or") %> <%= link_to t("cancel"), collection_url %>
+<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

@@ -1,12 +1,12 @@
 <% if products.any? %>
   <% 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>
-      <legend><%= t('create_product_group_from_products') %></legend>
-      <label><%= t('name') %></label>
-      <%= text_field_tag "product_group[name]",  'New group' %>
-      <input type="submit" value="<%= t('create') %>">
+    <%= 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 data-hook="create_group">
+      <legend><%= t(:create_product_group_from_products) %></legend>
+      <%= label_tag nil, t(:name) %>
+      <%= text_field_tag 'product_group[name]', t(:new_group) %>
+      <%= submit_tag t(:create) %>
     </fieldset>
   <% end %>
 <% end %>

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

@@ -0,0 +1,26 @@
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<%= 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' %>
+      <%= 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">
-  <%= button t("actions.create") %>
-  <%= t("or") %> <%= link_to t("actions.cancel"), collection_url %>
+<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" %>>
-          <%= 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 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 == '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

@@ -1,33 +1,29 @@
-<h1><%== t("editing_product") + " &ldquo;#{@product.name}&rdquo;" %></h1>
+<h1><%== t(:editing_product) + " &ldquo;#{@product.name}&rdquo;" %></h1>
 
 <% content_for :sidebar do %>
 
-  <h3><%= @product.name %><span class='sku'><%= @product.sku %></span></h3>
+  <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

@@ -1,15 +1,15 @@
 <%= 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">
-        <%= s.spree_date_picker :created_at_greater_than %><br />
-        <label class="sub"><%= t("start") %></label>
+    <%= label_tag nil, t(:date_range) %><br />
+    <div class="date-range-filter">
+      <div class="left sub-field">
+        <%= s.text_field :created_at_greater_than, :class => 'datepicker' %><br />
+        <%= label_tag nil, t(:start), :class => 'sub' %>
       </div>
-      <div class="yui-u sub-field">
-        <%= s.spree_date_picker :created_at_less_than %><br />
-        <label><%= t("stop") %></label>
+      <div class="right sub-field">
+        <%= s.text_field :created_at_less_than, :class => 'datepicker' %><br />
+        <%= label_tag nil, t(:stop) %>
       </div>
     </div>
 
-    <p><%= button t("search") %></p>
+    <p><%= button t(:search) %></p>
 <% end %>

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

@@ -1,5 +1,5 @@
-<p class="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 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>

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 %>