spree_admin 5.1.2 → 5.1.4

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

@@ -1,10 +1,11 @@
-<% content_for :page_actions do %>
-  <%= render 'extra_actions' %>
+<%= render 'spree/admin/shared/posts_tabs' %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:posts_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_post), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::Post) %>
 <% end %>
 
-<%= render 'spree/admin/shared/posts_tabs' %>
+<%= render_admin_partials(:posts_header_partials) %>
 
 <div class="card-lg">
   <%= render "spree/admin/posts/filters" %>

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

@@ -1,5 +1,7 @@
 <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
   <div class="bulk-panel-container">
+    <%= bulk_operations_counter %>
+
     <% if can?(:activate, Spree::Product) %>
       <%= bulk_action_link(
         Spree.t("admin.bulk_ops.products.title.set_status", status: :active),
@@ -20,7 +22,7 @@
       <button
         type="button"
         data-display="static"
-        class="btn btn-light px-2 h-100"
+        class="btn btn-light"
         data-placement="bottom"
         data-toggle="dropdown"
         aria-expanded="false"
@@ -81,7 +83,6 @@
       </div>
     </div>
 
-    <%= bulk_operations_counter %>
     <%= bulk_operations_close_button %>
   </div>
 </div>

data/app/views/spree/admin/products/form/_variants.html.erb

@@ -56,7 +56,7 @@
                 <label class="label" for="new_option_name"><%= Spree.t(:option_name) %></label>
                 <%= tom_select_tag :new_option_name,
                   multiple: false,
-                  create: true,
+                  create: can?(:create, Spree::OptionType),
                   preloaded_options: option_types_for_select,
                   include_blank: true,
                   select_data: {

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

@@ -1,4 +1,13 @@
-<%= render 'index_header' %>
+<% content_for :page_title do %>
+  <%= Spree.t(:products) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:products_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_product), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::Product) %>
+<% end %>
+
+<%= render_admin_partials(:products_header_partials) %>
 
 <div class="card-lg">
   <% if params[:frame_name].present? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <%= content_for :page_actions do %>
-  <%= turbo_save_button_tag Spree.t('actions.update'), form: 'edit_user' %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), form: 'edit_user', data: { admin_target: 'save' } %>
 <% end %>
 
 <%= form_for @user, url: spree.admin_profile_path, method: :put, as: :user do |f| %>

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

@@ -13,7 +13,7 @@
         </div>
       </div>
     </div>
-
+    <%= render_admin_partials(:promotions_filters_partials, f: f) %>
     <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 

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

@@ -5,10 +5,6 @@
 <% end %>
 
 <% content_for :page_tabs do %>
-  <li class="nav-item">
-    <%= active_link_to Spree.t(:settings), spree.admin_promotion_path(@promotion), class: "nav-link", active: controller_name == 'promotions' %>
-  </li>
-  <li class="nav-item">
-    <%= active_link_to Spree.t(:coupon_codes), spree.admin_promotion_coupon_codes_path(@promotion), class: "nav-link" %>
-  </li>
+  <%= nav_item(Spree.t(:settings), spree.admin_promotion_path(@promotion), active: controller_name == 'promotions') %>
+  <%= nav_item(Spree.t(:coupon_codes), spree.admin_promotion_coupon_codes_path(@promotion)) %>
 <% end if @promotion.multi_codes? %>

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

@@ -3,9 +3,12 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:promotions_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_promotion), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::Promotion) %>
 
+<%= render_admin_partials(:promotions_header_partials) %>
+
 <div class="card-lg">
   <%= render 'filters' %>
 

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

@@ -9,9 +9,12 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:properties_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_property), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::Property)  %>
 
+<%= render_admin_partials(:properties_header_partials) %>
+
 <div class="card-lg">
   <%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
     <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>

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

@@ -1,8 +1,11 @@
+<%= render 'spree/admin/shared/returns_and_refunds_nav' %>
+
 <% content_for :page_actions do %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_refund_reason), new_object_url, class: "btn btn-primary" %>
-<% end if can? :create, Spree::RefundReason %>
+  <%= render_admin_partials(:refund_reasons_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_refund_reason), new_object_url, class: "btn btn-primary" if can? :create, Spree::RefundReason %>
+<% end %>
 
-<%= render 'spree/admin/shared/returns_and_refunds_nav' %>
+<%= render_admin_partials(:refund_reasons_header_partials) %>
 
 <div class="card-lg">
   <% if @collection.any? %>

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

@@ -1,8 +1,11 @@
+<%= render 'spree/admin/shared/returns_and_refunds_nav' %>
+
 <% content_for :page_actions do %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_reimbursement_type), new_object_url, class: "btn btn-primary" %>
-<% end if can?(:create, Spree::ReimbursementType) %>
+  <%= render_admin_partials(:reimbursement_types_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_reimbursement_type), new_object_url, class: "btn btn-primary" if can?(:create, Spree::ReimbursementType)  %>
+<% end %>
 
-<%= render 'spree/admin/shared/returns_and_refunds_nav' %>
+<%= render_admin_partials(:reimbursement_types_header_partials) %>
 
 <div class="card-lg">
   <% if @collection.any? %>

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

@@ -2,6 +2,12 @@
   <%= Spree.t(:reports) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:reports_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:reports_header_partials) %>
+
 <div class="card">
   <div class="table-responsive">
     <table class="table">

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

@@ -1,8 +1,11 @@
+<%= render"spree/admin/shared/returns_and_refunds_nav" %>
+
 <% content_for :page_actions do %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_rma_reason), new_object_url, class: "btn btn-primary" %>
-<% end if can? :create, Spree::ReturnAuthorizationReason %>
+  <%= render_admin_partials(:return_authorization_reasons_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_rma_reason), new_object_url, class: "btn btn-primary" if can? :create, Spree::ReturnAuthorizationReason %>
+<% end %>
 
-<%= render"spree/admin/shared/returns_and_refunds_nav" %>
+<%= render_admin_partials(:return_authorization_reasons_header_partials) %>
 
 <div class="card-lg">
   <% if @collection.any? %>

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

@@ -2,6 +2,12 @@
   <%= Spree.t(:return_authorizations) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:return_authorizations_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:return_authorizations_header_partials) %>
+
 <div class="card-lg">
   <%= render "spree/admin/return_authorizations/filters" %>
   <%= render "spree/admin/return_authorizations/list" %>

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

@@ -1,6 +1,6 @@
 <div class="form-group">
   <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-  <%= f.text_field :name, class: 'form-control' %>
+  <%= f.text_field :name, class: 'form-control', required: true %>
   <%= f.error_message_on :name %>
 </div>
 

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

@@ -1,8 +1,11 @@
 <%= render 'spree/admin/shared/team_nav' %>
 
 <% content_for :page_actions do %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_role), new_object_url, class: "btn btn-primary" %>
-<% end if can? :create, Spree::Role %>
+  <%= render_admin_partials(:roles_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_role), new_object_url, class: "btn btn-primary" if can? :create, Spree::Role %>
+<% end %>
+
+<%= render_admin_partials(:roles_header_partials) %>
 
 <div class="card-lg">
   <% if @collection.any? %>

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

@@ -3,13 +3,16 @@
   <%= Spree.t(:new_role) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
-
-<%= form_for [:admin, @role] do |f| %>
-  <div class="card mb-4">
-    <div class="card-body">
-      <%= render 'form', f: f %>
-    </div>
+<div class="row">
+  <div class="col-lg-6 offset-lg-3">
+    <%= form_for [:admin, @role] do |f| %>
+      <div class="card mb-4">
+        <div class="card-body">
+          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
+          <%= render 'form', f: f %>
+        </div>
+      </div>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    <% end %>
   </div>
-  <%= render 'spree/admin/shared/new_resource_links' %>
-<% end %>
+</div>

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

@@ -1,4 +1,4 @@
-<% record = @object || @customer_return || @order || @product || @vendor || @user || @taxon || @store_credit %>
+<% record = @object || @customer_return || @order || @product || @vendor || @user || @admin_user || @taxon || @store_credit %>
 <% record = nil if @user&.is_a?(Spree.admin_user_class) %>
 
 <% show_record_subtitle = record && record.persisted? && record.has_attribute?(:updated_at) %>
@@ -24,7 +24,8 @@
       <%= yield :page_actions if content_for?(:page_actions) %>
 
       <% if action_name == 'edit' && @object %>
-        <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_#{@object.class.name.demodulize.underscore}_#{@object.id}" %>
+        <% class_name = defined?(model_class) ? model_class.to_s : @object.class.name %>
+        <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_#{class_name.demodulize.underscore}_#{@object.id}", data: { admin_target: 'save' } %>
       <% end %>
 
       <% if show_record_subtitle || content_for(:page_actions_dropdown) %>

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

@@ -1,7 +1,7 @@
 <% destroy_url = defined?(destroy_url) && destroy_url ? destroy_url : object_url(f.object) %>
 
 <div class="form-actions">
-  <%= turbo_save_button_tag Spree.t('actions.update') %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), data: { admin_target: 'save' } %>
   <% if f.object.can_be_deleted? && can?(:delete, f.object) %>
     <%= link_to Spree.t('actions.destroy'), destroy_url, data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: defined?(turbo_frame) ? turbo_frame : '_top' }, class: 'btn btn-danger ml-auto' %>
   <% end %>

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

@@ -11,9 +11,10 @@
     </div>
 
     <% if settings_active? %>
-      <div class="store-dropdown px-2">
-        <%= active_link_to_with_icon('arrow-left', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn store-dropdown-button w-100 justify-content-start mx-1 py-2') %>
-      </div>
+      <%= link_to spree.admin_path, class: 'store-dropdown text-decoration-none px-2 justify-content-start with-tip', title: Spree.t('admin.back_to_dashboard'), data: { admin_target: 'close' } do %>
+        <%= icon 'x', class: 'mx-2' %>
+        <kbd>ESC</kbd>
+      <% end %>
     <% else %>
       <% if defined?(current_vendor) && current_vendor.present? %>
         <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>

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

@@ -1,3 +1,3 @@
 <div class="form-actions">
-  <%= turbo_save_button_tag Spree.t('actions.create') %>
+  <%= turbo_save_button_tag Spree.t('actions.create'), data: { admin_target: 'save' } %>
 </div>

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

@@ -6,4 +6,5 @@
   <%= nav_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can?(:manage, Spree::ReturnAuthorizationReason) %>
   <%= nav_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can?(:manage, Spree::RefundReason) %>
   <%= nav_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can?(:manage, Spree::ReimbursementType) %>
+  <%= render_admin_partials(:returns_and_refunds_nav_partials) %>
 <% end %>

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

@@ -1,4 +1,5 @@
 <%= content_for(:page_tabs) do %>
   <%= nav_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path, active: controller_name == 'shipping_methods' && action_name == 'index') if can?(:manage, Spree::ShippingMethod) %>
   <%= nav_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can?(:manage, Spree::ShippingCategory) %>
+  <%= render_admin_partials(:shipping_nav_partials) %>
 <% end %>

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

@@ -1,2 +1,3 @@
 <%= nav_item(Spree.t(:stock_items), spree.admin_stock_items_path) if can?(:manage, Spree::StockItem) %>
 <%= nav_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can?(:manage, Spree::StockTransfer) %>
+<%= render_admin_partials(:stock_nav_partials) %>

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

@@ -4,6 +4,7 @@
   <%= nav_item(Spree.t(:users), spree.admin_admin_users_path) if can?(:manage, Spree.admin_user_class) %>
   <%= nav_item(Spree.t(:invitations), spree.admin_invitations_path) if can?(:manage, Spree::Invitation) %>
   <%= nav_item(Spree.t(:roles), spree.admin_roles_path) if can?(:manage, Spree::Role) %>
+  <%= render_admin_partials(:team_nav_partials) %>
 <% end %>
 
 <% content_for :page_actions do %>

data/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb

@@ -1,5 +1,3 @@
 <% if can?(:manage, Spree::Integration) %>
-  <li class="nav-item">
-    <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug-connected') %>
-  </li>
+  <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug-connected') %>
 <% end %>

data/app/views/spree/admin/shared/sidebar/_products_nav.html.erb

@@ -1,22 +1,21 @@
 <% products_active =  %w[products external_categories taxons taxonomies option_types option_values properties stock_items stock_transfers].include?(controller_name) || request.path.include?('products') %>
 <% if can?(:manage, Spree::Product) %>
   <%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'package', active: products_active) %>
-  <% if products_active %>
-    <ul class="nav-submenu">
-      <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
-        <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %>
-      <% end %>
-      <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>
-        <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>
-      <% end %>
-      <% if can?(:manage, Spree::OptionType) %>
-        <%= nav_item(Spree.t(:options), spree.admin_option_types_path, active: %w[option_types option_values].include?(controller_name)) %>
-      <% end %>
-      <% if can?(:manage, Spree::Property) %>
-        <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
-      <% end %>
 
-      <%= render_admin_partials(:store_products_nav_partials) %>
-    </ul>
+  <ul class="nav-submenu <% unless products_active %>d-none<% end %>">
+    <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
+      <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %>
     <% end %>
+    <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>
+      <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>
+    <% end %>
+    <% if can?(:manage, Spree::OptionType) %>
+      <%= nav_item(Spree.t(:options), spree.admin_option_types_path, active: %w[option_types option_values].include?(controller_name)) %>
+    <% end %>
+    <% if can?(:manage, Spree::Property) %>
+      <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
+    <% end %>
+
+    <%= render_admin_partials(:store_products_nav_partials) %>
+  </ul>
 <% end %>

data/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb

@@ -1,17 +1,7 @@
 <% if can?(:manage, Spree::Promotion) %>
   <% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) && @user.nil? %>
-  <li class="nav-item">
-    <%= active_link_to spree.admin_promotions_path, class: 'nav-link', active: discounts_active do %>
-      <%= icon 'discount' %>
-      <%= Spree.t(:promotions) %>
-    <% end %>
-
-    <% if discounts_active && defined?(Spree::GiftCard) && spree.respond_to?(:admin_gift_cards_path) && can?(:manage, Spree::GiftCard) %>
-      <ul class="nav-submenu">
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:gift_cards), spree.admin_gift_cards_path, class: 'nav-link', active: %w[gift_cards gift_card_batches].include?(controller_name) %>
-        </li>
-      </ul>
-    <% end %>
-  </li>
+  <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path, icon: 'discount', active: discounts_active) %>
+  <ul class="nav-submenu <% unless discounts_active %>d-none<% end %>">
+    <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path, active: %w[gift_cards gift_card_batches].include?(controller_name)) %>
+  </ul>
 <% end %>

data/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb

@@ -8,6 +8,7 @@
       <% if can?(:manage, Spree::ReturnAuthorization) %>
         <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>
       <% end %>
+      <%= render_admin_partials(:returns_nav_partials) %>
     </ul>
   <% end %>
 <% end %>

data/app/views/spree/admin/shared/sidebar/_store_nav.html.erb

@@ -67,24 +67,16 @@
 <% else %>
   <ul class="nav flex-column">
     <% unless current_store.setup_completed? %>
-      <li class="nav-item">
-        <%= active_link_to spree.admin_getting_started_path, class: 'nav-link'  do %>
-          <%= icon 'map' %>
-          <%= Spree.t('admin.getting_started') %>
-
-          <span class="badge ml-auto badge-info">
-            <%= current_store.setup_tasks_done %><span class="opacity-50">/<%= current_store.setup_tasks_total %></span>
-          </span>
-        <% end %>
-      </li>
+      <%= nav_item(nil, spree.admin_getting_started_path, icon: 'map') do %>
+        <%= icon 'map' %>
+        <%= Spree.t('admin.getting_started') %>
+        <span class="badge ml-auto badge-info">
+          <%= current_store.setup_tasks_done %><span class="opacity-50">/<%= current_store.setup_tasks_total %></span>
+        </span>
+      <% end %>
     <% end %>
 
-    <li class="nav-item">
-      <%= active_link_to spree.admin_path, class: 'nav-link', active: controller_name == 'dashboard' && action_name == 'show' do %>
-        <%= icon 'home' %>
-        <%= Spree.t(:home) %>
-      <% end %>
-    </li>
+    <%= nav_item(Spree.t(:home), spree.admin_path, icon: 'home', active: controller_name == 'dashboard' && action_name == 'show') %>
 
     <%= render 'spree/admin/shared/sidebar/orders_nav' %>
     <%= render 'spree/admin/shared/sidebar/returns_nav' %>
@@ -92,27 +84,15 @@
     <%= render 'spree/admin/shared/sidebar/vendors_nav' %>
 
     <% if can?(:manage, Spree.user_class) %>
-      <li class="nav-item">
-        <%= active_link_to spree.admin_users_path, class: 'nav-link' do %>
-          <%= icon 'users' %>
-          <%= Spree.t(:customers) %>
-        <% end %>
-      </li>
+      <%= nav_item(Spree.t(:customers), spree.admin_users_path, icon: 'users') %>
     <% end %>
 
     <%= render 'spree/admin/shared/sidebar/promotions_nav' %>
 
     <% if can?(:manage, Spree::Report) %>
-      <li class="nav-item">
-        <%= active_link_to spree.admin_reports_path, class: 'nav-link' do %>
-          <%= icon 'chart-bar' %>
-          <%= Spree.t(:reports) %>
-        <% end %>
-      </li>
+      <%= nav_item(Spree.t(:reports), spree.admin_reports_path, icon: 'chart-bar') %>
     <% end %>
 
-    <%= render 'spree/admin/shared/sidebar/custom_nav' %>
-
     <%= render_admin_partials(:store_nav_partials) %>
 
     <li class="nav-item border-top border-top-dashed my-1"></li>

data/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb

@@ -2,25 +2,23 @@
   <% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>
   <%= nav_item(Spree.t('admin.storefront'), spree.admin_themes_path, icon: 'building-store', active: storefront_active) %>
 
-  <% if storefront_active %>
-    <ul class="nav-submenu">
-      <% if can?(:manage, Spree::Theme) %>
-        <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
-      <% end %>
-      
-      <% if can?(:manage, Spree::Page) %>
-        <%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>
-      <% end %>
-      
-      <% if can?(:manage, Spree::Post) %>
-        <%= nav_item(Spree.t(:posts), spree.admin_posts_path, active: %w[posts post_categories].include?(controller_name)) %>
-      <% end %>
-      
-      <% if can?(:manage, current_store) %>
-        <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>
-      <% end %>
+  <ul class="nav-submenu <% unless storefront_active %>d-none<% end %>">
+    <% if can?(:manage, Spree::Theme) %>
+      <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
+    <% end %>
+    
+    <% if can?(:manage, Spree::Page) %>
+      <%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>
+    <% end %>
+    
+    <% if can?(:manage, Spree::Post) %>
+      <%= nav_item(Spree.t(:posts), spree.admin_posts_path, active: %w[posts post_categories].include?(controller_name)) %>
+    <% end %>
+    
+    <% if can?(:manage, current_store) %>
+      <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>
+    <% end %>
 
-      <%= render_admin_partials(:storefront_nav_partials) %>
-    </ul>
-  <% end %>
+    <%= render_admin_partials(:storefront_nav_partials) %>
+  </ul>
 <% end %>

data/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb

@@ -1,10 +1,14 @@
 <% if can?(:manage, current_store) %>
-  <li class="nav-item">
-    <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
-      <%= icon 'heart-handshake' %>
-      <%= Spree.t(:vendors) %>
+  <% if enterprise_edition? %>
+    <%= render_admin_partials(:vendors_nav_partials) %>
+  <% else %>
+    <li class="nav-item">
+      <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
+        <%= icon 'heart-handshake' %>
+        <%= Spree.t(:vendors) %>
 
-      <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
-    <% end %>
-  </li>
+        <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
+      <% end %>
+    </li>
+  <% end %>
 <% end%>

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

@@ -3,9 +3,12 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:shipping_categories_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_shipping_category), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::ShippingCategory %>
 
+<%= render_admin_partials(:shipping_categories_header_partials) %>
+
 <%= render partial: 'spree/admin/shared/shipping_nav' %>
 
 <div class="card-lg">

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

@@ -2,7 +2,12 @@
   <%= Spree.t(:shipping) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shipping_methods/actions' %>
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:shipping_methods_actions_partials) %>
+  <% if can?(:create, Spree::ShippingMethod) %>
+    <%= link_to_with_icon 'plus', Spree.t(:new_shipping_method), new_object_url, class: "btn btn-primary" %>
+  <% end %>
+<% end %>
 <%= render partial: 'spree/admin/shared/shipping_nav' %>
 
 <% content_for :page_alerts do %>
@@ -11,6 +16,8 @@
   </div>
 <% end %>
 
+<%= render_admin_partials(:shipping_methods_header_partials) %>
+
 <div class="card-lg">
   <% if @collection.any? %>
     <div class="table-responsive">

data/app/views/spree/admin/stock_items/_filters.html.erb

@@ -24,7 +24,7 @@
       </div>
 
     </div>
-
+    <%= render_admin_partials(:stock_items_filters_partials, f: f) %>
     <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 

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

@@ -2,10 +2,16 @@
   <%= Spree.t(:stock) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:stock_items_actions_partials) %>
+<% end %>
+
 <% content_for :page_tabs do %>
   <%= render "spree/admin/shared/stock_nav" %>
 <% end %>
 
+<%= render_admin_partials(:stock_items_header_partials) %>
+
 <div class="card-lg">
   <%= render "filters" %>
 

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

@@ -2,9 +2,12 @@
   <%= Spree.t(:stock_locations) %>
 <% end %>
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:stock_locations_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_stock_location), new_object_url, class: "btn btn-primary" %> 
 <% end if can? :create, Spree::StockLocation %>
 
+<%= render_admin_partials(:stock_locations_header_partials) %>
+
 <div class="card-lg">
   <% if @collection.any? %>
     <div class="table-responsive">