solidus_backend 1.3.2 → 1.4.0.beta1

data/app/views/spree/admin/store_credits/edit_validity.html.erb

@@ -1,11 +1,13 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::StoreCredit), spree.admin_user_store_credits_path(@user)) %>
+<% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, admin_user_store_credit_path(@user, @store_credit)) %>
+<% admin_breadcrumb(Spree.t(:edit)) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_edit"), admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
 <% end %>
 
 <%= form_for [:admin, @user, @store_credit], url: invalidate_admin_user_store_credit_path, method: :put do |f| %>
@@ -15,8 +17,8 @@
       <%= render partial: 'update_reason_field', locals: { f: f } %>
     </div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('store_credit.actions.invalidate'), 'ban' %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_user_store_credit_path(@user, @store_credit), icon: 'remove' %>
+      <%= button Spree.t('store_credit.actions.invalidate') %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_user_store_credit_path(@user, @store_credit) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,13 +1,13 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
+<% admin_breadcrumb(Spree::StoreCredit.model_name.human) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_user_list"), admin_users_path, class: 'button' %></li>
   <% if can?(:create, Spree::StoreCredit) %>
-    <li><%= link_to_with_icon 'plus', Spree.t("admin.store_credits.add"), new_admin_user_store_credit_path(@user), class: 'button' %></li>
+    <li><%= link_to Spree.t("admin.store_credits.add"), new_admin_user_store_credit_path(@user), class: 'button' %></li>
   <% end %>
 <% end %>
 

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

@@ -1,11 +1,12 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
+<% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, spree.admin_user_store_credits_path(@user)) %>
+<% admin_breadcrumb(Spree.t(:new_store_credit)) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_store_credit_list"), admin_user_store_credits_path(@user), class: 'button' %></li>
 <% end %>
 
 <%= form_for [:admin, @user, @store_credit] do |f| %>

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

@@ -1,11 +1,12 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
+<% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, spree.admin_user_store_credits_path(@user)) %>
+<% admin_breadcrumb(@store_credit.display_amount.to_html) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_store_credit_list"), admin_user_store_credits_path(@user), class: 'button' %></li>
   <% if @store_credit.editable? && can?(:edit, @store_credit) %>
     <li><%= link_to_with_icon 'dollar', Spree.t("admin.store_credits.change_amount"), edit_amount_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
   <% end %>

data/app/views/spree/admin/style_guide/topics/typography/_icons.html.erb

@@ -7,7 +7,7 @@
   <pre><code class="language-ruby">
     icon('fa fa-user')
     link_to_with_icon('send', 'link text', '#')
-    button('button text', 'trash')
-    button_link_to('button link text', '#', icon: 'globe')
+    button('button text')
+    button_link_to('button link text', '#')
   </code></pre>
 </div>

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

@@ -1,11 +1,12 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_tax_category) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
+<% admin_breadcrumb(@tax_category.name) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_category } %>

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

@@ -1,14 +1,15 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:listing_tax_categories) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings) ) %>
+<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::TaxCategory)) %>
+
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::TaxCategory) %>
       <li>
-        <%= button_link_to Spree.t(:new_tax_category), new_object_url, :icon => 'plus', :id => 'admin_new_tax_categories_link' %>
+        <%= button_link_to Spree.t(:new_tax_category), new_object_url, :id => 'admin_new_tax_categories_link' %>
       </li>
     <% end %>
   </ul>

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

@@ -1,11 +1,12 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_tax_category) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
+<% admin_breadcrumb(Spree.t(:new_tax_category)) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
 <% end %>
 
 

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_tax_rate) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path) %>
+<% admin_breadcrumb(@tax_rate.name) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_rate } %>

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

@@ -1,13 +1,14 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::TaxRate.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::TaxRate)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::TaxRate) %>
     <li>
-      <%= button_link_to Spree.t(:new_tax_rate), new_object_url, :icon => 'plus' %>
+      <%= button_link_to Spree.t(:new_tax_rate), new_object_url %>
     </li>
   <% end %>
 <% end %>

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_tax_rate) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path) %>
+<% admin_breadcrumb(Spree.t(:new_tax_rate)) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_rate } %>

data/app/views/spree/admin/taxonomies/edit.erb

@@ -1,13 +1,11 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:taxonomy_edit) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Taxonomy), spree.admin_taxonomies_path) %>
+<% admin_breadcrumb(@taxonomy.name) %>
+
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
-  </li>
-  <li>
-    <%= button_link_to Spree.t(:add_taxon), spree.admin_taxonomies_path, { icon: 'plus', class: 'add-taxon-button' } %>
+    <%= button_link_to Spree.t(:add_taxon), spree.admin_taxonomies_path, { class: 'add-taxon-button' } %>
   </li>
 <% end %>
 
@@ -15,8 +13,8 @@
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>
     <div class="filter-actions actions">
-      <%= button Spree.t('actions.update'), 'refresh' %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, :icon => 'remove' %>
+      <%= button Spree.t('actions.update') %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path %>
     </div>
   </fieldset>
 

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

@@ -1,11 +1,11 @@
-<% content_for :page_title do %>
-  <%= Spree::Taxonomy.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::Taxonomy)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Taxonomy) %>
     <li>
-      <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :icon => 'plus', :id => 'admin_new_taxonomy_link' %>
+      <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :id => 'admin_new_taxonomy_link' %>
     </li>
   <% end %>
 <% end %>

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

@@ -1,11 +1,9 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:new_taxonomy) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Taxonomy), spree.admin_taxonomies_path) %>
+<% admin_breadcrumb(Spree.t(:new_taxonomy)) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= form_for [:admin, @taxonomy] do |f| %>
@@ -14,7 +12,7 @@
   <fieldset class="no-border-top">
     <br>
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.create'), 'ok' %>
+      <%= button Spree.t('actions.create') %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,10 +1,9 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:taxon_edit) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:taxon_edit)) %>
+
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path %>
   </li>
 <% end %>
 
@@ -14,8 +13,8 @@
   <%= render 'form', :f => f %>
 
   <div class="form-buttons filter-actions" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'refresh' %>
-    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), :icon => "remove" %>
+    <%= button Spree.t('actions.update') %>
+    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy) %>
   </div>
 <% end %>
 

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

@@ -1,6 +1,5 @@
-<% content_for :page_title do %>
-  <%= Spree::Taxon.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(link_to Spree::Product.model_name.human(count: :other), spree.admin_products_path) %>
+<% admin_breadcrumb(Spree.t('admin.taxons.display_order')) %>
 
 <% content_for :table_filter_title do %>
   <%= Spree.t(:choose_a_taxon_to_sort_products_for) %>

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/general_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_tracker) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t(:general_settings)) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Tracker), spree.admin_trackers_path) %>
+<% admin_breadcrumb(@tracker.analytics_id) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_trackers_list), spree.admin_trackers_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tracker } %>

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

@@ -1,13 +1,13 @@
 <%= render 'spree/admin/shared/general_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::Tracker.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t(:general_settings)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Tracker)) %>
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Tracker) %>
     <li>
-      <%= button_link_to Spree.t(:new_tracker), new_object_url, :icon => 'plus', :id => 'admin_new_tracker_link' %>
+      <%= button_link_to Spree.t(:new_tracker), new_object_url, :id => 'admin_new_tracker_link' %>
     </li>
   <% end %>
 <% end %>

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

@@ -1,13 +1,11 @@
 <%= render 'spree/admin/shared/general_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_tracker) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t(:general_settings)) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Tracker), spree.admin_trackers_path) %>
+<% admin_breadcrumb(Spree.t(:new_tracker)) %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_trackers_list), spree.admin_trackers_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tracker } %>

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

@@ -13,7 +13,7 @@
 
     <% if can? :display, Spree::Role %>
       <div data-hook="admin_user_form_roles" class="field">
-        <%= label_tag nil, Spree::Role.model_name.human(count: :other) %>
+        <%= label_tag nil, plural_resource_name(Spree::Role) %>
         <ul>
           <% if can? :manage, Spree::Role %>
             <% @roles.each do |role| %>
@@ -33,7 +33,7 @@
 
     <% if Spree::Config[:can_restrict_stock_management] && can?(:display, Spree::StockLocation) %>
       <div data-hook="admin_user_form_stock_locations" class="field">
-        <%= label_tag nil, Spree::StockLocation.model_name.human(count: :other) %>
+        <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
         <ul>
           <% if can?(:manage, Spree::UserStockLocation) %>
             <% @stock_locations.each do |stock_location| %>

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

@@ -2,26 +2,26 @@
   <nav>
     <ul class='tabs' data-hook="admin_user_tab_options">
       <li<%== ' class="active"' if current == :account %>>
-        <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %>
+        <%= link_to Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %>
       </li>
       <% if can?(:addresses, @user) %>
         <li<%== ' class="active"' if current == :address %>>
-          <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
+          <%= link_to Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:orders, @user) %>
         <li<%== ' class="active"' if current == :orders %>>
-          <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.order_history"), spree.orders_admin_user_path(@user) %>
+          <%= link_to Spree.t(:"admin.user.order_history"), spree.orders_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:items, @user) %>
         <li<%== ' class="active"' if current == :items %>>
-          <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %>
+          <%= link_to Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:display, Spree::StoreCredit) %>
         <li<%== ' class="active"' if current == :store_credits %>>
-          <%= link_to_with_icon 'money', Spree.t(:"admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
+          <%= link_to Spree.t(:"admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
         </li>
       <% end %>
     </ul>

data/app/views/spree/admin/users/_user_page_actions.html.erb

@@ -1,10 +1,7 @@
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'arrow-left' %>
-  </li>
   <% if can?([:admin, :create], Spree::Order) %>
     <li>
-      <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), :icon => 'plus' %>
+      <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id) %>
     </li>
   <% end %>
 <% end %>

data/app/views/spree/admin/users/addresses.html.erb

@@ -1,13 +1,14 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Address)) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :address %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_addresses" id="admin_user_edit_addresses" class="alpha twelve columns">
-  <legend><%= Spree::Address.model_name.human(count: :other) %></legend>
+  <legend><%= plural_resource_name(Spree::Address) %></legend>
 
   <div data-hook="admin_user_edit_form_header">
     <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>