solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -5,7 +5,7 @@
 
     <% if @order.user.present? %>
       <dt data-hook='admin_order_user_link'><%= Spree.t(:user) %>:</dt>
-      <dd id='order_user_link'><%= link_to @order.user.email, edit_admin_user_path(@order.user) %></dd>
+      <dd id='order_user_link'><%= link_to @order.user.email, spree.edit_admin_user_path(@order.user) %></dd>
     <% end %>
 
     <dt data-hook='admin_order_tab_subtotal_title'><%= Spree::Order.human_attribute_name(:item_total) %>:</dt>

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

@@ -1,6 +1,6 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree::Order.model_name.human} ##{@order.number}", spree.edit_admin_order_path(@order) %>
-<% 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)) %>
+
 
 <% content_for :sidebar_title do %>
   <%= Spree.t(:order_information) %>

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

@@ -2,7 +2,7 @@
   <nav>
     <ul class="tabs" data-hook="admin_settings_payments_tabs">
       <% if can?(:display, Spree::PaymentMethod) %>
-        <%= settings_tab_item Spree::PaymentMethod.model_name.human(count: :other), admin_payment_methods_path %>
+        <%= settings_tab_item plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path %>
       <% end %>
     </ul>
   </nav>

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

@@ -11,10 +11,10 @@
   <% if can? :admin, Spree::Prototype %>
     <%= tab :prototypes %>
   <% end %>
-  <% if can? :display, Spree::Taxonomy %>
+  <% if can? :admin, Spree::Taxonomy %>
     <%= tab :taxonomies %>
   <% end %>
   <% if can? :admin, Spree::Taxon %>
-    <%= tab :taxons %>
+    <%= tab :taxons, label: :display_order %>
   <% end %>
 </ul>

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

@@ -1,27 +1,26 @@
-<% content_for :page_title do %>
-  <%= Spree::Product.model_name.human(count: :other) %> &#x2f; <%= @product.name %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb(link_to @product.name, spree.admin_product_path(@product)) %>
 
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_product_tabs">
       <%= content_tag :li, :class => ('active' if current == 'Product Details') do %>
-        <%= link_to_with_icon 'edit', Spree.t(:product_details), spree.edit_admin_product_url(@product) %>
+        <%= link_to Spree.t(:product_details), spree.edit_admin_product_url(@product) %>
       <% end if can?(:admin, Spree::Product) %>
       <%= content_tag :li, :class => ('active' if current == 'Images') do %>
-        <%= link_to_with_icon 'picture-o', Spree.t(:images), spree.admin_product_images_url(@product) %>
+        <%= link_to Spree.t(:images), spree.admin_product_images_url(@product) %>
       <% end if can?(:admin, Spree::Image) %>
       <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
-        <%= link_to_with_icon 'th-large', Spree::Variant.model_name.human(count: :other),  spree.admin_product_variants_url(@product) %>
+        <%= link_to plural_resource_name(Spree::Variant), spree.admin_product_variants_url(@product) %>
       <% end if can?(:admin, Spree::Variant) %>
       <%= content_tag :li, :class => ('active' if current == 'Prices') do %>
-        <%= link_to_with_icon 'money', Spree::Price.model_name.human(count: :other),  spree.admin_product_prices_url(@product) %>
+        <%= link_to plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product) %>
       <% end if can?(:admin, Spree::Price) %>
       <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
-        <%= link_to_with_icon 'tasks', Spree::ProductProperty.model_name.human(count: :other), spree.admin_product_product_properties_url(@product) %>
+        <%= link_to plural_resource_name(Spree::ProductProperty), spree.admin_product_product_properties_url(@product) %>
       <% end if can?(:admin, Spree::ProductProperty) %>
       <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
-        <%= link_to_with_icon 'cubes', Spree.t(:stock_management), spree.admin_product_stock_url(@product) %>
+        <%= link_to Spree.t(:stock_management), spree.admin_product_stock_url(@product) %>
       <% end if can?(:admin, Spree::StockItem) %>
     </ul>
   </nav>

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

@@ -2,7 +2,7 @@
     <div class="date-range-filter field align-center">
         <%= label_tag nil, Spree.t(:start), :class => 'inline' %>
         <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %>
-        
+
         <span class="range-divider">
           <i class="fa fa-arrow-right"></i>
         </span>
@@ -12,6 +12,6 @@
     </div>
 
     <div class="actions filter-actions">
-      <%= button Spree.t(:search), 'search'  %>
+      <%= button Spree.t(:search) %>
     </div>
 <% end %>

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

@@ -2,7 +2,7 @@
   <div class="date-range-filter field align-center">
     <%= label_tag :q_completed_at_gt, Spree.t(:start), :class => 'inline' %>
     <%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:completed_at_gt]) %>
-        
+
     <span class="range-divider">
       <i class="fa fa-arrow-right"></i>
     </span>
@@ -12,6 +12,6 @@
   </div>
 
   <div class="actions filter-actions">
-    <%= button Spree.t(:search), 'search'  %>
+    <%= button Spree.t(:search)  %>
   </div>
 <% end %>

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

@@ -2,19 +2,19 @@
   <nav>
     <ul class="tabs" data-hook="admin_settings_checkout_tabs">
       <% if can?(:display, Spree::RefundReason) %>
-        <%= settings_tab_item Spree::RefundReason.model_name.human(count: :other), admin_refund_reasons_path %>
+        <%= settings_tab_item plural_resource_name(Spree::RefundReason), spree.admin_refund_reasons_path %>
       <% end %>
 
       <% if can?(:display, Spree::ReimbursementType) %>
-        <%= settings_tab_item Spree::ReimbursementType.model_name.human(count: :other), admin_reimbursement_types_path %>
+        <%= settings_tab_item plural_resource_name(Spree::ReimbursementType), spree.admin_reimbursement_types_path %>
       <% end %>
 
       <% if can?(:display, Spree::ReturnReason) %>
-        <%= settings_tab_item Spree::ReturnReason.model_name.human(count: :other), admin_return_reasons_path %>
+        <%= settings_tab_item plural_resource_name(Spree::ReturnReason), spree.admin_return_reasons_path %>
       <% end %>
 
       <% if can?(:display, Spree::AdjustmentReason) %>
-        <%= settings_tab_item Spree::AdjustmentReason.model_name.human(count: :other), admin_adjustment_reasons_path %>
+        <%= settings_tab_item plural_resource_name(Spree::AdjustmentReason), spree.admin_adjustment_reasons_path %>
       <% end %>
     </ul>
   </nav>

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

@@ -4,23 +4,23 @@
   <% end %>
 
   <% if can?(:display, Spree::PaymentMethod) %>
-    <%= tab :payments, url: admin_payment_methods_path %>
+    <%= tab :payments, url: spree.admin_payment_methods_path %>
   <% end %>
 
   <% if can?(:display, Spree::Zone) || can?(:display, Spree::Country) || can?(:display, Spree::State) %>
-    <%= tab :areas, url: admin_zones_path %>
+    <%= tab :areas, url: spree.admin_zones_path %>
   <% end %>
 
   <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
-    <%= tab :taxes, url: admin_tax_categories_path %>
+    <%= tab :taxes, url: spree.admin_tax_categories_path %>
   <% end %>
 
   <% if can?(:display, Spree::RefundReason) || can?(:display, Spree::ReimbursementType) ||
      can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
-    <%= tab :checkout, url: admin_refund_reasons_path %>
+    <%= tab :checkout, url: spree.admin_refund_reasons_path %>
   <% end %>
 
   <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>
-    <%= tab :shipping, url: admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
+    <%= tab :shipping, url: spree.admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
   <% end %>
 </ul>

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

@@ -2,15 +2,16 @@
   <nav>
     <ul class="tabs" data-hook="admin_settings_shipping_tabs">
       <% if can?(:display, Spree::ShippingMethod) %>
-        <%= settings_tab_item Spree::ShippingMethod.model_name.human(count: :other), admin_shipping_methods_path %>
+        <%= settings_tab_item plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path %>
       <% end %>
 
       <% if can?(:display, Spree::ShippingCategory) %>
-        <%= settings_tab_item Spree::ShippingCategory.model_name.human(count: :other), admin_shipping_categories_path %>
+        <%= settings_tab_item plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path %>
+
       <% end %>
 
       <% if can?(:display, Spree::StockLocation) %>
-        <%= settings_tab_item Spree::StockLocation.model_name.human(count: :other), spree.admin_stock_locations_path %>
+        <%= settings_tab_item plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path %>
       <% end %>
     </ul>
   </nav>

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

@@ -1,5 +1,5 @@
 <% if content_for?(:sidebar) %>
-  <aside id="sidebar" data-hook class="four columns">
+  <aside id="sidebar" data-hook class="content-sidebar four columns">
 
     <% if content_for?(:sidebar_title) %>
       <h5 class="sidebar-title"><span><%= yield :sidebar_title %></span></h5>

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

@@ -1,39 +1,14 @@
-<% if can? :admin, Spree::Order %>
-  <%= tab *Spree::BackendConfiguration::ORDER_TABS, icon: 'shopping-cart' %>
-<% end %>
-
-<% if can? :admin, Spree::Product %>
-  <%= tab *Spree::BackendConfiguration::PRODUCT_TABS, icon: 'th-large' do %>
-    <%- render partial: 'spree/admin/shared/product_sub_menu' %>
-  <%- end %>
-<% end %>
-
-<% if can? :admin, :reports %>
-  <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'file'  %>
-<% end %>
-
-<% if can? :admin, :general_settings %>
-  <%= tab *Spree::BackendConfiguration::CONFIGURATION_TABS, label: :settings, icon: 'wrench', url: spree.edit_admin_general_settings_path do %>
-    <% render partial: 'spree/admin/shared/settings_sub_menu' %>
+<% Spree::Backend::Config.menu_items.each do |menu_item| %>
+  <% if instance_exec(&menu_item.condition) %>
+    <%=
+      tab(
+        *menu_item.sections,
+        icon: menu_item.icon,
+        label: menu_item.label,
+        url: menu_item.url.is_a?(Symbol) ? spree.public_send(menu_item.url) : menu_item.url
+      ) do
+    %>
+      <%- render partial: menu_item.partial if menu_item.partial %>
+    <%- end %>
   <% end %>
 <% end %>
-
-<% if can? :admin, Spree::Promotion %>
-  <%= tab *Spree::BackendConfiguration::PROMOTION_TABS, url: spree.admin_promotions_path, icon: 'bullhorn' do %>
-    <%- render partial: 'spree/admin/shared/promotion_sub_menu' %>
-  <%- end %>
-<% end %>
-
-<% if can? :admin, Spree::StockItem %>
-  <%= tab(
-    *Spree::BackendConfiguration::STOCK_TABS,
-    url: spree.admin_stock_items_path,
-    label: :stock, icon: 'cubes',
-    match_path: %r(^/admin/stock(?!_locations))) do %>
-    <%- render partial: 'spree/admin/shared/stock_sub_menu' %>
-  <%- end %>
-<% end %>
-
-<% if Spree.user_class && can?(:admin, Spree.user_class) %>
-  <%= tab *Spree::BackendConfiguration::USER_TABS, url: spree.admin_users_path, icon: 'user' %>
-<% end %>

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

@@ -2,11 +2,11 @@
   <nav>
     <ul class="tabs" data-hook="admin_settings_taxes_tabs">
       <% if can? :display, Spree::TaxCategory %>
-        <%= settings_tab_item Spree::TaxCategory.model_name.human(count: :other), admin_tax_categories_path %>
+        <%= settings_tab_item plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path %>
       <% end %>
 
       <% if can? :display, Spree::TaxRate %>
-        <%= settings_tab_item Spree::TaxRate.model_name.human(count: :other), admin_tax_rates_path %>
+        <%= settings_tab_item plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path %>
       <% end %>
     </ul>
   </nav>

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

@@ -15,7 +15,7 @@
 
     <div class="actions filter-actions">
       <div data-hook="admin_orders_index_search_buttons">
-        <%= button Spree.t(:filter_results), 'search' %>
+        <%= button Spree.t(:filter_results) %>
       </div>
     </div>
   <% end %>

data/app/views/spree/admin/shared/named_types/_edit.html.erb

@@ -1,12 +1,12 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% content_for :page_title do %>
-  <%= page_title %> <i class="fa fa-arrow-right"></i>
-  <%= @object.name %>
-<% end %>
+<% admin_breadcrumb(root_tab) %>
+<% admin_breadcrumb(sub_tab) %>
+<% admin_breadcrumb(index_link) %>
+<% admin_breadcrumb(@object.name) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', back_button_text, collection_url, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -1,14 +1,15 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% content_for :page_title do %>
-  <%= page_title %>
-<% end %>
+<% admin_breadcrumb(root_tab) %>
+<% admin_breadcrumb(sub_tab) %>
+<% admin_breadcrumb(page_title) %>
+
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::ReturnReason) %>
       <li>
-        <%= button_link_to new_button_text, new_object_url, { icon: 'plus', id: 'admin_new_named_type' } %>
+        <%= button_link_to new_button_text, new_object_url, { id: 'admin_new_named_type' } %>
       </li>
     <% end %>
   </ul>

data/app/views/spree/admin/shared/named_types/_new.html.erb

@@ -1,11 +1,12 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% content_for :page_title do %>
-  <%= page_title %>
-<% end %>
+<% admin_breadcrumb(root_tab) %>
+<% admin_breadcrumb(sub_tab) %>
+<% admin_breadcrumb(index_link) %>
+<% admin_breadcrumb(new_object) %>
+
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', back_button_text, collection_url, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_shipping_category) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path) %>
+<% admin_breadcrumb(Spree.t(:editing_shipping_category)) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_shipping_categories), spree.admin_shipping_categories_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_category } %>

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

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

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_shipping_category) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path) %>
+<% admin_breadcrumb(Spree.t(:new_shipping_category)) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_shipping_categories_list), spree.admin_shipping_categories_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_category } %>

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

@@ -63,7 +63,7 @@
 <div class="alpha six columns">
   <div data-hook="admin_shipping_method_form_availability_fields" class="alpha six columns">
     <fieldset class="categories no-border-bottom">
-      <legend align="center"><%= Spree::ShippingCategory.model_name.human(count: :other) %></legend>
+      <legend align="center"><%= plural_resource_name(Spree::ShippingCategory) %></legend>
       <%= f.field_container :categories do %>
         <% Spree::ShippingCategory.all.each do |category| %>
           <%= label_tag do %>
@@ -78,7 +78,7 @@
 
   <div class="alpha six columns">
     <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree::Zone.model_name.human(count: :other) %></legend>
+      <legend align="center"><%= plural_resource_name(Spree::Zone) %></legend>
       <%= f.field_container :zones do %>
         <% shipping_method_zones = @shipping_method.zones.to_a %>
         <% Spree::Zone.all.each do |zone| %>

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_shipping_method) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path) %>
+<% admin_breadcrumb(@shipping_method.name) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <div data-hook="admin_shipping_method_edit_form_header">

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

@@ -1,13 +1,14 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::ShippingMethod.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::ShippingMethod)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingMethod) %>
     <li>
-      <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :icon => 'plus', :id => 'admin_new_shipping_method_link' %>
+      <%= button_link_to Spree.t(:new_shipping_method), new_object_url, :id => 'admin_new_shipping_method_link' %>
     </li>
   <% end %>
 <% end %>
@@ -57,4 +58,3 @@
                  new_resource_url: new_object_url %>
   </div>
 <% end %>
-