spree_backend 2.0.4 → 2.0.5

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

@@ -7,7 +7,7 @@
     <%= f.text_field :property_name, :class => 'autocomplete' %>
   </td>
   <td class='value'>
-    <%= f.text_field :value, :class => 'autocomplete' %>
+    <%= f.text_field :value %>
   </td>
   <td class="actions">
     <% if f.object.persisted? %>

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

@@ -1,8 +1,6 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Product Properties' } %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
+<%= render 'spree/admin/shared/product_sub_menu' %>
+<%= render 'spree/admin/shared/product_tabs', :current => 'Product Properties' %>
+<%= render 'spree/shared/error_messages', :target => @product %>
 
 <% content_for :page_actions do %>
   <ul class="tollbar inline-menu">
@@ -12,7 +10,7 @@
     <li>
       <span id="new_ptype_link">
         <%= link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, :remote => true, 'data-update' => 'prototypes', :class => 'button icon-copy' %>
-      </span>  
+      </span>
     </li>
   </ul>
 <% end %>
@@ -20,10 +18,10 @@
 <%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
   <fieldset class="no-border-top">
     <div class="add_product_properties" data-hook="add_product_properties"></div>
-    
+
     <div id="prototypes" data-hook></div>
     <%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
-    
+
     <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
       <thead>
         <tr data-hook="product_properties_header">
@@ -34,12 +32,12 @@
       </thead>
       <tbody id="product_properties" data-hook>
         <%= f.fields_for :product_properties do |pp_form| %>
-          <%= render :partial => 'product_property_fields', :locals => { :f => pp_form } %>
+          <%= render 'product_property_fields', :f => pp_form %>
         <% end %>
       </tbody>
     </table>
 
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render 'spree/admin/shared/edit_resource_links' %>
 
     <%= hidden_field_tag 'clear_product_properties', 'true' %>
   </fieldset>
@@ -47,8 +45,7 @@
 
 <%= javascript_tag do -%>
   var properties = <%= raw(@properties.to_json) %>;
-
-  $("#product_properties input.autocomplete").live("keydown", function(){
+  $('#product_properties').on('keydown', 'input.autocomplete', function() {
     already_auto_completed = $(this).is('ac_input');
     if (!already_auto_completed) {
       $(this).autocomplete({source: properties});
@@ -56,4 +53,3 @@
     }
   });
 <% end -%>
-

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

@@ -93,10 +93,10 @@
     </tbody>
   </table>
 <% else %>
-  <div class="no-objects-found">
-    <%= Spree.t(:no_results) %>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/product')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_product_path %>!
   </div>
 <% end %>
 
 <%= paginate @collection %>
-

data/app/views/spree/admin/products/stock.html.erb

@@ -20,7 +20,7 @@
   <thead>
     <tr data-hook="admin_product_stock_management_index_headers">
       <th><%= Spree.t(:variant) %></th>
-      <th colspan="3"><%= Spree.t(:stock_location_info) %></th>
+      <th colspan="4"><%= Spree.t(:stock_location_info) %></th>
     </tr>
   </thead>
   <tbody>
@@ -37,23 +37,23 @@
           <td colspan="4" class="stock_location_info">
             <table>
               <colgroup>
-                <col style="width: 40%" />
-                <col style="width: 20%" />
+                <col style="width: 45%" />
                 <col style="width: 20%" />
                 <col style="width: 20%" />
+                <col style="width: 15%" />
               </colgroup>
               <thead>
                 <th><%= Spree.t(:stock_location) %></th>
                 <th><%= Spree.t(:count_on_hand) %></th>
                 <th><%= Spree.t(:backorderable) %></th>
-                <th></th>
+                <th class="actions"></th>
               </thead>
               <tbody>
                 <% variant.stock_items.each do |item| %>
                   <% next unless @stock_locations.include?(item.stock_location) %>
 
                   <tr id="stock-item-<%= item.id %>" class="<%= cycle('odd', 'even', :name => 'stock_locations')%>">
-                    <td><%= item.stock_location.name %></td>
+                    <td class="align-center"><%= item.stock_location.name %></td>
                     <td class="align-center"><%= item.count_on_hand %></td>
                     <td class="align-center">
                       <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
@@ -62,9 +62,11 @@
                               id: "stock_item_backorderable_#{item.stock_location.id}" %>
                       <% end %>
                     </td>
-                    <td class="align-center">
-                      <%= link_to "", [:admin, item], method: :delete, remote: true,
-                        confirm: Spree.t(:are_you_sure), class: "icon_link with-tip icon-trash" %>
+                    <td class="actions">
+                      <%= link_to(icon('delete'), [:admin, item],
+                            method: :delete, remote: true, confirm: Spree.t(:are_you_sure),
+                            class: 'icon_link with-tip icon-trash no-text',
+                            title: Spree.t(:remove), data: { action: :remove }) %>
                     </td>
                   </tr>
                 <% end %>

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

@@ -8,12 +8,7 @@
   </li>
 <% end %>
 
-<% unless @promotions.any? %>
-  <div class="no-objects-found">
-    <%= Spree.t(:no_promotions_found) %>.
-    <%= link_to Spree.t(:add_one), spree.new_admin_promotion_path %>!
-  </div>
-<% else %>
+<% if @promotions.any? %>
   <table class="index">
     <colgroup>
       <col style="width: 20%">
@@ -49,4 +44,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/promotion')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_promotion_path %>!
+  </div>
 <% end %>

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

@@ -8,15 +8,16 @@
   </li>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+<%= render 'spree/admin/shared/product_sub_menu' %>
 
 <div id="new_property"></div>
 
+<% if @properties.any? %>
 <table class="index" id='listing_properties' data-hook>
   <colgroup>
+    <col style="width: 40%">
     <col style="width: 45%">
-    <col style="width: 45%">
-    <col style="width: 10%">
+    <col style="width: 15%">
   </colgroup>
   <thead>
     <tr data-hook="listing_properties_header">
@@ -28,8 +29,8 @@
   <tbody>
     <% @properties.each do |property| %>
       <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= property.name %></td>
-        <td><%= property.presentation %></td>
+        <td style="padding-left:1em"><%= property.name %></td>
+        <td style="padding-left:1em"><%= property.presentation %></td>
         <td class="actions">
           <%= link_to_edit(property, :no_text => true) %>
           <%= link_to_delete(property, :no_text => true) %>
@@ -38,4 +39,10 @@
     <% 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/property')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_property_path %>!
+  </div>
+<% end %>
 

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_prototype_form_fields" class="row">
   <div class="alpha four columns">
     <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %>
+      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
       <%= f.text_field :name, :class => 'fullwidth' %>
       <%= f.error_message_on :name %>
     <% end %>

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

@@ -8,13 +8,14 @@
   </li>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+<%= render 'spree/admin/shared/product_sub_menu' %>
 
 <%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display: none', :id => 'busy_indicator' %>
 
 <%# Placeholder for new prototype form %>
 <div id="new_prototype"></div>
 
+<% if @prototypes.any? %>
 <table class="index" id='listing_prototypes' data-hook>
   <colgroup>
     <col style="width: 90%">
@@ -29,7 +30,7 @@
   <tbody>
     <% @prototypes.each do |prototype| %>
       <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= prototype.name %></td>
+        <td style="padding-left:1em"><%= prototype.name %></td>
         <td class="actions">
           <%= link_to_edit(prototype, :no_text => true, :class => 'admin_edit_prototype') %>
           <%= link_to_delete(prototype, :no_text => true) %>
@@ -38,3 +39,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/prototype')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_prototype_path %>!
+  </div>
+<% end %>

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

@@ -12,10 +12,9 @@
   <tbody>
     <% @reports.each do |key, value| %>
     <tr data-hook="reports_row">
-      <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
-      <td><%= value[:description] %></td>
+      <td class="align-center"><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
+      <td style="padding-left:1em"><%= value[:description] %></td>
     </tr>
     <% end %>
   </tbody>
 </table>
-

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -13,52 +13,52 @@
 
 <div id="<%= is_shipping_address ? 'shipping' : 'billing' %>" style="display: <%= (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address))) ? 'none' : 'block' %>" data-hook="address_fields">
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :firstname, Spree.t(:first_name) + ':' %>
+    <%= f.label :firstname, Spree.t(:first_name) %>
     <%= f.text_field :firstname, :class => 'fullwidth' %>
   </div>
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :lastname, Spree.t(:last_name) + ':' %>
+    <%= f.label :lastname, Spree.t(:last_name) %>
     <%= f.text_field :lastname, :class => 'fullwidth' %>
   </div>
   <% if Spree::Config[:company] %>
     <div class="field <%= "#{shipping_or_billing}-row" %>">
-      <%= f.label :company, Spree.t(:company) + ':' %>
+      <%= f.label :company, Spree.t(:company) %>
       <%= f.text_field :company, :class => 'fullwidth' %>
     </div>
   <% end %>
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :address1, Spree.t(:street_address) + ':' %>
+    <%= f.label :address1, Spree.t(:street_address) %>
     <%= f.text_field :address1, :class => 'fullwidth' %>
   </div>
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :address2, Spree.t(:street_address_2) + ':' %>
+    <%= f.label :address2, Spree.t(:street_address_2) %>
     <%= f.text_field :address2, :class => 'fullwidth' %>
   </div>
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :city, Spree.t(:city) + ':' %>
+    <%= f.label :city, Spree.t(:city) %>
     <%= f.text_field :city, :class => 'fullwidth' %>
   </div>
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :zipcode, Spree.t(:zip) + ':' %>
+    <%= f.label :zipcode, Spree.t(:zip) %>
     <%= f.text_field :zipcode, :class => 'fullwidth' %>
   </div>
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :country_id, Spree.t(:country) + ':' %>
+    <%= f.label :country_id, Spree.t(:country) %>
     <span id="<%= s_or_b %>country">
       <%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %>
     </span>
   </div>
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :state_id, Spree.t(:state) + ':' %>
+    <%= f.label :state_id, Spree.t(:state) %>
     <span id="<%= s_or_b %>state">
-      <%= f.text_field :state_name, 
+      <%= f.text_field :state_name,
             :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
            :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' %>
       <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
     </span>
   </div>
   <div class="field <%= "#{shipping_or_billing}-row" %>">
-    <%= f.label :phone, Spree.t(:phone) + ':' %>
+    <%= f.label :phone, Spree.t(:phone) %>
     <%= f.phone_field :phone, :class => 'fullwidth' %>
   </div>
 </div>

data/app/views/spree/admin/shared/_alert.html.erb

@@ -1,5 +1,5 @@
-<div class="alert <%= alert.severity.downcase %>">
-  <%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
-  <%= link_to 'X', spree.dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
+<div class="alert <%= alert['severity'].downcase %>">
+  <%= alert['message'] %> <%= link_to alert['url_name'], alert['url'] if alert['url'] %>
+  <%= link_to 'X', spree.dismiss_alert_admin_general_settings_path(:alert_id => alert['id']),
               :remote => true, :method => :post, :class => 'dismiss' %>
 </div>

data/app/views/spree/admin/shared/_routes.html.erb

@@ -6,6 +6,7 @@
   Spree.routes.product_search = "<%= spree.api_products_url(:format => 'json') %>";
   Spree.routes.option_type_search = "<%= spree.api_option_types_url(:format => 'json') %>";
   Spree.routes.orders_api = "<%= spree.api_orders_url(:format => 'json') %>";
+  Spree.routes.checkouts_api = "<%= spree.api_checkouts_url(:format => 'json') %>";
   Spree.routes.stock_locations_api = "<%= spree.api_stock_locations_url(:format => 'json') %>";
   Spree.routes.variants_api = "<%= spree.api_variants_url(:format => 'json') %>";
 

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

@@ -7,7 +7,7 @@
 <% if can? :admin, Spree::Admin::ReportsController %>
   <%= tab :reports, :icon => 'icon-file'  %>
 <% end %>
-<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :taxonomies, :shipping_methods, :trackers, :label => 'configuration', :icon => 'icon-wrench', :url => spree.edit_admin_general_settings_path %>
+<%= tab :configurations, :general_settings, :mail_methods, :image_settings, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :taxonomies, :shipping_methods, :shipping_categories, :stock_transfers, :stock_locations, :trackers, :label => 'configuration', :icon => 'icon-wrench', :url => spree.edit_admin_general_settings_path %>
 <% if can? :admin, Spree::Promotion %>
   <%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'icon-bullhorn') %>
-<% end %>
+<% end %>

data/app/views/spree/admin/shared/_translations.html.erb

@@ -12,6 +12,9 @@
     :cut                      => Spree.t(:cut),
     :destroy                  => Spree.t(:destroy),
     :edit                     => Spree.t(:edit),
+    :first_day                => Spree.t(:first_day,
+                                         :scope => 'date_picker',
+                                         :default => 0).to_i,
     :loading                  => Spree.t(:loading),
     :month_names              => I18n.t(:month_names, :scope => :date).reject(&:blank?),
     :more                     => Spree.t(:more),

data/app/views/spree/admin/shipping_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(:shipping_categories) %>
@@ -10,6 +10,7 @@
   </li>
 <% end %>
 
+<% if @shipping_categories.any? %>
 <table class="index">
   <colgroup>
     <col style="width: 85%">
@@ -24,7 +25,7 @@
   <tbody>
     <% @shipping_categories.each do |shipping_category|%>
     <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row" class="<%= cycle('odd', 'even')%>">
-      <td style="width:350px;"><%= shipping_category.name %></td>
+      <td class="align-center" style="width:350px;"><%= shipping_category.name %></td>
       <td class="actions">
         <%= link_to_edit shipping_category, :no_text => true %>
         <%= link_to_delete shipping_category, :no_text => true %>
@@ -33,3 +34,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/shipping_category')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_shipping_category_path %>!
+  </div>
+<% end %>

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

@@ -15,6 +15,16 @@
     <% end %>
   </div>
 
+  <div class="alpha omega twelve columns">
+    <div class="alpha six columns">
+      <%= f.field_container :admin_name do %>
+        <%= f.label :admin_name, Spree.t(:internal_name) %><br />
+        <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
+        <%= error_message_on :shipping_method, :admin_name %>
+      <% end %>
+    </div>
+  </div>
+
   <div class="alpha twelve columns">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url, Spree.t(:tracking_url) %><br />

data/app/views/spree/admin/shipping_methods/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(:shipping_methods) %>
@@ -9,6 +9,7 @@
     <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :icon => 'icon-plus', :id => 'admin_new_shipping_method_link' %>
   </li>
 <% end %>
+
 <% if @shipping_methods.any? %>
   <table class="index" id='listing_shipping_methods'>
     <colgroup>
@@ -30,9 +31,9 @@
     <tbody>
       <% @shipping_methods.each do |shipping_method|%>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
-          <td><%= shipping_method.name %></td>
-          <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
-          <td><%= shipping_method.calculator.description %></td>
+          <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
+          <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
+          <td class="align-center"><%= shipping_method.calculator.description %></td>
           <td class="align-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
             <%= link_to_edit shipping_method, :no_text => true %>
@@ -43,6 +44,9 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found"><%= Spree.t(:no_shipping_methods_found) %></div>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/shipping_method')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_shipping_method_path %>!
+  </div>
 <% end %>
 

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

@@ -2,8 +2,12 @@
   <div class="row">
     <div class="alpha twelve columns">
       <%= f.field_container :name do %>
-        <%= f.label :name, Spree.t(:name) %>
+        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
         <%= f.text_field :name, :class => 'fullwidth' %>
+      <% end %><br>
+      <%= f.field_container :admin_name do %>
+        <%= f.label :admin_name, Spree.t(:internal_name) %>
+        <%= f.text_field :admin_name, :class => 'fullwidth', :label => false %>
       <% end %>
     </div>
     <div class="omega four columns">
@@ -11,15 +15,15 @@
         <label for="active"><%= Spree.t(:state) %></label>
         <ul>
           <li>
-            <%= f.label :active, Spree.t(:active) + ':' %>
+            <%= f.label :active, Spree.t(:active) %>
             <%= f.check_box :active %>
           </li>
           <li>
-            <%= f.label :active, Spree.t(:backorderable_default) + ':' %>
+            <%= f.label :active, Spree.t(:backorderable_default) %>
             <%= f.check_box :backorderable_default %>
           </li>
           <li>
-            <%= f.label :active, Spree.t(:propagate_all_variants) + ':' %>
+            <%= f.label :active, Spree.t(:propagate_all_variants) %>
             <%= f.check_box :propagate_all_variants %>
           </li>
         </ul>
@@ -30,27 +34,27 @@
   <div class="row">
     <div class="alpha four columns">
       <div class="field ">
-        <%= f.label :address1, Spree.t(:street_address) + ':' %>
+        <%= f.label :address1, Spree.t(:street_address) %>
         <%= f.text_field :address1, :class => 'fullwidth' %>
       </div>
     </div>
 
     <div class="four columns">
       <div class="field ">
-        <%= f.label :address2, Spree.t(:street_address_2) + ':' %>
+        <%= f.label :address2, Spree.t(:street_address_2) %>
         <%= f.text_field :address2, :class => 'fullwidth' %>
       </div>
     </div>
     <div class="four columns">
       <div class="field ">
-        <%= f.label :city, Spree.t(:city) + ':' %>
+        <%= f.label :city, Spree.t(:city) %>
         <%= f.text_field :city, :class => 'fullwidth' %>
       </div>
     </div>
 
     <div class="omega four columns">
       <div class="field ">
-        <%= f.label :zipcode, Spree.t(:zip) + ':' %>
+        <%= f.label :zipcode, Spree.t(:zip) %>
         <%= f.text_field :zipcode, :class => 'fullwidth' %>
       </div>
     </div>
@@ -59,7 +63,7 @@
   <div class="row">
     <div class="alpha eight columns">
       <div class="field ">
-        <%= f.label :country_id, Spree.t(:country) + ':' %>
+        <%= f.label :country_id, Spree.t(:country) %>
         <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %></span>
       </div>
     </div>
@@ -67,7 +71,7 @@
     <div class="four columns">
       <div class="field ">
         <% if f.object.country %>
-          <%= f.label :state_id, Spree.t(:state) + ':' %>
+          <%= f.label :state_id, Spree.t(:state) %>
           <span id="state" class="region">
             <%= f.text_field :state_name, :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' %>
             <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
@@ -78,7 +82,7 @@
 
     <div class="omega four columns">
       <div class="field ">
-        <%= f.label :phone, Spree.t(:phone) + ':' %>
+        <%= f.label :phone, Spree.t(:phone) %>
         <%= f.phone_field :phone, :class => 'fullwidth' %>
       </div>
     </div>

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

@@ -18,9 +18,9 @@
 <% if @stock_locations.any? %>
   <table class="index" id='listing_stock_locations' data-hook>
     <colgroup>
-      <col style="width: 50%" />
+      <col style="width: 40%" />
       <col style="width: 15%" />
-      <col style="width: 20%" />
+      <col style="width: 30%" />
       <col style="width: 15%" />
     </colgroup>
     <thead>
@@ -37,9 +37,9 @@
            @delete_url = admin_stock_location_path(stock_location)
       %>
         <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row" class="<%= cycle('odd', 'even')%>">
-          <td><%= stock_location.name %></td>
-          <td><span class="state <%= stock_location.active? ? 'active' : 'inactive' %>"><%= stock_location.active? ? 'active' : 'inactive' %></span></td>
-          <td><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
+          <td class="align-center"><%= display_name(stock_location) %></td>
+          <td class="align-center"><span class="state <%= state(stock_location) %>"><%= state(stock_location) %></span></td>
+          <td class="align-center"><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
           <td class="actions">
             <%= link_to_edit stock_location, :no_text => true %>
             <%= link_to_delete stock_location, :no_text => true %>
@@ -49,5 +49,8 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found"><%= Spree.t(:no_stock_locations_found) %></div>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_location')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_path %>!
+  </div>
 <% end %>

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

@@ -13,6 +13,7 @@
   </li>
 <% end %>
 
+<% if @stock_movements.any? %>
 <table class="index" id='listing_stock_movements'>
   <colgroup>
     <col style="width: 35%">
@@ -36,5 +37,11 @@
     <% 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/stock_movement')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_stock_movement_path %>!
+  </div>
+<% end %>
 
 <%= paginate @stock_movements %>