solidus_backend 1.3.2 → 1.4.0.beta1

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

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

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

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

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

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

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

@@ -1,11 +1,9 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t('actions.edit') %> <%= Spree.t(:adjustment) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
+<% admin_breadcrumb("#{Spree.t('actions.edit')} #{Spree::Adjustment.model_name.human}") %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
@@ -14,8 +12,8 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'arrow-right' %>
-      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %>
+      <%= button Spree.t(:continue) %>
+      <%= link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,16 +1,13 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
 
-<% content_for :page_title do %>
-   <i class="fa fa-arrow-right"></i> <%= Spree.t(:adjustments) %>
-<% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::Adjustment)) %>
 
 <% content_for :page_actions do %>
   <% if can? :create, Spree::Adjustment %>
     <li>
-      <%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'plus' %>
+      <%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order) %>
     </li>
   <% end %>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'adjustments_table' %>
@@ -18,7 +15,7 @@
 <% if @order.can_add_coupon? %>
   <div data-hook="adjustments_new_coupon_code">
     <%= text_field_tag "coupon_code", "", :placeholder => Spree.t(:coupon_code) %>
-    <%= button Spree.t(:add_coupon_code), 'plus', 'submit', :id => "add_coupon_code" %>
+    <%= button Spree.t(:add_coupon_code), nil, 'submit', :id => "add_coupon_code" %>
   </div>
 <% end %>
 <%= javascript_tag do -%>

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

@@ -1,11 +1,10 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_adjustment) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
+<% admin_breadcrumb(Spree.t(:new_adjustment)) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
@@ -15,8 +14,8 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'arrow-right' %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'remove' %>
+      <%= button Spree.t(:continue) %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,6 +1,7 @@
-<% content_for :page_title do %>
-  <%= link_to Spree.t(:order_number, number: @order.number), spree.edit_admin_order_path(@order) %> - <%= Spree.t(:cancel_inventory) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Order), spree.admin_orders_path) %>
+<% admin_breadcrumb(link_to "##{@order.number}", spree.edit_admin_order_path(@order)) %>
+<% admin_breadcrumb(Spree.t(:cancel_inventory)) %>
+
 
 <table class="stock-contents index">
   <colgroup>

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

@@ -1,13 +1,11 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_country) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Country), spree.admin_countries_path) %>
+<% admin_breadcrumb(@country.name) %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_countries_list), spree.admin_countries_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @country } %>

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

@@ -1,14 +1,14 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:listing_countries) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Country)) %>
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::Country) %>
       <li>
-        <%= button_link_to Spree.t(:new_country), new_object_url, { :icon => 'plus', :id => 'admin_new_country' } %>
+        <%= button_link_to Spree.t(:new_country), new_object_url, { :id => 'admin_new_country' } %>
       </li>
     <% end %>
   </ul>

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

@@ -1,11 +1,11 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_country) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Country), spree.admin_countries_path) %>
+<% admin_breadcrumb(Spree.t(:new_country)) %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_countries_list), admin_countries_path, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @countries } %>

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -45,7 +45,7 @@
           <td class='align-center'>
             <%= form_for [:admin, return_item] do |f| %>
               <%= f.hidden_field 'reception_status_event', value: 'receive' %>
-              <%= f.button Spree.t('actions.receive'), class: 'fa icon_link no-text with-tip', "data-action" => 'save' %>
+              <%= f.button Spree.t('actions.receive'), class: 'with-tip', "data-action" => 'save' %>
             <% end %>
           </td>
         <% end %>

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

@@ -1,11 +1,9 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree::CustomerReturn.model_name.human %> #<%= @customer_return.number %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
+<% admin_breadcrumb(@customer_return.number) %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li>
 <% end %>
 
 <% if @manual_intervention_return_items.any? %>
@@ -41,7 +39,7 @@
     <% if @customer_return.completely_decided? %>
       <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
         <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>
-        <%= f.button class: 'button fa fa-reply' do %>
+        <%= f.button class: 'button' do %>
           <%= Spree.t(:create_reimbursement) %>
         <% end %>
       <% end %>
@@ -54,7 +52,7 @@
 <% end %>
 
 <fieldset data-hook="reimbursements" class="no-border-bottom align-center">
-  <legend align="center"><%= Spree::Reimbursement.model_name.human(count: :other) %></legend>
+  <legend align="center"><%= plural_resource_name(Spree::Reimbursement) %></legend>
   <% if @customer_return.reimbursements.any? %>
     <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
   <% else %>

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

@@ -3,15 +3,12 @@
 <% content_for :page_actions do %>
   <% if can? :create, Spree::CustomerReturn %>
     <li>
-      <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'plus' %>
+      <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order) %>
     </li>
   <% end %>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), spree.admin_orders_path, :icon => 'arrow-left' %></li>
 <% end %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree::CustomerReturn.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::CustomerReturn)) %>
 
 <% if @customer_returns.any? %>
   <table class="index">

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

@@ -1,11 +1,10 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_customer_return) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
+<% admin_breadcrumb(Spree.t(:new_customer_return)) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li>
 <% end %>
 
 <% if @rma_return_items.any? || @new_return_items.any? %>
@@ -41,8 +40,8 @@
       </div>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.create'), 'ok' %>
-        <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order), :icon => 'remove' %>
+        <%= button Spree.t('actions.create') %>
+        <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order) %>
       </div>
     </fieldset>
   <% end %>

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

@@ -1,8 +1,7 @@
 <%= render 'spree/admin/shared/general_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:general_settings) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t(:general_settings)) %>
 
 <%= form_tag admin_general_settings_path, method: :put do %>
   <div id="preferences" data-hook>
@@ -59,37 +58,14 @@
         </div>
       <% end %>
 
-      <% if can? :clear_cache, :general_settings %>
-        <div class="row">
-          <div class="alpha six columns">
-            <fieldset class="no-border-bottom">
-              <legend align="center"><%= Spree.t(:clear_cache)%></legend>
-              <div>
-                <%= Spree.t(:clear_cache_warning) %>
-              </div>
-              <div class="field" data-hook="general_settings_clear_cache">
-                <%= button Spree.t(:clear_cache), '', 'button', id: "clear_cache" %>
-              </div>
-            </fieldset>
-          </div>
-        </div>
-      <% end %>
-
       <% if can? :update, :general_settings %>
         <div class="form-buttons filter-actions actions" data-hook="buttons">
-          <%= button Spree.t('actions.update'), 'refresh' %>
-          <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
+          <%= button Spree.t('actions.update') %>
+          <%= link_to Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
         </div>
       <% end %>
 
     </fieldset>
 
   </div>
-
-
 <% end %>
-
-<script>
-  $('#store_default_currency').select2();
-  $('#currency').select2();
-</script>

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

@@ -2,8 +2,12 @@
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @image } %>
 
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Image), admin_product_images_path(@product)) %>
+<% admin_breadcrumb(@image.attachment_file_name) %>
+
+
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product), :icon => 'arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product) %></li>
 <% end %>
 
 <%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
@@ -18,7 +22,7 @@
     </div>
     <div class="clear"></div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'refresh' %>
+      <%= button Spree.t('actions.update') %>
       <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button remove' %>
     </div>
   </fieldset>

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

@@ -1,5 +1,8 @@
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Images'} %>
 
+<% admin_breadcrumb(plural_resource_name(Spree::Image)) %>
+
+
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
     <li><%= link_to_with_icon('plus', Spree.t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link', :class => 'button') %></li>

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

@@ -3,10 +3,10 @@
     <legend align="center"><%= Spree.t(:new_image) %></legend>
 
       <%= render :partial => 'form', :locals => { :f => f } %>
-    
+
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.update'), 'refresh' %>
-        <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
+        <%= button Spree.t('actions.update') %>
+        <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
       </div>
   </fieldset>
 <% end %>

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

@@ -1,15 +1,11 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i>
-  <%= Spree::Payment.model_name.human %>
-  <i class="fa fa-arrow-right"></i>
-  <%= Spree::LogEntry.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree::Payment.model_name.human) %>
+<% admin_breadcrumb(plural_resource_name(Spree::LogEntry)) %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'archive' %></li>
-  <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment), :icon => 'arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
+  <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment) %></li>
 <% end %>
 
 <table class='index' id='listing_log_entries'>

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

@@ -1,17 +1,15 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_option_type) %> <span class="green">"<%= @option_type.name %>"</span>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::OptionType), spree.admin_option_types_path) %>
+<% admin_breadcrumb(@option_type.name) %>
+
 
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", :class => 'button fa fa-plus' %>
+      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", :class => 'button' %>
     </span>
   </li>
-  <li>
-    <%= button_link_to Spree.t(:back_to_option_types_list), spree.admin_option_types_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
+  <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @option_type } %>
 
@@ -23,7 +21,7 @@
   </fieldset>
 
   <fieldset>
-    <legend><%= Spree::OptionValue.model_name.human(count: :other) %></legend>
+    <legend><%= plural_resource_name(Spree::OptionValue) %></legend>
     <table class="index sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
       <thead data-hook="option_header">
         <tr>

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

@@ -1,11 +1,11 @@
-<% content_for :page_title do %>
-  <%= Spree::OptionType.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::OptionType)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::OptionType) %>
     <li id="new_ot_link">
-      <%= button_link_to Spree.t(:new_option_type), new_admin_option_type_url, { :remote => true, :icon => 'plus', :id => 'new_option_type_link' } %>
+      <%= button_link_to Spree.t(:new_option_type), new_admin_option_type_url, { :remote => true, :id => 'new_option_type_link' } %>
     </li>
   <% end %>
 <% end %>