solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -1,11 +1,12 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_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(Spree.t(:new_refund_reason)) %>
+
 
 <% 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/refunds/edit.html.erb

@@ -1,9 +1,8 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Payments'} %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:editing_refund) %> <%= @refund.id %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
+<% admin_breadcrumb(link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment)) %>
+<% admin_breadcrumb("#{Spree.t(:editing_refund)} #{@refund.id}") %>
 
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset class="no-border-top">
@@ -23,8 +22,8 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.save'), 'ok' %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), icon: 'remove' %>
+      <%= button Spree.t('actions.save') %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,9 +1,9 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Payments'} %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_refund) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
+<% admin_breadcrumb(link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment)) %>
+<% admin_breadcrumb(Spree.t(:new_refund)) %>
+
 
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset class="no-border-top">
@@ -35,8 +35,8 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree::Refund.model_name.human, 'ok' %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), icon: 'remove' %>
+      <%= button Spree::Refund.model_name.human %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,8 +1,9 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::ReimbursementType.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::ReimbursementType)) %>
+
 
 <table class="index" id='listing_reimbursement_types' data-hook>
   <thead>

data/app/views/spree/admin/reimbursements/edit.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(:editing_reimbursement) %> #<%= @reimbursement.number %>
-<% end %>
+<% admin_breadcrumb("#{Spree.t(:editing_reimbursement} #{@reimbursement.number}") %>
+
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]), :icon => 'arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @reimbursement } %>
@@ -98,10 +97,10 @@
   <% end %>
   <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons">
     <% if !@reimbursement.reimbursed? %>
-      <%= button_to [:perform, :admin, @order, @reimbursement], {class: 'button fa fa-reply', method: 'post'} do %>
+      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button', method: 'post' } do %>
         <%= Spree.t(:reimburse) %>
       <% end %>
-      <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), :icon => 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]) %>
     <% end %>
   </div>
 </fieldset>

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

@@ -1,11 +1,9 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Reimbursements' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree::Reimbursement.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::Reimbursement)) %>
 
 <% 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>
+  <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order) %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %>

data/app/views/spree/admin/reimbursements/show.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::Reimbursement.model_name.human %> #<%= @reimbursement.number %>
-<% end %>
+<% admin_breadcrumb("#{Spree::Reimbursement.model_name.human} #{@reimbursement.number}") %>
+
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]), :icon => 'arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @reimbursement } %>

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

@@ -1,6 +1,5 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:listing_reports) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:reports)) %>
+
 
 <table class="index">
   <thead>

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

@@ -1,9 +1,7 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:sales_totals) %>
-<% end %>
+<% admin_breadcrumb(link_to Spree.t(:reports), spree.admin_reports_path) %>
+<% admin_breadcrumb(Spree.t(:sales_total)) %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, :class => 'button' %></li>
 <% end %>
 
 

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

@@ -1,29 +1,28 @@
 <% content_for :page_actions do %>
   <% if @return_authorization.can_cancel? %>
     <li>
-      <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) } %>
     </li>
   <% end %>
-  <li>
-    <%= button_link_to Spree.t(:back), spree.admin_order_return_authorizations_url(@order), icon: 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree::ReturnAuthorization.model_name.human %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::ReturnAuthorization), spree.admin_order_return_authorizations_url) %>
+<% admin_breadcrumb("#{@return_authorization.number} (#{Spree.t(@return_authorization.state.downcase)})") %>
 
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
-<%= form_for [:admin, @order, @return_authorization] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
 
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'repeat' %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %>
-    </div>
-  </fieldset>
-<% end %>
+<div data-hook="return-authorization-form-wrapper">
+	<%= form_for [:admin, @order, @return_authorization] do |f| %>
+	  <fieldset class="no-border-top">
+	    <%= render :partial => 'form', :locals => { :f => f } %>
+
+      <div class="form-buttons filter-actions actions" data-hook="buttons">
+        <%= button Spree.t('actions.update') %>
+        <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order) %>
+      </div>
+    </fieldset>
+	<% end %>
+</div>

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

@@ -4,16 +4,14 @@
   <% if @order.shipments.any? &:shipped? %>
     <li>
       <% if can? :create, Spree::ReturnAuthorization %>
-        <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :icon => 'plus' %>
+        <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order) %>
       <% end %>
     </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::ReturnAuthorization.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::ReturnAuthorization)) %>
+
 
 <% if @order.shipments.any?(&:shipped?) || @order.return_authorizations.any? %>
   <table class="index">

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

@@ -1,11 +1,10 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
-<% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_return_authorization) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::ReturnAuthorization), spree.admin_order_return_authorizations_url) %>
+<% admin_breadcrumb(Spree.t(:new_return_authorization)) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_return_authorizations_list), spree.admin_order_return_authorizations_url, :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
@@ -14,8 +13,8 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <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_return_authorizations_url(@order), :icon => 'remove' %>
+      <%= button Spree.t(:'actions.create') %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,4 +1,5 @@
 <%= render partial: 'spree/admin/shared/named_types/edit', locals: {
-  page_title: Spree.t(:editing_rma_reason),
-  back_button_text: Spree.t(:back_to_rma_reason_list)
+  root_tab: Spree.t(:settings),
+  sub_tab: Spree.t('admin.tab.checkout'),
+  index_link: link_to(plural_resource_name(Spree::ReturnReason), spree.admin_return_reasons_path),
 } %>

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

@@ -1,5 +1,7 @@
 <%= render partial: 'spree/admin/shared/named_types/index', locals: {
-  page_title: Spree::ReturnReason.model_name.human(count: :other),
+  root_tab: Spree.t(:settings),
+  sub_tab: Spree.t('admin.tab.checkout'),
+  page_title: plural_resource_name(Spree::ReturnReason),
   new_button_text: Spree.t(:new_rma_reason),
   resource: Spree::ReturnReason
 } %>

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

@@ -1,4 +1,6 @@
 <%= render partial: 'spree/admin/shared/named_types/new', locals: {
-  page_title: Spree.t(:new_rma_reason),
-  back_button_text: Spree.t(:back_to_rma_reason_list)
+  root_tab: Spree.t(:settings),
+  sub_tab: Spree.t('admin.tab.checkout'),
+  index_link: link_to(plural_resource_name(Spree::ReturnReason), spree.admin_return_reasons_path),
+  new_object: Spree.t(:new_rma_reason),
 } %>

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

@@ -2,16 +2,16 @@
   <nav>
     <ul class="tabs" data-hook="admin_settings_areas_tabs">
       <% if can? :display, Spree::Zone %>
-        <%= settings_tab_item Spree::Zone.model_name.human(count: :other), admin_zones_path %>
+        <%= settings_tab_item plural_resource_name(Spree::Zone), spree.admin_zones_path %>
       <% end %>
 
       <% if can? :display, Spree::Country %>
-        <%= settings_tab_item Spree::Country.model_name.human(count: :other), admin_countries_path %>
+        <%= settings_tab_item plural_resource_name(Spree::Country), spree.admin_countries_path %>
       <% end %>
 
       <% if can?(:display, Spree::State) %>
         <% if country = Spree::Country.find_by(iso: Spree::Config[:default_country_iso]) || Spree::Country.first %>
-          <%= settings_tab_item Spree::State.model_name.human(count: :other), admin_country_states_path(country) %>
+          <%= settings_tab_item plural_resource_name(Spree::State), spree.admin_country_states_path(country) %>
         <% end %>
       <% end %>
     </ul>

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

@@ -5,11 +5,11 @@
   <nav>
     <ul class="tabs" data-hook="admin_configurations_sidebar_menu">
       <% if can?(:edit, :general_settings) %>
-        <%= settings_tab_item Spree.t(:general_settings), edit_admin_general_settings_path %>
+        <%= settings_tab_item Spree.t(:settings), edit_admin_general_settings_path %>
       <% end %>
 
       <% if can?(:display, Spree::Tracker) %>
-        <%= settings_tab_item Spree.t(:analytics_trackers), admin_trackers_path %>
+        <%= settings_tab_item plural_resource_name(Spree::Tracker), admin_trackers_path %>
       <% end %>
     </ul>
   </nav>

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

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button Spree.t('actions.update'), 'refresh' %>
-  <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'remove' %>
+  <%= button Spree.t('actions.update') %>
+  <%= button_link_to Spree.t('actions.cancel'), collection_url %>
 </div>

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

@@ -2,14 +2,7 @@
 
 <%= csrf_meta_tags %>
 
-<title>
-  <% if content_for? :title %>
-    <%= yield :title %>
-  <% else %>
-    <%= "Solidus #{Spree.t('administration')}: " %>
-    <%= Spree.t(controller.controller_name, :default => controller.controller_name.titleize) %>
-  <% end %>
-</title>
+<title><%= admin_page_title %></title>
 
 <!-- Get "Open Sans" font from Google -->
 <link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese' rel='stylesheet' type='text/css'>

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

@@ -1,13 +1,9 @@
-<% if content_for?(:page_title) || content_for?(:page_actions) %>
-  <div id="content-header" class="main-header" data-hook>
-    <% if content_for?(:page_title) %>
-      <h1 class="page-title"><%= yield :page_title %></h1>
-    <% end %>
+<div id="content-header" class="main-header" data-hook>
+  <%= render_admin_breadcrumbs %>
 
-    <% if content_for?(:page_actions) %>
-      <ul class="header-actions page-actions inline-menu" data-hook="toolbar">
-        <%= yield :page_actions %>
-      </ul>
-    <% end %>
-  </div>
-<% end %>
+  <% if content_for?(:page_actions) %>
+    <ul class="header-actions page-actions inline-menu" data-hook="toolbar">
+      <%= yield :page_actions %>
+    </ul>
+  <% end %>
+</div>

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

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'ok' %>
-  <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
+  <%= button Spree.t('actions.create') %>
+  <%= link_to Spree.t('actions.cancel'), collection_url, :class => 'button' %>
 </div>

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

@@ -1,4 +1,4 @@
-<%= Spree.t(:no_resource, resource: resource.model_name.human(count: :other)) %>
+<%= Spree.t(:no_resource, resource: plural_resource_name(resource)) %>
 <% if can? :create, resource %>
   <%= link_to Spree.t(:create_one), new_resource_url %>
 <% end %>

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

@@ -2,46 +2,46 @@
   <ul class="tabs" data-hook="admin_order_tabs">
     <% if (@order.shipments.count == 0 || @order.shipped_shipments.count == 0) %>
       <li class="<%= "active" if current == "Cart" %>" data-hook='admin_order_tabs_order_details'>
-        <%= link_to_with_icon 'shopping-cart', Spree.t(:cart), cart_admin_order_url(@order) %>
+        <%= link_to Spree.t(:cart), spree.cart_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if checkout_steps.include?("address") %>
       <li class="<%= "active" if (current == "Customer Details") %>" data-hook='admin_order_tabs_customer_details'>
         <% if can?(:update, @order) %>
-          <%= link_to_with_icon 'user', Spree.t(:customer), edit_admin_order_customer_url(@order) %>
+          <%= link_to Spree.t(:customer), spree.edit_admin_order_customer_url(@order) %>
         <% else %>
-          <%= link_to_with_icon 'user', Spree.t(:customer), admin_order_customer_url(@order) %>
+          <%= link_to Spree.t(:customer), spree.admin_order_customer_url(@order) %>
         <% end %>
       </li>
     <% end %>
 
     <li class="<%= "active" if current == "Shipments" %>" data-hook='admin_order_tabs_order_details'>
-      <%= link_to_with_icon 'edit', Spree::Shipment.model_name.human(count: :other), edit_admin_order_url(@order) %>
+      <%= link_to plural_resource_name(Spree::Shipment), spree.edit_admin_order_url(@order) %>
     </li>
 
     <% if can? :display, Spree::Adjustment %>
       <li class="<%= "active" if current == "Adjustments" %>" data-hook='admin_order_tabs_adjustments'>
-        <%= link_to_with_icon 'cogs', Spree::Adjustment.model_name.human(count: :other), admin_order_adjustments_url(@order) %>
+        <%= link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:display, Spree::Payment) %>
       <li class="<%= "active" if current == "Payments" %>" data-hook='admin_order_tabs_payments'>
-        <%= link_to_with_icon 'credit-card', Spree::Payment.model_name.human(count: :other), admin_order_payments_url(@order) %>
+        <%= link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_url(@order) %>
       </li>
     <% end %>
 
     <% if !@order.completed? && can?(:update, @order) %>
       <li class="<%= "active" if current == "Confirm" %>" data-hook='admin_order_tabs_confirm'>
-        <%= link_to_with_icon 'check', Spree.t(:confirm), confirm_admin_order_url(@order) %>
+        <%= link_to Spree.t(:confirm), spree.confirm_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :display, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
         <li class="tab <%= "active" if current == "Return Authorizations" %>" data-hook='admin_order_tabs_return_authorizations'>
-          <%= link_to_with_icon 'share', Spree.t('admin.tab.rma'), admin_order_return_authorizations_url(@order) %>
+          <%= link_to Spree.t('admin.tab.rma'), spree.admin_order_return_authorizations_url(@order) %>
         </li>
       <% end %>
     <% end %>
@@ -49,14 +49,14 @@
     <% if can? :display, Spree::CustomerReturn %>
       <% if @order.completed? %>
         <li class="<%= "active" if current == "Customer Returns" %>">
-          <%= link_to_with_icon 'download', Spree::CustomerReturn.model_name.human(count: :other), admin_order_customer_returns_url(@order) %>
+          <%= link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order) %>
         </li>
       <% end %>
     <% end %>
 
     <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %>
       <%= content_tag('li', class: "#{'active' if current == 'Cancel Inventory'}", :data => {:hook => 'admin_order_tabs_cancel_inventory'}) do %>
-        <%= link_to_with_icon 'cancel', Spree.t(:cancel_inventory), admin_order_cancellations_path(@order) %>
+        <%= link_to Spree.t(:cancel_inventory), spree.admin_order_cancellations_path(@order) %>
       <% end %>
     <% end %>
   </ul>