spree_core 0.70.0.rc2 → 0.70.0

data/app/views/admin/products/_properties_form.erb

@@ -1,4 +1,4 @@
-<h2>Properties</h2>
+<h2><%= t(:properties) %></h2>
 <% f.fields_for :product_properties do |properties_form| %>
     <p data-hook="value">
       <%= properties_form.label :value, properties_form.object.property.presentation %><br />

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

@@ -1,9 +1,9 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Product Details"} %>
-<%= render "shared/error_messages", :target => @product %>
+<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => 'Product Details'} %>
+<%= render 'shared/error_messages', :target => @product %>
 
-<%= form_for([:admin, @product], :html => { :method => :put, :multipart => true }) do |f| %>
+<%= form_for [:admin, @product], :html => { :method => :put, :multipart => true } do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -3,21 +3,21 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li id="new_product_link">
-      <%= button_link_to t("new_product"), new_object_url, {:remote => true, :icon => 'add', :id => 'admin_new_product'} %>
+      <%= button_link_to t(:new_product), new_object_url, {:remote => true, :icon => 'add', :id => 'admin_new_product'} %>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
-<h1><%= "#{t("actions.listing")} #{t("products")}" %></h1>
+<h1><%= "#{t('actions.listing')} #{t(:products)}" %></h1>
 
 <div id="new_product" data-hook></div>
 
-<table class="index" id='listing_products'>
+<table class="index" id="listing_products">
   <tr data-hook="admin_products_index_headers">
-    <th><%= t("sku") %></th>
-    <th><%= sort_link @search,:name, t("name"), {}, {:title => 'admin_products_listing_name_title'} %></th>
-    <th><%= sort_link @search,:master_price, t("master_price") %></th>
+    <th><%= t(:sku) %></th>
+    <th><%= sort_link @search,:name, t(:name), {}, {:title => 'admin_products_listing_name_title'} %></th>
+    <th><%= sort_link @search,:master_price, t(:master_price) %></th>
     <th data-hook="admin_products_index_header_actions"></th>
   </tr>
 <% @collection.each do |product| %>
@@ -46,22 +46,22 @@
         <%- locals = {:f => f} %>
         <div data-hook="admin_products_index_search">
           <p>
-            <%= f.label :name_contains, t("name") %><br />
+            <%= f.label :name_contains, t(:name) %><br />
             <%= f.text_field :name_contains, :size => 15 %>
           </p>
           <p>
-            <%= f.label :variants_including_master_sku_contains, t("sku") %><br />
+            <%= f.label :variants_including_master_sku_contains, t(:sku) %><br />
             <%= f.text_field :variants_including_master_sku_contains, :size => 15 %>
           </p>
           <p>
-            <%= f.label :deleted_at_is_null, t("show_deleted") %><br />
-            <%= f.check_box :deleted_at_is_null, {:checked => params[:search][:deleted_at_is_null].blank?}, "", "1" %>
+            <%= f.label :deleted_at_is_null, t(:show_deleted) %><br />
+            <%= f.check_box :deleted_at_is_null, {:checked => params[:search][:deleted_at_is_null].blank?}, '', '1' %>
           </p>
         </div>
 
         <div data-hook="admin_products_index_search_buttons">
           <p class="form-buttons">
-            <%= button t("search") %>
+            <%= button t(:search) %>
           </p>
         </div>
       </div>

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

@@ -1,29 +1,29 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<%= render "shared/error_messages", :target => @product %>
+<%= render 'shared/error_messages', :target => @product %>
 
-<%= form_for([:admin, @product], :html => { :multipart => true }) do |f| %>
+<%= 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 />
+    <%= f.label :name, t(:name) %> <span class="required">*</span><br />
     <%= f.text_field :name, :class => 'fullwidth title'  %>
     <%= f.error_message_on :name %>
   <% end %>
 
-  <div class="clearfix"  data-hook="new_product_attrs">
+  <div class="clearfix" data-hook="new_product_attrs">
     <div class="left">
 
       <% unless @product.has_variants? %>
-      <%= f.field_container :sku do %>
-        <%= f.label :sku, t("sku") %><br />
-        <%= f.text_field :sku, :size => 16 %>
-        <%= f.error_message_on :sku %>
-      <% end %>
+        <%= f.field_container :sku do %>
+          <%= f.label :sku, t(:sku) %><br />
+          <%= f.text_field :sku, :size => 16 %>
+          <%= f.error_message_on :sku %>
+        <% end %>
       <% end %>
 
       <p>
-        <%= f.label :prototype_id, t("prototype") %><br />
+        <%= f.label :prototype_id, t(:prototype) %><br />
         <%= f.collection_select :prototype_id, Prototype.all, :id, :name, :include_blank => true %>
       </p>
 
@@ -31,13 +31,13 @@
     <div class="right">
 
       <%= f.field_container :price do %>
-        <%= f.label :price, t("master_price")%> <span class="required">*</span><br />
-        <%= f.text_field :price  %>
-        <%= f.error_message_on :price%>
+        <%= f.label :price, t(:master_price) %> <span class="required">*</span><br />
+        <%= f.text_field :price %>
+        <%= f.error_message_on :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', :style => "width:150px" %>
       </p>

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

@@ -1,4 +1,4 @@
 <%= render :partial => 'shared/product_sub_menu' %>
-TODO - show product details here <br/><br/>
+TODO - show product details here <br /><br />
 
 <%= render :partial => 'shared/show_resource_links' %>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_property_form">
 
   <%= 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 %>
     <%= f.error_message_on :name %>
   <% end %>
 
   <%= f.field_container :presentation do %>
-    <%= f.label :presentation, t("presentation") %> <span class="required">*</span><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/edit.html.erb

@@ -1,10 +1,10 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<h1><%= t("editing_property") %></h1>
+<h1><%= t(:editing_property) %></h1>
 
 <%= render 'shared/error_messages', :target => @property %>
 
-<%= form_for([:admin, @property]) do |f| %>
-  <%= render :partial => "form", :locals => { :f => 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

@@ -3,23 +3,23 @@
 <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'} %>
+      <%= 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' />
+  <br class="clear" />
 </div>
 
-<h1><%= t("properties") %></h1>
+<h1><%= t(:properties) %></h1>
 
 <div id="new_property"></div>
 
-<%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
+<%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
 
 <table class="index" id='listing_properties' data-hook>
   <thead>
     <tr data-hook="listing_properties_header">
-      <th><%= t("name") %></th>
-      <th><%= t("presentation") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:presentation) %></th>
       <th></th>
     </tr>
   </thead>

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

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

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

@@ -1,10 +1,10 @@
 <%= 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 %>
 
-<h3><%= t("properties") %></h3>
+<h3><%= t(:properties) %></h3>
 
 <ul class='checkbox-list' id='properties' data-hook>
 <% Property.sorted.each do |property| %>
@@ -15,7 +15,7 @@
   end %>
   <li>
     <label>
-      <%= check_box_tag "property[id][]", "#{property.id}", selected %>
+      <%= check_box_tag 'property[id][]', "#{property.id}", selected %>
       <%= property.name %>
     </label>
   </li>
@@ -24,9 +24,9 @@
 
 <hr />
 
-<h3><%= t("option_types") %></h3>
+<h3><%= t(:option_types) %></h3>
 
-<ul class='checkbox-list' id='option_types' data-hook>
+<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))
@@ -35,7 +35,7 @@
   end %>
   <li>
     <label>
-      <%= check_box_tag "option_type[id][]", "#{option_type.id}", selected %>
+      <%= check_box_tag 'option_type[id][]', "#{option_type.id}", selected %>
       <%= option_type.name %>
     </label>
   </li>

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

@@ -1,7 +1,7 @@
 <table class="index">
   <thead>
     <tr data-hook="avilable_header">
-      <th><%= t("name") %></th>
+      <th><%= t(:name) %></th>
       <th></th>
     </tr>
   </thead>
@@ -10,13 +10,12 @@
       <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' %>
+          <%= 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>
+     <tr data-hook="available_none"><td colspan="2"><% t(:none) %>.</td></tr>
     <% end %>
   </tbody>
 </table>

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

@@ -1,9 +1,9 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
-<h1><%= t("editing_prototype") %></h1>
+<h1><%= t(:editing_prototype) %></h1>
 
-<%= render "shared/error_messages", :target => @prototype %>
+<%= render 'shared/error_messages', :target => @prototype %>
 
-<%= form_for([:admin, @prototype]) do |f| %>
-  <%= render :partial => "form", :locals => { :f => 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

@@ -3,23 +3,23 @@
 <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'} %>
+      <%= 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' />
+  <br class="clear" />
 </div>
 
 
-<h1><%=t("prototypes") %></h1>
+<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' data-hook>
   <thead>
     <tr data-hook="prototypes_header">
-      <th><%= t("name") %></th>
-      <th><%= t("action") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:action) %></th>
     </tr>
   </thead>
   <tbody>

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

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

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

@@ -1,10 +1,10 @@
-<h1><%= t("listing_reports") %></h1>
+<h1><%= t(:listing_reports) %></h1>
 
 <table class="index">
   <thead>
     <tr data-hook="reports_header">
-      <th><%= t("name") %></th>
-      <th><%= t("description") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:description) %></th>
     </tr>
   </thead>
   <tbody>

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

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

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

@@ -1,9 +1,9 @@
 <table class="index">
   <tr data-hook="rma_header">
-    <th><%= t("product") %></th>
-    <th><%= t("quantity_shipped") %></th>
-    <th><%= t("quantity_returned") %></th>
-    <th><%= t("return_quantity") %></th>
+    <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) %>" data-hook="rma_row">
@@ -20,8 +20,7 @@
           0
         <% else %>
           <%= text_field_tag "return_quantity[#{variant.id}]",
-              @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0,
-              {:style => "width:30px;"} %>
+              @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:30px;'} %>
         <% end %>
       </td>
     </tr>
@@ -29,24 +28,24 @@
 </table>
 
 <%= f.field_container :amount do %>
-  <%= f.label :amount, t("amount")%> <span class="required">*</span><br />
+  <%= f.label :amount, t(:amount) %> <span class="required">*</span><br />
   <% if @return_authorization.received? %>
-    <%= number_to_currency(@return_authorization.amount) %>
+    <%= number_to_currency @return_authorization.amount %>
   <% else %>
-    <%= f.text_field :amount, {:style => "width:80px;"} %> <%= t("rma_value") %>: <span id="rma_value"></span>
+    <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value"></span>
     <%= f.error_message_on :amount %>
   <% end %>
 <% end %>
 
 <%= f.field_container :reason do %>
-  <%= f.label :reason, t("reason")%>
-  <%= f.text_area :reason, {:style=> "height:100px;", :class => 'fullwidth'} %>
+  <%= f.label :reason, t(:reason) %>
+  <%= f.text_area :reason, {:style => 'height:100px;', :class => 'fullwidth'} %>
   <%= f.error_message_on :reason %>
 <% end %>
 
 
 <% content_for :head do %>
-  <script type="text/javascript">
+  <%= javascript_tag do -%>
     var variant_prices = new Array();
     <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
       variant_prices[<%= variant.id.to_s %>] = <%= variant.price %>;
@@ -65,7 +64,7 @@
       }
     }
 
-    jQuery(document).ready(function(){
+    $(document).ready(function(){
       $.each($("td.return_quantity input"), function(i, inpt){
         $(inpt).delayedObserver(function() {
           calculate_rma_price();
@@ -74,5 +73,5 @@
 
       calculate_rma_price();
     });
-  </script>
+  <% end -%>
 <% end %>