spree_admin 5.0.6 → 5.1.0.beta

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -44,7 +44,7 @@
 
   <div class="form-group col-6">
     <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + required_span_tag) %><br>
-    <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: Spree.t(:card_expiration_placeholder) %>
+    <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: "MM/YYYY" %>
   </div>
 
   <div class="form-group col-6">

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

@@ -8,7 +8,7 @@
   <div class="card-lg">
     <div class="table-responsive rounded-lg">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:title) %></th>
             <th><%= Spree.t(:posts) %></th>

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

@@ -11,7 +11,7 @@
   <% if @collection.any? %>
     <div class="table-responsive rounded-lg">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= sort_link @search, :title, Spree.t(:title) %></th>
             <th><%= Spree.t(:category) %></th>

data/app/views/spree/admin/preferences/_password_field.html.erb

@@ -3,7 +3,7 @@
     <div data-replace-target="from">
       <div readonly class="form-control d-flex align-items-center justify-content-between pr-1">
         <span class="text-muted">
-          ...<%= form.object.send(field)&.last(4) %>
+          ...<%= form.object.send(field).last(4) %>
         </span>
         <button class="btn btn-sm btn-light" type="button" data-action="click->replace#replace">
           <%= icon 'edit', class: 'mr-2' %>
@@ -23,4 +23,4 @@
   <% else %>
     <%= form.password_field(field, preference_field_options(options)) %>
   <% end %>
-</div>
+</div>

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

@@ -25,7 +25,7 @@
         data-toggle="dropdown"
         aria-expanded="false"
       >
-        <%= icon("dots", class: "mr-0") %>
+        <%= icon('dots-vertical', class: "mr-0") %>
       </button>
       <div
         class="dropdown-menu dropdown-menu-left"

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

@@ -11,11 +11,8 @@
 
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
-
-    <div class="d-flex align-items-center justify-content-between">
-      <%= render "spree/admin/products/table_filter_dropdown" %>
-      <%= render 'spree/admin/shared/filters_button' %>
-    </div>
+    <%= render "spree/admin/products/table_filter_dropdown" %>
+    <%= render 'spree/admin/shared/filters_button' %>
   </div>
   <div data-reveal-target="item" class="d-none" id="table-filter">
     <%= f.hidden_field :status_eq, value: params.dig(:q, :status_eq) %>

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

@@ -7,14 +7,13 @@
     <% end unless @product.has_variants? %>
     <%= render 'spree/admin/products/form/variants', f: f %>
     <%= render 'spree/admin/products/form/inventory', f: f unless @product.has_variants? %>
+    <%= render 'spree/admin/products/form/shipping', f: f %>
     <%= render 'spree/admin/products/form/properties', f: f %>
     <%= render_admin_partials(:product_form_partials, f: f, product: @product) %>
   </div>
   <div class="col-md-4">
     <%= render 'spree/admin/products/form/status', f: f %>
     <%= render 'spree/admin/products/form/categorization', f: f %>
-    <%= render 'spree/admin/products/form/shipping', f: f %>
-    <%= render 'spree/admin/products/form/tax', f: f %>
     <%= render 'spree/admin/products/form/stores', f: f if available_stores.count > 1 %>
     <%= render_admin_partials(:product_form_sidebar_partials, f: f, product: @product) %>
 

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

@@ -6,7 +6,7 @@
 
         <div class="table-responsive">
           <table class="table" id="listing_products">
-            <thead class="text-muted">
+            <thead>
               <tr>
                 <th scope="col" class="pr-0 w-5">
                   <%= bulk_operations_select_all_checkbox %>

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

@@ -1,5 +1,5 @@
-<div class="dropdown h-100 mr-2">
-  <button class="btn btn-light h-100 dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">
+<div class="dropdown">
+  <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">
     <span class="text-muted font-weight-normal mr-1">
       <%= Spree.t(:show) %>
     </span>

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

@@ -1,35 +1,39 @@
-<div class="card mb-4">
-  <div class="card-header">
-    <h5 class="card-title">
-      <%= Spree.t(:categorization) %>
-    </h5>
-  </div>
-  <div class="card-body">
-    <div class="form-group">
-      <% if can? :modify, Spree::Taxon %>
-        <%= f.label :taxon_ids, Spree.t(:taxonomies) %>
+<% if can?(:manage, Spree::Classification) || can?(:manage, ActsAsTaggableOn::Tag) %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5 class="card-title">
+        <%= Spree.t(:categorization) %>
+      </h5>
+    </div>
+    <div class="card-body">
+      <div class="form-group">
+        <% if can? :manage, Spree::Classification %>
+          <%= f.label :taxon_ids, Spree.t(:taxonomies) %>
 
-        <%= tom_select_tag 'product[taxon_ids]',
-          multiple: true,
-          active_option: @product.taxon_ids,
-          url: spree.admin_taxons_select_options_path(format: :json),
-          class: 'w-100' %>
-      <% elsif @product.taxons.any? %>
-        <%= f.label :taxon_ids, Spree.t(:taxonomies) %>
+          <%= tom_select_tag 'product[taxon_ids]',
+            multiple: true,
+            active_option: @product.taxon_ids,
+            url: spree.admin_taxons_select_options_path(format: :json),
+            class: 'w-100' %>
+        <% elsif @product.taxons.any? %>
+          <%= f.label :taxon_ids, Spree.t(:taxonomies) %>
 
-        <ul class="text_list">
-          <% @product.taxons.manual.pluck(:name).each do |taxon_name| %>
-            <li><%= taxon_name %></li>
-          <% end %>
-        </ul>
-      <% else %>
-        <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
-      <% end %>
-    </div>
+          <ul class="text_list">
+            <% @product.taxons.manual.pluck(:name).each do |taxon_name| %>
+              <li><%= taxon_name %></li>
+            <% end %>
+          </ul>
+        <% else %>
+          <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
+        <% end %>
+      </div>
 
-    <div class="form-group">
-      <%= f.label :tag_list, Spree.t(:tags) %>
-      <%= tom_select_tag 'product[tag_list]', multiple: true, class: 'w-100', options: tags_json_array, active_option: @product.tag_list, value_field: :name, create: true %>
+      <% if can?(:manage, ActsAsTaggableOn::Tag) %>
+        <div class="form-group">
+          <%= f.label :tag_list, Spree.t(:tags) %>
+          <%= tom_select_tag 'product[tag_list]', multiple: true, class: 'w-100', options: tags_json_array, active_option: @product.tag_list, value_field: :name, create: true %>
+        </div>
+      <% end %>
     </div>
   </div>
-</div>
+<% end%>

data/app/views/spree/admin/promotion_actions/_promotion_action.html.erb

@@ -6,7 +6,7 @@
       <% if can?(:update, promotion_action) || can?(:destroy, promotion_action) %>
         <div class="dropdown">
           <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">
-            <%= icon('dots', class: 'mr-0') %>
+            <%= icon('dots-vertical', class: 'mr-0') %>
         </button>
         <div class="dropdown-menu">
             <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), spree.edit_admin_promotion_action_path(promotion_action.promotion, promotion_action), class: 'dropdown-item' if can?(:update, promotion_action) %> 

data/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb

@@ -6,7 +6,7 @@
       <% if can?(:update, promotion_rule) || can?(:destroy, promotion_rule) %>
         <div class="dropdown">
           <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">
-            <%= icon('dots', class: 'mr-0') %>
+            <%= icon('dots-vertical', class: 'mr-0') %>
         </button>
         <div class="dropdown-menu">
           <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), spree.edit_admin_promotion_rule_path(promotion_rule.promotion, promotion_rule), class: 'dropdown-item' if can?(:update, promotion_rule) %>

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

@@ -1,12 +1,8 @@
 <%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
-
-    <div class="d-flex align-items-center justify-content-between">
-      <%= render "spree/admin/promotions/table_filter_dropdown" %>
-
-      <%= render 'spree/admin/shared/filters_button' %>
-    </div>
+    <%= render "spree/admin/promotions/table_filter_dropdown" %>
+    <%= render 'spree/admin/shared/filters_button' %>
   </div>
   <div data-reveal-target="item" class="d-none" id="table-filter">
     <div class="row">

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

@@ -1,9 +1,7 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_promotions_path, @promotion %>
   <%= @promotion.name %>
-  <div class="ml-3">
-    <%= render 'spree/admin/promotions/status', promotion: @promotion %>
-  </div>
+  <%= render 'spree/admin/promotions/status', promotion: @promotion %>
 <% end %>
 
 <% content_for :page_tabs do %>

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

@@ -47,6 +47,24 @@
           </span>
         </li>
 
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          <span class="text-muted">
+            <%= Spree.t(:created_at) %>
+          </span>
+          <span>
+            <%= local_time(@promotion.created_at, format: :long) %>
+          </span>
+        </li>
+
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          <span class="text-muted">
+            <%= Spree.t(:updated_at) %>
+          </span>
+          <span>
+            <%= local_time(@promotion.updated_at, format: :long) %>
+          </span>
+        </li>
+
         <li class="list-group-item d-flex justify-content-between align-items-center">
           <span class="text-muted">
             <%= Spree.t(:kind) %>

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

@@ -1,5 +1,5 @@
-<div class="dropdown h-100 mr-2">
-  <button class="btn btn-light h-100 dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+<div class="dropdown">
+  <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
     <span class="text-muted font-weight-normal mr-1">
       <%= Spree.t(:status) %>
     </span> 

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

@@ -12,7 +12,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:code) %></th>

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

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button admin_properties_url %>
-  <%= @property.name %>
+  <%= @property.presentation %>
 <% end %>
 
 

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

@@ -22,7 +22,7 @@
   <% if @properties.present? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th class="no-border handel-head"></th>
             <th><%= Spree.t(:internal_name) %></th>

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

@@ -8,7 +8,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:status) %></th>

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

@@ -8,7 +8,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:type) %></th>

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

@@ -22,7 +22,7 @@ locals: {
     </div>
     <div class="card-body p-0">
       <table class="table table-condensed reimbursement-return-items-table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:product) %></th>
             <th><%= Spree.t(:preferred_reimbursement_type) %></th>
@@ -117,7 +117,7 @@ locals: {
   </div>
 <% end %>
 
-<div class="form-actions fixed-form-actions">
+<div class="form-actions">
   <% if !@reimbursement.reimbursed? %>
     <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'btn btn-primary', method: 'post' } do %>
       <%= icon "money" %>

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

@@ -21,7 +21,7 @@ locals: {
   </div>
   <div class="card-body p-0">
     <table class="table reimbursement-reimbursement-items-table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th><%= Spree.t(:product) %></th>
           <th><%= Spree.t(:preferred_reimbursement_type) %></th>

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

@@ -1,7 +1,7 @@
 <div class="card-lg">
   <div class="table-responsive">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <% @report.line_item_class.headers.each do |header| %>
             <th><%= header[:label] %></th>

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

@@ -8,7 +8,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:status) %></th>

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

@@ -2,9 +2,9 @@
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render "spree/admin/shared/filters_search_bar", param: :number_cont %>
 
-    <div class="dropdown h-100 mr-2">
+    <div class="dropdown">
       <button
-        class="btn btn-light h-100 dropdown-toggle"
+        class="btn btn-light dropdown-toggle"
         type="button"
         data-toggle="dropdown"
         aria-expanded="false"

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

@@ -1,7 +1,7 @@
 <% if @collection.any? %>
   <div class="table-responsive">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th><%= Spree.t(:number) %></th>
           <th><%= Spree.t(:created_at) %></th>

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

@@ -6,8 +6,10 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
 
 <%= form_for [:admin, @role] do |f| %>
-  <fieldset>
-    <%= render 'form', f: f %>
-    <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-  </fieldset>
+  <div class="card mb-4">
+    <div class="card-body">
+      <%= render 'form', f: f %>
+    </div>
+  </div>
+  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
 <% end %>

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

@@ -1,6 +1,4 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:roles) %>
-<% end %>
+<%= 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" %>
@@ -10,18 +8,24 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
-            <th><%= Spree.t(:role_id) %></th>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:permissions) %></th>
             <th></th>
           </tr>
         </thead>
         <tbody>
           <% @collection.each do |role| %>
             <tr id="<%= spree_dom_id role %>">
-              <td><%= role.name %></td>
+              <td class="w-20">
+                <code><%= role.name %></code>
+              </td>
+              <td class="w-80">
+                <%= Spree.t(:all) %>
+              </td>
               <td class="actions">
-                <%= link_to_edit(role, no_text: true) if can? :edit, role %>
+                <%= link_to_edit(role) %>
               </td>
             </tr>
           <% end %>

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

@@ -5,7 +5,7 @@
         <div
           data-controller="notification"
           data-notification-delay-value="5000"
-          class="animate__animated animate__fadeInDown animate__faster hidden alert d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;">
+          class="animate__animated animate__fadeInDown animate__faster hidden alert pr-2 d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;">
           <div class="d-flex align-items-center justify-content-between w-100">
             <div class="d-flex align-items-center justify-content-between">
               <span><%= text %></span>

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

@@ -0,0 +1,13 @@
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <%= render_breadcrumb_icon %>
+    <% if settings_active? %>
+      <li>
+        <%= active_link_to Spree.t(:settings), spree.edit_admin_store_path %>
+      </li>
+      <%= icon('slash', class: 'text-muted font-size-sm') %>
+    <% end %>
+
+    <%= render_breadcrumbs tag: :li, separator: icon('slash', class: 'text-muted font-size-sm') %>
+  </ol>
+</nav>

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

@@ -1,6 +1,6 @@
 <% date_from_input_name ||= :date_from %>
 <% date_to_input_name ||= :date_to %>
-<% css_classes ||= "btn btn-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
+<% css_classes ||= "btn btn-light d-inline-flex align-items-center dropdown-toggle" %>
 
 <% date_from_value ||= params[date_from_input_name] %>
 <% date_to_value ||= params[date_to_input_name] %>

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

@@ -11,7 +11,7 @@
     <h3 class="page-header-title mb-0 d-flex align-items-center gap-3">
       <%= yield :page_title %>
     </h3>
-    <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-2">
+    <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-3">
       <% if action_name == 'index' && defined?(model_class) && model_class && Spree::Export.available_models.include?(model_class) && can?(:create, Spree::Export) %>
         <span data-toggle="modal" data-target="#modal">
           <%= link_to spree.new_admin_export_path(export: { search_params: params[:q]&.to_json, type: Spree::Export.type_for_model(model_class) }), class: 'btn btn-light bg-transparent with-tip', title: 'Download records as CSV file', data: { turbo_frame: :dialog_modal } do %>
@@ -30,7 +30,7 @@
       <% if show_record_subtitle || content_for(:page_actions_dropdown) %>
         <div class="dropdown h-100" id="page_actions_dropdown">
           <%= link_to '#', class: 'btn btn-light bg-transparent h-100 p-2', data: { toggle: 'dropdown' }, id: 'more-actions-link' do %>
-            <%= icon 'dots', class: 'mr-0' %>
+            <%= icon 'dots-vertical', class: 'mr-0' %>
           <% end %>
           <div class="dropdown-menu dropdown-menu-right">
             <%= yield :page_actions_dropdown if content_for(:page_actions_dropdown) %>
@@ -67,7 +67,7 @@
 
 <% if content_for?(:page_tabs) %>
   <div class="container">
-    <ul class="nav nav-pills flex-nowrap overflow-auto w-100 mb-3">
+    <ul class="nav nav-pills flex-nowrap w-100 mb-3">
       <%= yield :page_tabs %>
     </ul>
   </div>

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

@@ -1,5 +1,5 @@
 <button
-  class="btn btn-light h-100 py-2"
+  class="btn btn-light"
   type="button"
   data-action="reveal#toggle"
 >

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

@@ -2,7 +2,7 @@
 <% badge_name ||= label %>
 <% placeholder ||= [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>
 
-<div class="form-control d-flex align-items-center py-0 focus-shadow focus-border flex-grow-1 mb-3 mb-lg-0 w-auto">
+<div class="form-control d-flex align-items-center py-0 focus-shadow focus-border flex-grow-1 mb-3 mb-lg-0" id="filters-search-bar">
   <%= icon "search", class: "mr-3 text-muted" %>
   <%= search_field_tag "q[#{param}]",
   params.dig(:q, param),

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

@@ -39,6 +39,10 @@
 
 <%= javascript_importmap_tags 'application-spree-admin', importmap: Rails.application.config.spree_admin.importmap %>
 
+<% if Rails.application.importmap.packages["application"].present? %>
+  <%= javascript_import_module_tag "application" %>
+<% end %>
+
 <%= yield :head %>
 
 <% if Rails.env.test? %>

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

@@ -2,27 +2,36 @@
 
 <%= render 'spree/admin/shared/offcanvas_nav' %>
 
-<header id="header" data-turbo-permanent>
-  <nav class="navbar navbar-expand-lg py-2 px-lg-5 d-lg-none">
-    <button type="button" class="btn d-flex align-items-center p-0 h-100 pull-bs-canvas-left d-lg-none text-white text-decoration-none">
-      <%= icon('menu-2', height: 32, class: 'm-0 h-100') %>
-    </button>
-
-    <div class="navbar-collapse d-none d-lg-flex">
-      <%= form_with url: spree.admin_search_admin_path, method: :post, class: 'd-none' do |form| %>
-        <div class="w-50 d-lg-flex align-items-center pr-2">
-          <%= icon('search', class: 'text-muted') %>
-          <%= text_field_tag :search, params[:search], class: 'px-3 py-2 bg-transparent w-100 outline-none border-0', placeholder: 'Search...', oninput: "this.form.requestSubmit()" %>
-        </div>
-      <% end if spree.respond_to?(:admin_search_admin_path) && defined?(current_store) && current_store %>
+<header id="header" class="sticky-top py-0">
+  <nav class="navbar navbar-expand-lg p-0 d-flex align-items-center pr-3">
+    <div class="d-lg-none pr-3 border-right">
+      <button type="button" class="btn btn-light pull-bs-canvas-left px-2 ml-3 text-decoration-none">
+        <%= icon('menu-2', class: 'mr-0') %>
+      </button>
     </div>
 
-    <%= link_to spree.admin_dashboard_path, class: 'navbar-brand d-flex d-lg-none h-100 align-items-center mx-0 text-white' do %>
-      <%= current_store.name %>
+    <% if settings_active? %>
+      <div class="store-dropdown pr-2">
+        <%= active_link_to_with_icon('arrow-back-up', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn store-dropdown-button w-100 justify-content-start mr-1') %>
+      </div>
+    <% else %>
+      <% if defined?(current_vendor) && current_vendor.present? %>
+        <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>
+      <% else %>
+        <%= render 'spree/admin/shared/sidebar/store_dropdown' %>
+      <% end %>
     <% end %>
 
-    <div class="text-right d-flex justify-content-end p-0" id="header-user-account" data-turbo-permanent>
+    <div class="d-none d-lg-block">
+      <%= render 'spree/admin/shared/breadcrumbs' %>
+    </div>
+
+    <div class="ml-auto d-flex align-items-center">
       <%= render 'spree/admin/shared/user_dropdown' %>
     </div>
   </nav>
-</header>
+</header>
+
+<div class="d-lg-none py-3 border-bottom">
+  <%= render 'spree/admin/shared/breadcrumbs' %>
+</div>

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

@@ -5,7 +5,7 @@
   <% args[:action] = per_page_action %>
 <% end %>
 
-<% if collection.any? && collection.total_pages > 1 %>
+<% if collection.any? %>
   <div class="py-2 border-top">
     <div class="index-pagination-row d-flex align-items-center">
       <div class="col-6 col-lg-3">

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

@@ -15,7 +15,7 @@
           </p>
         </div>
       </div>
-      <div class="modal-footer border-top">
+      <div class="modal-footer">
         <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t(:add_selected_products), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %>
       </div>