spree_core 0.70.0.rc2 → 0.70.0

data/app/views/admin/product_groups/_preview.html.erb

@@ -3,11 +3,11 @@
 <h2><%= ProductGroup.human_attribute_name(:products) %> (<%= count %>)</h2>
 
 <% if count == 0 %>
-  <p data-hook="preview_empty"><%= t('no_match_found') %></p>
+  <p data-hook="preview_empty"><%= t(:no_match_found) %></p>
 <% else %>
 
   <% if count > Spree::Config[:admin_pgroup_preview_size] %>
-    <p data-hook="preview_showing"><%= t('showing_first_n', :n => Spree::Config[:admin_pgroup_preview_size]) %></p>
+    <p data-hook="preview_showing"><%= t(:showing_first_n, :n => Spree::Config[:admin_pgroup_preview_size]) %></p>
   <% end %>
 
   <table class="index" data-hook="preview">

data/app/views/admin/product_groups/_product_scope.html.erb

@@ -1,6 +1,6 @@
 <tr id="<%= dom_id product_scope %>" data-hook="product_scope">
   <td data-hook="description">
-    <label><%= t(:name, :scope => [:product_scopes, :scopes, product_scope.name]) %></label>
+    <%= label_tag nil, t(:name, :scope => [:product_scopes, :scopes, product_scope.name]) %>
     <% if description = t(:description, :scope => [:product_scopes, :scopes, product_scope.name], :default => "") and description.present? %>
       <br /><%= description %>
     <% end %>
@@ -10,8 +10,8 @@
       <table><tr>
       <% arguments.each_with_index do |argument, i| %>
         <td>
-          <label><%= t(argument, :scope => [:product_scopes, :scopes, product_scope.name, :args]) %></label><br />
-          <%= hidden_field_tag "product_group[product_scopes_attributes][][id]", product_scope.id %>
+          <%= label_tag nil, t(argument, :scope => [:product_scopes, :scopes, product_scope.name, :args]) %><br />
+          <%= hidden_field_tag 'product_group[product_scopes_attributes][][id]', product_scope.id %>
           <%= product_scope_field product_scope, i %>
         </td>
       <% end %>

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

@@ -1,19 +1,19 @@
 <%= render 'admin/shared/product_sub_menu' %>
 
-<h1><%= t('editing_product_group') %></h1>
+<h1><%= t(:editing_product_group) %></h1>
 
 <fieldset id="product_group_forms_container" data-hook>
 
-  <%= form_for([:admin, @product_group], :html => { :id => 'product-group-form', :method => :put, :remote => true }) do |f| %>
+  <%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :method => :put, :remote => true } do |f| %>
 
       <%= f.field_container :name do %>
-        <%= f.label :name, t("name") %><br />
+        <%= f.label :name, t(:name) %><br />
         <%= f.text_field :name %>
         <%= f.error_message_on :name %>
       <% end %>
 
       <%= f.field_container :order_scope do %>
-        <%= f.label :order_scope, t("sort_ordering") %><br />
+        <%= f.label :order_scope, t(:sort_ordering) %><br />
         <%= f.select(:order_scope, Scopes::Product::ORDERING.collect{|p| [ t(:name, :scope =>[:product_scopes, :scopes, p]), p.to_s ] }) %>
       <% end %>
 
@@ -21,11 +21,11 @@
         <%= render :partial => 'product_scope', :collection => @product_group.product_scopes.reject {|s| s.is_ordering? } %>
       </table>
 
-    <%= button t("update") %>
+    <%= button t(:update) %>
 
   <% end %>
 
-  <%= form_tag(admin_product_group_product_scopes_path(@product_group), :remote => true, :id => 'new_product_group_form') do %>
+  <%= form_tag admin_product_group_product_scopes_path(@product_group), :remote => true, :id => 'new_product_group_form' do %>
     <%
     options =
     grouped_options_for_select(
@@ -40,9 +40,9 @@
     )
     %>
     <p>
-      <label for="product_scope_name"><%= t('add_scope') %></label>
-      <%= select_tag("product_scope[name]", options) %>
-      <input type="submit" value="<%= t('add') %>" />
+      <%= label_tag :product_scope_name, t(:add_scope) %>
+      <%= select_tag 'product_scope[name]', options %>
+      <%= submit_tag t(:add) %>
     </p>
   <% end %>
 

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

@@ -2,21 +2,21 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li>
-      <%= button_link_to t("new_product_group"), new_object_url, :icon => 'add', :id => 'new_product_group_link' %>
+      <%= button_link_to t(:new_product_group), new_object_url, :icon => 'add', :id => 'new_product_group_link' %>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
-<h1><%= t("listing_product_groups") %></h1>
+<h1><%= t(:listing_product_groups) %></h1>
 
 <table class="index" id='listing_product_groups' data-hook>
   <thead>
     <tr data-hook="product_group_header">
-      <th><%= ProductGroup.human_attribute_name("name") %></th>
-      <th><%= ProductGroup.human_attribute_name("url") %></th>
-      <th><%= ProductGroup.human_attribute_name("product_scopes")  %></th>
-      <th><%= ProductGroup.human_attribute_name("product_count")  %></th>
+      <th><%= ProductGroup.human_attribute_name(:name) %></th>
+      <th><%= ProductGroup.human_attribute_name(:url) %></th>
+      <th><%= ProductGroup.human_attribute_name(:product_scopes) %></th>
+      <th><%= ProductGroup.human_attribute_name(:product_count) %></th>
       <th><%= t(:action) %></th>
     </tr>
   </thead>
@@ -25,7 +25,7 @@
       <tr id="<%= dom_id pg %>" data-hook="product_group_row">
         <td><%= link_to pg.name, [:admin, pg] %></td>
         <td><%= link_to pg_search_path(:product_group_name => pg.permalink), pg_search_path(:product_group_name => pg.permalink) %></td>
-        <td><%== pg.product_scopes.map(&:to_sentence).join("<br />") %></td>
+        <td><%== pg.product_scopes.map(&:to_sentence).join('<br />') %></td>
         <td><%= pg.products.count %></td>
         <td>
           <%= link_to_edit pg, :class => 'admin_edit_product_group' %> &nbsp; <%= link_to_delete pg %>

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

@@ -1,12 +1,12 @@
 <%= render 'admin/shared/product_sub_menu' %>
-<%= form_for([:admin, @product_group], :html => { :id => 'product-group-form', :multipart => true }) do |f| %>
+<%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :multipart => true } do |f| %>
   <fieldset data-hook="name">
     <legend><%= t(:product_group) %></legend>
     <%= f.field_container :name do %>
-      <%= f.label :name, t("name") %>
+      <%= f.label :name, t(:name) %>
       <%= f.text_field :name %>
       <%= f.error_message_on :name %>
     <% end %>
   </fieldset>
-  <%=  button t("create") %>
+  <%=  button t(:create) %>
 <% end %>

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

@@ -22,7 +22,7 @@
           <%= product_scope.to_sentence %>
         </td>
         <td>
-          <%= product_scope.arguments.join(", ") %>
+          <%= product_scope.arguments.join(', ') %>
         </td>
       </tr>
     <% end %>

data/app/views/admin/product_groups/update.js.erb

@@ -1,12 +1,12 @@
-jQuery('#preview_container').html('<%= escape_javascript( render('admin/product_groups/preview') ) %>');
+$('#preview_container').html('<%= escape_javascript( render('admin/product_groups/preview') ) %>');
 <% notice = flash[:notice] %>
 <% flash.delete(:notice) %>
 flash_notice = jQuery('.flash.notice');
 if (flash_notice.length > 0) {
   flash_notice.html('<%= notice %>');
 } else {
-  jQuery('#content h1').before('<div class="flash notice"><%= notice %></div>');
+  $('#content h1').before('<div class="flash notice"><%= notice %></div>');
 }
 
 //set form action in case permalink changes
-jQuery('form#product-group-form').attr('action', '<%= url_for([:admin, @product_group]) %>');
+$('form#product-group-form').attr('action', '<%= url_for([:admin, @product_group]) %>');

data/app/views/admin/product_properties/_product_property_fields.html.erb

@@ -1,11 +1,11 @@
 <tr class="product_property fields"  data-hook="product_property">
   <td class='property_name'>
-    <%= f.text_field :property_name, :class => "autocomplete" %>
+    <%= f.text_field :property_name, :class => 'autocomplete' %>
   </td>
   <td class='value'>
-    <%= f.text_field :value, :class => "autocomplete" %>
+    <%= f.text_field :value, :class => 'autocomplete' %>
   </td>
   <td class="actions">
-    <%= link_to_remove_fields t("remove"), f %>
+    <%= link_to_remove_fields t(:remove), f %>
   </td>
 </tr>

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

@@ -1,16 +1,16 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Product Properties"} %>
+<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => 'Product Properties'} %>
 
-<%= render "shared/error_messages", :target => @product %>
+<%= render 'shared/error_messages', :target => @product %>
 
-<%= form_for(@product, :url => admin_product_url(@product), :html => { :method => :put }) do |f| %>
+<%= form_for @product, :url => admin_product_url(@product), :html => { :method => :put } do |f| %>
   <table class="index">
     <thead>
       <tr data-hook="product_properties_header">
-        <th><%= t("property") %></th>
-        <th><%= t("value") %></th>
-        <th><%= t("action") %></th>
+        <th><%= t(:property) %></th>
+        <th><%= t(:value) %></th>
+        <th><%= t(:action) %></th>
       </tr>
     </thead>
     <tbody id="product_properties" data-hook>
@@ -20,28 +20,28 @@
     </tbody>
   </table>
 
-  <input type="hidden" name="clear_product_properties" value="true">
+  <%= hidden_field_tag 'clear_product_properties', 'true' %>
 
   <p class="add_product_properties" data-hook="add_product_properties">
-    <%= link_to_add_fields  icon('add') + ' ' + t("add_product_properties"),
-                            "tbody#product_properties",
+    <%= link_to_add_fields  icon('add') + ' ' + t(:add_product_properties),
+                            'tbody#product_properties',
                             f,
                             :product_properties %>
 
     &nbsp;&nbsp;
 
     <span id="new_ptype_link">
-      <%= link_to t("select_from_prototype"), available_admin_prototypes_url,
-                  :remote => true, 'data-update' => "prototypes" %>
+      <%= link_to t(:select_from_prototype), available_admin_prototypes_url,
+                  :remote => true, 'data-update' => 'prototypes' %>
     </span>
   </p>
   <div id="prototypes" data-hook></div>
-    <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
-    <br/>
+    <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
+    <br />
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>
 
-<%= javascript_tag do %>
+<%= javascript_tag do -%>
   var properties = [<%= @properties.map{|id| "'#{id}'"}.join(', ') %>];
 
   $("#product_properties input.autocomplete").live("keydown", function(){
@@ -51,5 +51,5 @@
       $(this).focus();
     }
   });
-<% end %>
+<% end -%>
 

data/app/views/admin/product_scopes/create.js.erb

@@ -1,3 +1,3 @@
-jQuery('#product_scopes').append('<%= escape_javascript( render('admin/product_groups/product_scope', :product_scope => @product_scope) ) %>');
-jQuery('#<%= dom_id @product_scope %>').hide();
-jQuery('#<%= dom_id @product_scope %>').fadeIn();
+$('#product_scopes').append('<%= escape_javascript( render('admin/product_groups/product_scope', :product_scope => @product_scope) ) %>');
+$('#<%= dom_id @product_scope %>').hide();
+$('#<%= dom_id @product_scope %>').fadeIn();

data/app/views/admin/product_scopes/destroy.js.erb

@@ -1,3 +1,3 @@
-jQuery('#<%= dom_id @product_scope %>').fadeOut();
-jQuery('#<%= dom_id @product_scope %>').remove();
-jQuery('#preview_container').html('<%= escape_javascript( render('admin/product_groups/preview') ) %>');
+$('#<%= dom_id @product_scope %>').fadeOut();
+$('#<%= dom_id @product_scope %>').remove();
+$('#preview_container').html('<%= escape_javascript( render('admin/product_groups/preview') ) %>');

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

@@ -1,102 +1,102 @@
 <div class="clearfix">
   <div class="left" data-hook="admin_product_form_left">
     <%= f.field_container :name do %>
-      <%= f.label :name, t("name") %> <span class="required">*</span><br />
+      <%= f.label :name, t(:name) %> <span class="required">*</span><br />
       <%= f.text_field :name, :class => 'fullwidth title'  %>
       <%= f.error_message_on :name %>
     <% end %>
 
     <%= f.field_container :permalink do %>
-      <%= f.label :permalink, t("permalink") %> <span class="required">*</span><br />
+      <%= f.label :permalink, t(:permalink) %> <span class="required">*</span><br />
       <%= f.text_field :permalink, :class => 'fullwidth title'  %>
       <%= f.error_message_on :permalink %>
     <% end %>
 
     <%= f.field_container :description do %>
-      <%= f.label :description, t("description")%><br />
+      <%= f.label :description, t(:description)%><br />
       <%= f.text_area :description, {:cols => 60, :rows => 4, :class => 'fullwidth'} %>
       <%= f.error_message_on :description %>
     <% end %>
   </div>
   <div class="right" data-hook="admin_product_form_right">
       <%= f.field_container :price do %>
-        <%= f.label :price, t("master_price")%> <span class="required">*</span><br>
+        <%= f.label :price, t(:master_price) %> <span class="required">*</span><br />
         <%= f.text_field :price, :value => number_with_precision(@product.price, :precision => 2)  %>
         <%= f.error_message_on :price %>
       <% end %>
 
       <%if Spree::Config[:show_price_inc_vat] %>
-        <%= label_tag :price_includes_vat , I18n.t(:price_with_vat_included, :price => I18n.t(:price)) %><br>
+        <%= label_tag :price_includes_vat , I18n.t(:price_with_vat_included, :price => I18n.t(:price)) %><br />
         <%= text_field_tag :price_including_vat, product_price(@product, :show_vat_text => false), :size => 30 %>
-        <script type="text/javascript">
+        <%= javascript_tag do -%>
           var effective_tax_rate = <%= @product.effective_tax_rate %>;
-        </script>
-      <%end%>
+        <% end -%>
+      <% end %>
 
       <%= f.field_container :cost_price do %>
-        <%= f.label :cost_price, t("cost_price")%><br />
+        <%= f.label :cost_price, t(:cost_price) %><br />
         <%= f.text_field :cost_price, :value => number_with_precision(@product.cost_price, :precision => 2) %>
       <%= f.error_message_on :cost_price %>
     <% end %>
 
     <p>
-      <%= f.label :available_on, t("available_on") %><br />
+      <%= f.label :available_on, t(:available_on) %><br />
       <%= f.error_message_on :available_on %>
       <%= f.text_field :available_on, :class => 'datepicker' %>
     </p>
 
     <p>
-      <%= f.label :sku, t("sku") %><br />
+      <%= f.label :sku, t(:sku) %><br />
       <%= f.text_field :sku, :size => 16 %>
     </p>
     <% unless @product.has_variants? %>
       <% if Spree::Config[:track_inventory_levels] %>
         <p>
-          <%= f.label :on_hand, t("on_hand")%><br />
+          <%= f.label :on_hand, t(:on_hand) %><br />
           <%= f.text_field :on_hand, :size => 4 %>
         </p>
       <% end %>
       <ul id="shipping-specs">
         <li>
-          <%= f.label :weight, t("weight")%>
+          <%= f.label :weight, t(:weight) %>
           <%= f.text_field :weight, :size => 4 %>
         </li>
         <li>
-          <%= f.label :height, t("height")%>
+          <%= f.label :height, t(:height) %>
           <%= f.text_field :height, :size => 4 %>
         </li>
         <li>
-          <%= f.label :width, t("width")%>
+          <%= f.label :width, t(:width) %>
           <%= f.text_field :width, :size => 4 %>
         </li>
         <li>
-          <%= f.label :depth, t("depth")%>
+          <%= f.label :depth, t(:depth) %>
           <%= f.text_field :depth, :size => 4 %>
         </li>
       </ul>
     <% end %>
     <p>
-      <%= f.label :shipping_category_id, t("shipping_categories")%><br />
-      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, {:include_blank => true}, {"style" => "width:200px"}) %>
+      <%= f.label :shipping_category_id, t(:shipping_categories) %><br />
+      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, {:include_blank => true}, {'style' => 'width:200px'}) %>
       <%= f.error_message_on :shipping_category %>
     </p>
 
     <p>
-      <%= f.label :tax_category_id, t("tax_category")%><br />
-      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, {:include_blank => true}, {"style" => "width:200px"}) %>
-      <%= f.error_message_on :tax_category%>
+      <%= f.label :tax_category_id, t(:tax_category) %><br />
+      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, {:include_blank => true}, {'style' => 'width:200px'}) %>
+      <%= f.error_message_on :tax_category %>
     </p>
   </div>
 </div>
 
-<h2><%= t("metadata") %></h2>
+<h2><%= t(:metadata) %></h2>
 <div data-hook="admin_product_form_meta">
   <p>
-    <%= f.label :meta_keywords, t("meta_keywords")%><br />
+    <%= f.label :meta_keywords, t(:meta_keywords) %><br />
     <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
   </p>
   <p>
-    <%= f.label :meta_description, t("meta_description")%><br />
+    <%= f.label :meta_description, t(:meta_description) %><br />
     <%= f.text_field :meta_description, :class => 'fullwidth' %>
   </p>
 </div>
@@ -104,6 +104,6 @@
 
 <div data-hook="admin_product_form_additional_fields">
   <% Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:product) }.each do |field| %>
-    <%= render :partial => "admin/shared/additional_field", :locals => {:field => field, :f => f} %>
+    <%= render :partial => 'admin/shared/additional_field', :locals => {:field => field, :f => f} %>
   <% end %>
 </div>

data/app/views/admin/products/_option_types.html.erb

@@ -1,22 +1,22 @@
-<h2><%= t("selected_option_types") %></h2>
+<h2><%= t(:selected_option_types) %></h2>
 <table class="option-types" data-hook="option_types">
   <thead>
     <tr data-hook="option_types_header">
-      <th><%= t("name") %></th>
-      <th><%= t("display") %></th>
-      <th><%= t("action") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:display) %></th>
+      <th><%= t(:action) %></th>
     </tr>
   </thead>
   <tbody>
     <% @product.selected_options.each do |so| %>
       <tr data-hook="option_types_row">
-        <td><%=so.option_type.name%></td>
-        <td><%=so.option_type.presentation%></td>
+        <td><%= so.option_type.name%></td>
+        <td><%= so.option_type.presentation%></td>
         <td>
-          <%= link_to_remote t("remove"),
-                             :url => {:action => 'remove_option_type', :id=> @product, :product_option_type_id => so},
-                             :before => "jQuery('#select-link').hide(); jQuery('#busy_indicator').show()", 
-                             :complete => "jQuery('#busy_indicator').hide()",
+          <%= link_to_remote t(:remove),
+                             :url => {:action => 'remove_option_type', :id => @product, :product_option_type_id => so},
+                             :before => "$('#select-link').hide(); $('#busy_indicator').show()", 
+                             :complete => "$('#busy_indicator').hide()",
                              :update => 'option-type-listing' %>
         </td>
       </tr>
@@ -30,11 +30,11 @@
 </table>
 <% unless @product.new_record? %>
   <span id="select-link" data-hook>
-    <%= link_to_remote icon('delete') + ' ' + t("select_option_type"), {
-                       :url => {:controller => 'option_types', :action => 'select', :id=> @product},
+    <%= link_to_remote icon('delete') + ' ' + t(:select_option_type), {
+                       :url => {:controller => 'option_types', :action => 'select', :id => @product},
                        :update => 'new-option-type'}, :class => 'iconlink' %>
   </span>
-  <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
+  <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
 <% end %>
-<br/>
+<br />
 <div id="new-option-type" data-hook></div>