solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree::Property.model_name.human(count: :other) %>
+  <%= plural_resource_name(Spree::Property) %>
 <% end %>
 
 <% f.fields_for :product_properties do |properties_form| %>

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

@@ -1,8 +1,7 @@
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => 'arrow-left' %></li>
   <% if can?(:create, Spree::Product) %>
     <li id="new_product_link">
-      <%= button_link_to Spree.t(:new_product), new_object_url, { :icon => 'plus', :id => 'admin_new_product' } %>
+      <%= button_link_to Spree.t(:new_product), new_object_url, { :id => 'admin_new_product' } %>
     </li>
   <% end %>
 <% end %>
@@ -10,6 +9,8 @@
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Product Details' } %>
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
+<% admin_breadcrumb(Spree.t(:product_details)) %>
+
 <%= form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f| %>
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>

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

@@ -1,10 +1,10 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:listing_products) %>
-<% end %>
+<% admin_layout "full-width" %>
+
+<% admin_breadcrumb(plural_resource_name(Spree::Product)) %>
 
 <% content_for :page_actions do %>
   <li id="new_product_link">
-    <%= button_link_to Spree.t(:new_product), new_object_url, { :remote => true, :icon => 'plus', :id => 'admin_new_product' } %>
+    <%= button_link_to Spree.t(:new_product), new_object_url, { :remote => true, :id => 'admin_new_product' } %>
   </li>
 <% end if can?(:create, Spree::Product) %>
 
@@ -14,38 +14,29 @@
 
 <% content_for :table_filter do %>
   <div data-hook="admin_products_sidebar">
-
     <%= search_form_for [:admin, @search] do |f| %>
-
         <%- locals = {:f => f} %>
-
         <div data-hook="admin_products_index_search">
-          <div class="alpha nine columns">
-            <div class="field">
-              <%= f.label :name_cont, Spree::Product.human_attribute_name(:name) %>
-              <%= f.text_field :name_cont, :size => 15 %>
-            </div>
+          <div class="product-search-field-name field">
+            <%= f.label :name_cont, Spree::Product.human_attribute_name(:name) %>
+            <%= f.text_field :name_cont, :size => 15 %>
           </div>
-          <div class="four columns">
-            <div class="field">
-              <%= f.label :variants_including_master_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
-              <%= f.text_field :variants_including_master_sku_cont, :size => 15 %>
-            </div>
+
+          <div class="product-search-field-sku field">
+            <%= f.label :variants_including_master_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
+            <%= f.text_field :variants_including_master_sku_cont, :size => 15 %>
           </div>
-          <div class="three columns omega">
-            <div class="field checkbox">
-              <label>
-                <%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null] == '0'}, '0', '1' %>
-                <%= Spree.t(:show_deleted) %>
-              </label>
-            </div>
+
+          <div class="product-search-field-show-deleted field checkbox">
+            <label>
+              <%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null] == '0'}, '0', '1' %>
+              <%= Spree.t(:show_deleted) %>
+            </label>
           </div>
         </div>
 
-        <div class="clear"></div>
-
-        <div class="form-buttons actions filter-actions" data-hook="admin_products_index_search_buttons">
-          <%= button Spree.t(:search), 'search' %>
+        <div class="actions filter-actions" data-hook="admin_products_index_search_buttons">
+          <%= button Spree.t(:search) %>
         </div>
     <% end %>
   </div>

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

@@ -52,8 +52,9 @@
       <div data-hook="new_product_shipping_category" class="alpha field four columns">
         <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree::ShippingCategory.
-                model_name.human, class: 'required' %><br />
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth', :required => true }) %>
+                model_name.human, class: 'required' %>
+          <%= f.field_hint :shipping_category %><br />
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>
@@ -61,6 +62,7 @@
       <div data-hook="new_product_tax_category" class="field four columns">
         <%= f.field_container :tax_category do %>
           <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
+          <%= f.field_hint :tax_category %>
           <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>

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

@@ -1,6 +1,7 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_promotion_category) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
+<% admin_breadcrumb(@promotion_category.name) %>
+
 
 <%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>
   <fieldset class="no-border-top">

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

@@ -1,11 +1,11 @@
-<% content_for :page_title do %>
-  <%= Spree::PromotionCategory.model_name.human(count: :many) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
+<% admin_breadcrumb(Spree::PromotionCategory.model_name.human(count: :many)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::PromotionCategory) %>
     <li>
-      <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, :icon => 'plus' %>
+      <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path %>
     </li>
   <% end %>
 <% end %>

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

@@ -1,6 +1,7 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:new_promotion_category) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
+<% admin_breadcrumb(Spree.t(:new_promotion_category)) %>
+
 
 <%= form_for :promotion_category, :url => collection_url do |f| %>
   <fieldset class="no-border-top">

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -3,8 +3,8 @@ $('#rules .no-objects-found').hide();
 
 $('.product_picker').productAutocomplete();
 $('.user_picker').userAutocomplete();
+$('.taxon_picker').taxonAutocomplete();
 
 $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
 $('#promotion_rule_type').select2();
 
-set_taxon_select()

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

@@ -3,14 +3,14 @@
   <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do %>
     <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
     <fieldset>
-      <legend align="center"><%= Spree::PromotionAction.model_name.human(count: :other) %></legend>
+      <legend align="center"><%= plural_resource_name(Spree::PromotionAction) %></legend>
       <% if can?(:update, @promotion) %>
         <div class="field">
           <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
           <%= select_tag 'action_type', options, :class => 'select2 fullwidth' %>
         </div>
         <div class="filter-actions actions">
-          <%= button Spree.t('actions.add'), 'plus' %>
+          <%= button Spree.t('actions.add') %>
         </div>
       <% end %>
     </fieldset>
@@ -28,7 +28,7 @@
     </div>
     <% if can?(:update, @promotion) %>
       <div class="filter-actions actions promotion-update">
-        <%= button Spree.t('actions.update'), 'refresh' %>
+        <%= button Spree.t('actions.update') %>
       </div>
     <% end %>
   <% end %>

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

@@ -10,7 +10,7 @@
           <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %>
         </div>
         <div class="filter-actions actions">
-          <%= button Spree.t('actions.add'), 'plus' %>
+          <%= button Spree.t('actions.add') %>
         </div>
       <% end %>
     </fieldset>
@@ -39,7 +39,7 @@
 
         <% if can?(:update, @promotion) %>
           <div class="promotion-update filter-actions actions">
-            <%= button Spree.t('actions.update'), 'refresh' %>
+            <%= button Spree.t('actions.update') %>
           </div>
         <% end %>
       </fieldset>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -11,4 +11,4 @@
   'form-prefix' => prefix,
   'calculator' => 'tiered_flat_rate'
 } %>
-<button class="fa fa-plus button js-add-tier"><%= Spree.t('actions.add') %></button>
+<button class="button js-add-tier"><%= Spree.t('actions.add') %></button>

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -11,4 +11,4 @@
   'form-prefix' => prefix,
   'calculator' => 'tiered_percent'
 } %>
-<button class="fa fa-plus button js-add-tier"><%= Spree.t('actions.add') %></button>
+<button class="button js-add-tier"><%= Spree.t('actions.add') %></button>

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

@@ -1,12 +1,11 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_promotion) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
+<% admin_breadcrumb(@promotion.name) %>
+
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_promotions_list), admin_promotions_path, :icon => 'arrow-left' %>
     <% if can?(:display, Spree::PromotionCode) %>
-      <%= button_link_to Spree.t(:download_promotion_code_list), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), :icon => 'arrow-down' %>
+      <%= button_link_to Spree.t(:download_promotion_code_list), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv) %>
     <% end %>
   </li>
 <% end %>

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

@@ -1,11 +1,9 @@
-<% content_for :page_title do %>
-  <%= Spree::Promotion.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::Promotion)) %>
 
 <% content_for :page_actions do %>
   <% if can? :create, Spree::Promotion %>
     <li>
-      <%= button_link_to Spree.t(:new_promotion), spree.new_admin_promotion_path, :icon => 'plus' %>
+      <%= button_link_to Spree.t(:new_promotion), spree.new_admin_promotion_path %>
     </li>
   <% end %>
 <% end %>
@@ -49,7 +47,7 @@
 
       <div class="actions filter-actions">
         <div data-hook="admin_promotions_index_search_buttons">
-          <%= button Spree.t(:filter_results), 'search' %>
+          <%= button Spree.t(:filter_results) %>
         </div>
       </div>
     <% end %>

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

@@ -1,6 +1,6 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:new_promotion) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
+<% admin_breadcrumb(Spree.t(:new_promotion)) %>
+
 
 <%= form_for :promotion, :url => collection_url do |f| %>
   <fieldset class="no-border-top">

data/app/views/spree/admin/promotions/rules/_option_value.html.erb

@@ -1,12 +1,12 @@
 <div class="field alpha omega eight columns promo-rule-option-values">
   <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
   <div class="four columns alpha"><%= label_tag nil, Spree::Product.model_name.human %></div>
-  <div class="three columns omega"><%= label_tag nil, Spree::OptionValue.model_name.human(count: :other) %></div>
+  <div class="three columns omega"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
   <div class="clear"></div>
 
   <div class="js-promo-rule-option-values"></div>
 
-  <button class="fa fa-plus button js-add-promo-rule-option-value"><%= Spree.t('actions.add') %></button>
+  <button class="button js-add-promo-rule-option-value"><%= Spree.t('actions.add') %></button>
 </div>
 
 <%= content_tag :div, nil, class: "hidden js-original-promo-rule-option-values",

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

@@ -1,10 +1,7 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_property) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Property), spree.admin_properties_path) %>
+<% admin_breadcrumb(@property.name) %>
 
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_properties_list), admin_properties_url, :icon => 'arrow-left'%></li>
-<% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
 

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

@@ -1,11 +1,11 @@
-<% content_for :page_title do %>
-  <%= Spree::Property.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Property)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Property) %>
     <li id="new_property_link">
-      <%= button_link_to Spree.t(:new_property), new_admin_property_url, { :remote => true, :icon => 'plus', :id => 'new_property_link' } %>
+      <%= button_link_to Spree.t(:new_property), new_admin_property_url, { :remote => true, :id => 'new_property_link' } %>
     </li>
   <% end %>
 <% end %>
@@ -33,7 +33,7 @@
         <div class="clear"></div>
 
         <div class="form-buttons actions filter-actions" data-hook="admin_pproperties_index_search_buttons">
-          <%= button Spree.t(:search), 'search' %>
+          <%= button Spree.t(:search) %>
         </div>
     <% end %>
   </div>

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

@@ -10,7 +10,7 @@
   <div class="four columns">
     <div id='properties' data-hook>
       <%= f.field_container :property_ids do %>
-        <%= f.label :property_ids, Spree::Property.model_name.human(count: :other) %><br>
+        <%= f.label :property_ids, plural_resource_name(Spree::Property) %><br>
         <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
       <% end %>
     </div>
@@ -19,7 +19,7 @@
   <div class="four columns">
     <div id="option_types" data-hook>
       <%= f.field_container :option_type_ids do %>
-        <%= f.label :option_type_ids, Spree::OptionType.model_name.human(count: :other) %><br>
+        <%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %><br>
         <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
       <% end %>
     </div>
@@ -28,7 +28,7 @@
   <div class="four columns omega">
     <div id='taxons' data-hook>
       <%= f.field_container :taxon_ids do %>
-        <%= f.label :taxon_ids, Spree::Taxon.model_name.human(count: :other) %><br>
+        <%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br>
         <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
       <% end %>
     </div>

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

@@ -14,7 +14,7 @@
       <tr id="row_<%= prototype.id %>" data-hook="available_row" class="<%= cycle('odd', 'even')%>">
         <td><%= prototype.name %></td>
         <td class="actions">
-          <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), class: 'ajax button select_properties_from_prototype fa fa-ok', data: { remote: true } %>
+          <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), class: 'ajax button select_properties_from_prototype', data: { remote: true } %>
         </td>
       </tr>
     <% end %>

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

@@ -1,11 +1,8 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_prototype) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Prototype), spree.admin_prototypes_path) %>
+<% admin_breadcrumb(@prototype.name) %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_prototypes_list), spree.admin_prototypes_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @prototype } %>

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

@@ -1,11 +1,11 @@
-<% content_for :page_title do %>
-  <%= Spree::Prototype.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Prototype)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Prototype) %>
     <li id="new_prototype_link">
-      <%= button_link_to Spree.t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'plus', :id => 'new_prototype_link'} %>
+      <%= button_link_to Spree.t(:new_prototype), new_admin_prototype_url, {:remote => true, :id => 'new_prototype_link'} %>
     </li>
   <% end %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% if @prototype.option_types.present? %>
-  <h2><%= Spree::Variant.model_name.human(count: :other) %></h2>
+  <h2><%= plural_resource_name(Spree::Variant) %></h2>
 
   <ul class="product-prototype-options">
     <% @prototype.option_types.each do |ot| %>
@@ -7,7 +7,7 @@
         <b>
           <%= check_box_tag "option_types[]", ot.id, (params[:option_types] || []).include?(ot.id.to_s), :id => "option_type_#{ot.id}", :class => "option-type" %>
           <%= label_tag "option_type_#{ot.id}", ot.presentation %>
-        </b>      
+        </b>
         <ul class="option-type-values">
         <% ot.option_values.each do |ov| %>
           <li>

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

@@ -1,11 +1,11 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_refund_reason) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::RefundReason), spree.admin_refund_reasons_path) %>
+<% admin_breadcrumb(@refund_reason.name) %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_refund_reason_list), collection_url, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>

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

@@ -1,14 +1,15 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::RefundReason.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::RefundReason)) %>
+
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::RefundReason) %>
       <li>
-        <%= button_link_to Spree.t(:new_refund_reason), new_object_url, { icon: 'plus', id: 'admin_new_named_type' } %>
+        <%= button_link_to Spree.t(:new_refund_reason), new_object_url, { id: 'admin_new_named_type' } %>
       </li>
     <% end %>
   </ul>