spree_backend 2.0.4 → 2.0.5

data/app/views/spree/admin/stock_transfers/index.html.erb

@@ -1,18 +1,18 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t('stock_transfers') %>
+  <%= Spree.t(:stock_transfers) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t('new_stock_transfer'), new_admin_stock_transfer_path, { :icon => 'icon-forward' } %>
+    <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'icon-forward' } %>
   </li>
 <% end %>
 
 <div data-hook="admin_orders_index_search">
   <fieldset>
-    <legend align="center"><%= Spree.t('search') %></legend>
+    <legend align="center"><%= Spree.t(:search) %></legend>
     <%= search_form_for @q, :url => admin_stock_transfers_path do |f| %>
 
       <div class="field-block alpha four columns">
@@ -24,7 +24,7 @@
 
       <div class="four columns">
         <div class="field">
-          <%= f.label :source_location, Spree.t('source') %>
+          <%= f.label :source_location, Spree.t(:source) %>
           <%= f.select :source_location_id_eq,
                options_from_collection_for_select(@stock_locations, :id, :name, @q.source_location_id_eq),
                { include_blank: true }, class: 'select2 fullwidth' %>
@@ -33,7 +33,7 @@
 
       <div class="omega four columns">
         <div class="field">
-          <%= f.label :destination_location, Spree.t('destination') %>
+          <%= f.label :destination_location, Spree.t(:destination) %>
           <%= f.select :destination_location_id_eq,
                options_from_collection_for_select(@stock_locations, :id, :name, @q.destination_location_id_eq),
                { include_blank: true }, class: 'select2 fullwidth' %>
@@ -44,14 +44,14 @@
 
       <div class="actions filter-actions">
         <div data-hook="admin_stock_transfers_index_search_buttons">
-          <%= button Spree.t('filter_results'), 'icon-search' %>
+          <%= button Spree.t(:filter_results), 'icon-search' %>
         </div>
       </div>
     <% end %>
   </fieldset>
 </div>
 
-<% if !@stock_transfers.empty? %>
+<% if @stock_transfers.any? %>
   <table class='index' id='listing_stock_transfers' data-hook>
     <colgroup>
       <col style='width: 25%' />
@@ -62,20 +62,20 @@
     </colgroup>
     <thead>
       <tr data-hook='stock_transfers_header'>
-        <th><%= Spree.t('created_at') %></th>
-        <th><%= Spree.t('reference') %></th>
-        <th><%= Spree.t('source') %></th>
-        <th><%= Spree.t('destination') %></th>
+        <th><%= Spree.t(:created_at) %></th>
+        <th><%= Spree.t(:reference) %></th>
+        <th><%= Spree.t(:source) %></th>
+        <th><%= Spree.t(:destination) %></th>
         <th class='actions'></th>
       </tr>
     </thead>
     <tbody>
       <% @stock_transfers.each do |stock_transfer| %>
         <tr id="<%= spree_dom_id stock_transfer %>" data-hook="stock_transfer_row" class="<%= cycle('odd', 'even')%>">
-          <td><%= stock_transfer.created_at %></td>
-          <td class='align-center'><%= stock_transfer.reference %></td>
-          <td><%= stock_transfer.source_location.try(:name) %></td>
-          <td><%= stock_transfer.destination_location.try(:name) %></td>
+          <td class="align-center"><%= stock_transfer.created_at %></td>
+          <td class="align-center"><%= stock_transfer.reference %></td>
+          <td class="align-center"><%= stock_transfer.source_location.try(:name) %></td>
+          <td class="align-center"><%= stock_transfer.destination_location.try(:name) %></td>
           <td class='actions'>
             <%= link_to '', admin_stock_transfer_path(stock_transfer),
             title: 'view', class: 'view icon_link with-tip icon-eye-open no-text',
@@ -86,8 +86,9 @@
     </tbody>
   </table>
 <% else %>
-  <div class="no-objects-found">
-    <%= Spree.t('empty') %>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_transfer')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_stock_transfer_path %>!
   </div>
 <% end %>
 

data/app/views/spree/admin/stock_transfers/new.html.erb

@@ -1,12 +1,12 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t('new_stock_transfer') %>
+  <%= Spree.t(:new_stock_transfer) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t('back_to_stock_transfers_list'), admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
   </li>
 <% end %>
 
@@ -14,10 +14,10 @@
   {{#each variants}}
     <tr>
       <td>{{name}}</td>
-      <td class="align-center">{{quantity}}</td>
-      <td class="align-center">
-        <button class='icon-trash transfer_remove_variant button'
-                data-variant-id='{{id}}'>remove</button>
+      <td class='align-center'>{{quantity}}</td>
+      <td class='actions'>
+        <button class='icon_link icon-trash no-text transfer_remove_variant'
+                data-variant-id='{{id}}' data-action'remove'></button>
       </td>
       <input type='hidden' id='variant[]' name='variant[]' value='{{id}}'>
       <input type='hidden' id='quantity[]' name='quantity[]' value='{{quantity}}'>
@@ -27,12 +27,12 @@
 
 <%= form_tag admin_stock_transfers_path, :method => :post do %>
   <fieldset class="twelve columns alpha">
-    <legend align="center"><%= Spree.t('transfer_stock')%></legend>
+    <legend align="center"><%= Spree.t(:transfer_stock) %></legend>
 
     <div class="row" data-hook="admin_stock_movements_form_fields">
       <div class="alpha six columns">
         <div class="field" id="stock_movement_reference_field">
-          <%= label_tag 'reference', raw("#{Spree.t('reference')} (#{Spree.t('optional')})") %>
+          <%= label_tag 'reference', raw("#{Spree.t(:reference)} (#{Spree.t(:optional)})") %>
           <%= text_field_tag :reference, '', class: 'fullwidth' %>
         </div>
       </div>
@@ -46,54 +46,57 @@
       </div>
       <div class="alpha six columns">
         <div class="field" id="transfer_source_location_id_field">
-          <%= label_tag :transfer_source_location_id, Spree.t('source') %>
+          <%= label_tag :transfer_source_location_id, Spree.t(:source) %>
           <%= select_tag :transfer_source_location_id, {}, class: 'select2 fullwidth' %>
         </div>
       </div>
       <div class="six columns omega">
         <div class="field" id="transfer_destination_location_id_field">
-          <%= label_tag :transfer_destination_location_id, Spree.t('destination') %>
+          <%= label_tag :transfer_destination_location_id, Spree.t(:destination) %>
           <%= select_tag :transfer_destination_location_id, {}, class: 'select2 fullwidth' %>
         </div>
       </div>
     </div>
 
     <fieldset class="no-border-bottom" id="add-variant-to-transfer">
-      <legend><%= Spree.t('add_variant') %></legend>
+      <legend><%= Spree.t(:add_variant) %></legend>
 
       <div class="alpha eight columns">
         <div class="field" id="stock_movement_variant_id_field">
-          <%= label_tag 'variant_id', Spree.t('variant') %>
+          <%= label_tag 'variant_id', Spree.t(:variant) %>
           <%= select_tag 'transfer_variant', {}, class: 'fullwidth' %>
         </div>
       </div>
       <div class="two columns">
         <div class="field" id="stock_movement_quantity_field">
-          <%= label_tag 'quantity', Spree.t('quantity') %>
+          <%= label_tag 'quantity', Spree.t(:quantity) %>
           <%= number_field_tag 'transfer_variant_quantity', 1, class: 'fullwidth', min: 0 %>
         </div>
       </div>
       <div class="two columns omega">
-        <div class="field">
-          <%= button Spree.t('add'), 'icon-plus button transfer_add_variant' %>
+        <div class="field" style="padding: 25px 0 0 0 !important">
+          <%= button Spree.t(:add), 'icon-plus button transfer_add_variant' %>
         </div>
       </div>
 
     </fieldset>
 
-    <div class="no-objects-found">No variants added for transfer. Please, add one.</div>
+    <div class="alpha twelve columns no-objects-found">
+      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_transfer')) %>,
+      <%= link_to Spree.t(:add_one), spree.new_admin_tax_rate_path %>!
+    </div>
 
     <div id="transfer-variants-table" class="twelve columns alpha" style="display:none">
       <table class="index sortable">
         <colgroup>
-          <col style="width: 60%" />
-          <col style="width: 20%" />
+          <col style="width: 70%" />
           <col style="width: 20%" />
+          <col style="width: 10%" />
         </colgroup>
         <thead data-hook="transfer_variants_header">
           <th><%= Spree.t(:name) %></th>
           <th><%= Spree.t(:quantity) %></th>
-          <th><%= Spree.t(:remove) %></th>
+          <th class="actions"></th>
         </thead>
         <tbody id="transfer_variants_tbody">
 
@@ -102,7 +105,7 @@
     </div>
 
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('transfer_stock'), 'icon-plus transfer_transfer' %>
+      <%= button Spree.t(:transfer_stock), 'icon-plus transfer_transfer' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -1,45 +1,49 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t('stock_transfer') %>
+  <%= Spree.t(:stock_transfer) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t('back_to_stock_transfers_list'), admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
   </li>
   <li>
-    <%= button_link_to Spree.t('new_stock_transfer'), new_admin_stock_transfer_path, { :icon => 'icon-forward' } %>
+    <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'icon-forward' } %>
   </li>
 <% end %>
 
 <fieldset class="no-border-bottom">
-  <legend align="center"><%= Spree.t('stock_transfer') %></legend>
+  <legend align="center"><%= Spree.t(:stock_transfer) %></legend>
 
   <div class="alpha six columns">
     <div class="field">
-      <label><%= Spree.t('reference') %>:</label>
+      <label><%= Spree.t(:reference) %></label>
       <div class="value"><%= @stock_transfer.reference %></div>
     </div>
   </div>
 
   <div class="omega six columns">
     <div class="field">
-      <label><%= Spree.t('created') %>:</label>
+      <label><%= Spree.t(:created_at) %></label>
       <div class="value"><%= @stock_transfer.created_at %></div>
     </div>
   </div>
 
   <% if @stock_transfer.source_movements.present? %>
     <fieldset class="no-border-bottom">
-      <legend><%= Spree.t('source') %> <i class="icon-arrow-right"></i> <%= @stock_transfer.source_location.name %></legend>
+      <legend id="stock-location-source">
+        <%= Spree.t(:source) %> <i class="icon-arrow-right"></i> <%= @stock_transfer.source_location.name %>
+      </legend>
       <%= render :partial => 'stock_movements', :object => @stock_transfer.source_movements %>
     </fieldset>
   <% end %>
 
   <% if @stock_transfer.destination_movements.present? %>
     <fieldset class="no-border-bottom">
-      <legend><%= Spree.t('destination') %> <i class="icon-arrow-right"></i> <%= @stock_transfer.destination_location.name %></legend>
+      <legend id="stock-location-destination">
+        <%= Spree.t(:destination) %> <i class="icon-arrow-right"></i> <%= @stock_transfer.destination_location.name %>
+      </legend>
       <%= render :partial => 'stock_movements', :object => @stock_transfer.destination_movements %>
     </fieldset>
   <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:listing_tax_categories) %>
@@ -12,6 +12,7 @@
   </ul>
 <% end %>
 
+<% if @tax_categories.any? %>
 <table class="index" id='listing_tax_categories' data-hook>
   <colgroup>
     <col style="width: 30%" />
@@ -33,16 +34,19 @@
          @delete_url = admin_tax_category_path(tax_category)
     %>
       <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= tax_category.name %></td>
-        <td><%= tax_category.description %></td>
-        <td class="align-center"><%= tax_category.is_default.to_s.titleize %></td>
+        <td class="align-center"><%= tax_category.name %></td>
+        <td class="align-center"><%= tax_category.description %></td>
+        <td class="align-center"><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions">
           <%= link_to_edit tax_category, :no_text => true %>
           <%= link_to_delete tax_category, :no_text => true %>
       </tr>
     <% end %>
-    <% if @tax_categories.empty? %>
-      <tr data-hook="tax_none"><td colspan="4"><%= Spree.t(:none) %></td></tr>
-    <% end %>
   </tbody>
-</table>
+</table>
+<% else %>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/tax_category')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_tax_category_path %>!
+  </div>
+<% end %>

data/app/views/spree/admin/tax_rates/_form.html.erb

@@ -2,7 +2,7 @@
   <div class="alpha twelve columns">
     <fieldset data-hook="tax_rates" class=" no-border-bottom">
       <legend align="center"><%= Spree.t(:general_settings) %></legend>
-      
+
       <div class="alpha six columns">
         <div data-hook="name" class="field">
           <%= f.label :name, Spree.t(:name) %>
@@ -11,11 +11,11 @@
         <div data-hook="rate" class="field">
           <%= f.label :amount, Spree.t(:rate) %>
           <%= f.text_field :amount, :class => 'fullwidth' %>
-          <p><em><%= Spree.t(:tax_rate_amount_explanation) %></em></p>
+          <br/><span class="info"><%= Spree.t(:tax_rate_amount_explanation) %></span>
         </div>
         <div data-hook="included" class="field">
           <%= f.check_box :included_in_price %>
-          <%= f.label :included_in_price, Spree.t(:included_in_price) %>      
+          <%= f.label :included_in_price, Spree.t(:included_in_price) %>
         </div>
       </div>
 
@@ -23,20 +23,20 @@
         <div data-hook="zone" class="field">
           <%= f.label :zone, Spree.t(:zone) %>
           <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {:class => 'select2 fullwidth'}) %>
-        </div>      
+        </div>
         <div data-hook="category" class="field">
           <%= f.label :tax_category_id, Spree.t(:tax_category) %>
           <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {:class => 'select2 fullwidth'}) %>
         </div>
         <div data-hook="show_rate" class="field">
           <%= f.check_box :show_rate_in_label %>
-          <%= f.label :show_rate_in_label, Spree.t(:show_rate_in_label) %>      
-        </div>  
+          <%= f.label :show_rate_in_label, Spree.t(:show_rate_in_label) %>
+        </div>
       </div>
     </fieldset>
   </div>
-  
+
   <div class="clear"></div>
 
-  <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
+  <%= render 'spree/admin/shared/calculator_fields', :f => f %>
 </div>

data/app/views/spree/admin/tax_rates/index.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:tax_rates) %>
@@ -10,11 +10,7 @@
   </li>
 <% end %>
 
-<% unless @tax_rates.any? %>
-  <div class="no-objects-found">
-    <%= Spree.t(:no_results) %>
-  </div>
-<% else %>
+<% if @tax_rates.any? %>
   <table class="index">
     <colgroup>
       <col style="width: 15%">
@@ -41,12 +37,12 @@
     <tbody>
       <% @tax_rates.each do |tax_rate|%>
       <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row" class="<%= cycle('odd', 'even')%>">
-        <td><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
-        <td><%=tax_rate.name %></td>
-        <td><%=tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>
+        <td class="align-center"><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
+        <td class="align-center"><%=tax_rate.name %></td>
+        <td class="align-center"><%=tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>
         <td class="align-center"><%=tax_rate.amount %></td>
-        <td class="align-center"><%=tax_rate.included_in_price %></td>
-        <td class="align-center"><%=tax_rate.show_rate_in_label %></td>
+        <td class="align-center"><%=tax_rate.included_in_price? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <td class="align-center"><%=tax_rate.show_rate_in_label? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="align-center"><%=tax_rate.calculator.to_s %></td>
         <td class="actions">
           <%= link_to_edit tax_rate, :no_text => true %>
@@ -56,4 +52,9 @@
       <% end %>
     </tbody>
   </table>
+<% else %>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/tax_rate')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_tax_rate_path %>!
+  </div>
 <% end %>

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

@@ -1,10 +1,12 @@
 <table class="index sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
   <colgroup>
-    <col style="width: 85%">
+    <col style="width: 10%">
+    <col style="width: 75%">
     <col style="width: 15%">
   </colgroup>
   <thead>
     <tr data-hook="taxonomies_header">
+      <th class="no-border"></th>
       <th><%= Spree.t(:name) %></th>
       <th class="actions"></th>
     </tr>
@@ -12,10 +14,8 @@
   <tbody>
     <% @taxonomies.each do |taxonomy| %>
       <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row" class="<%= cycle('odd', 'even')%>">
-        <td>
-          <span class="handle"></span>
-          <%= taxonomy.name %>
-        </td>
+        <td class="no-border"><span class="handle"></span></td>
+        <td class="align-center"><%= taxonomy.name %></td>
         <td class="actions">
           <%= link_to_edit taxonomy.id, :no_text => true %>
           <%= link_to_delete taxonomy, :no_text => true %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:taxonomies) %>
@@ -6,10 +6,17 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :icon => 'icon-plus', :id => 'admin_new_taxonomy_link' %></p>
+    <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :icon => 'icon-plus', :id => 'admin_new_taxonomy_link' %>
   </li>
 <% end %>
 
-<div id='list-taxonomies' data-hook>
-  <%= render :partial => 'list' %>
+<% if @taxonomies.any? %>
+<div id="list-taxonomies" data-hook>
+  <%= render 'list' %>
 </div>
+<% else %>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/taxonomy')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_taxonomy_path %>!
+  </div>
+<% end %>

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

@@ -2,14 +2,16 @@
   <div class="alpha five columns">
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= error_message_on :taxon, :name, :class => 'fullwidth title' %>
       <%= text_field :taxon, :name, :class => 'fullwidth' %>
+      <%= error_message_on :taxon, :name, :class => 'fullwidth title' %>
     <% end %>
 
     <%= f.field_container :permalink_part do %>
-      <%= f.label :permalink_part, Spree.t(:permalink) %><span class="required">*</span><br />
-      <%= @taxon.permalink.split("/")[0...-1].join("/") + "/" %>
-      <%= text_field_tag :permalink_part, @permalink_part %>
+      <%= f.label :permalink_part, Spree.t(:permalink) %> <span class="required">*</span><br />
+      <%= text_field_tag :permalink_part, @permalink_part, :class => 'fullwidth' %><br />
+      <span class="info" id="permalink_part_display">
+        <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
+      </span>
     <% end %>
 
     <%= f.field_container :icon do %>
@@ -41,5 +43,4 @@
       <%= f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6 %>
     <% end %>
   </div>
-
 </div>

data/app/views/spree/admin/taxons/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:taxon_edit) %>
@@ -13,7 +13,7 @@
 <% # Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
 <%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render 'form', :f => f %>
 
   <div class="form-buttons" data-hook="buttons">
     <%= button Spree.t('actions.update'), 'icon-refresh' %>
@@ -21,3 +21,18 @@
     <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), :icon => "icon-remove" %>
   </div>
 <% end %>
+
+<% content_for :head do %>
+  <%= javascript_tag do -%>
+    $(document).ready(function() {
+      var field  = $('#permalink_part'),
+          target = $('#permalink_part_display'),
+          permalink_part_default = target.text().trim();
+
+      target.text(permalink_part_default + field.val());
+      field.on('keyup blur', function () {
+        target.text(permalink_part_default + $(this).val());
+      });
+    });
+  <% end -%>
+<% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:analytics_trackers) %>
@@ -10,12 +10,7 @@
   </li>
 <% end %>
 
-<% unless @trackers.any? %>
-  <div class="no-objects-found">
-    <%= Spree.t(:no_trackers_found)%>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
-  </div>
-<% else %>
+<% if @trackers.any? %>
   <table class="index">
     <colgroup>
       <col style="width: 30%">
@@ -34,8 +29,8 @@
     <tbody>
       <% @trackers.each do |tracker|%>
         <tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows" class="<%= cycle('odd', 'even')%>">
-          <td><%= tracker.analytics_id %></td>
-          <td><%= tracker.environment.to_s.titleize %></td>
+          <td class="align-center"><%= tracker.analytics_id %></td>
+          <td class="align-center"><%= tracker.environment.to_s.titleize %></td>
           <td class="align-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="actions">
             <%= link_to_edit tracker, :no_text => true %>
@@ -45,4 +40,9 @@
       <% end %>
     </tbody>
   </table>
-<% end%>
+<% else %>
+  <div class="no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/tracker')) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
+  </div>
+<% end %>

data/app/views/spree/admin/variants/_autocomplete.js.erb

@@ -13,7 +13,7 @@
       <h6 class="variant-name">{{variant.name}}</h6>
 
       <ul class='variant-data'>
-        <li class='variant-sku'><strong>{{t 'sku'}}:</strong> {{variant.sku}}</li>
+        <li class='variant-sku'><strong><%= Spree.t(:sku) %>:</strong> {{variant.sku}}</li>
       </ul>
 
       {{#if variant.option_values}}
@@ -51,13 +51,13 @@
               {{#if this.available}}
                 <td>
                   {{this.count_on_hand}}
-                  {{#if this.backorderable}} (backorders allowed) {{/if}}
+                  {{#if this.backorderable}} (<%= Spree.t(:backorders_allowed) %>) {{/if}}
                 </td>
                 <td>
                   <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
                 </td>
                 <td class="actions">
-                  <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="Add" data-action="add"></button>
+                  <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
                 </td>
               {{else}}
                 <td><%= Spree.t(:out_of_stock) %></td>

data/app/views/spree/admin/variants/index.html.erb

@@ -45,7 +45,10 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found"><%= Spree.t(:no_results)%>.</div>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/variant')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_product_variant_path(@product) %>!
+  </div>
 <% end %>
 
 <% if @product.empty_option_values? %>
@@ -59,16 +62,15 @@
   <% content_for :page_actions do %>
     <ul class="inline-menu" data-hook="toolbar">
       <li id="new_var_link" data-hook>
-        <%= link_to_with_icon('icon-plus', 
-                              Spree.t(:new_variant), 
-                              new_admin_product_variant_url(@product), 
-                              :remote => :true, 
-                              :'data-update' => 'new_variant', 
+        <%= link_to_with_icon('icon-plus',
+                              Spree.t(:new_variant),
+                              new_admin_product_variant_url(@product),
+                              :remote => :true,
+                              :'data-update' => 'new_variant',
                               :class => 'button'
                              ) %>
       </li>
       <li><%= link_to_with_icon('icon-filter', @deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active), admin_product_variants_url(@product, :deleted => @deleted.blank? ? "on" : "off"), :class => 'button') %></li>
     </ul>
   <% end %>
-
 <% end %>