spree_admin 5.0.3 → 5.1.0.beta

data/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erb

@@ -1,64 +1,177 @@
 <%= turbo_frame_tag :page_sidebar_toolbar do %>
   <div class="d-none">
-    <% @page_preview.sections.includes(:blocks).each do |section| %>
+    <% sections =
+      @page_preview.sections.includes(:blocks).map { |s| [@page_preview, s] } %>
+
+    <% sections +=
+      @theme_preview.sections.includes(:blocks).map { |s| [@theme_preview, s] } %>
+
+    <% sections.each do |parent, section| %>
       <% next if section.new_record? %>
 
-      <div id="editor-toolbar-section-<%= section.id %>">
-        <button class="editor-toolbar-lower">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down" viewBox="0 0 16 16">
-            <path fill-rule="evenodd" d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"/>
-          </svg>
-        </button>
-        <button class="editor-toolbar-higher">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-up" viewBox="0 0 16 16">
-            <path fill-rule="evenodd" d="M8 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L7.5 2.707V14.5a.5.5 0 0 0 .5.5z"/>
-          </svg>
-        </button>
-        <button class="editor-toolbar-edit">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil" viewBox="0 0 16 16">
-            <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>
-          </svg>
-        </button>
-        <button class="editor-toolbar-delete">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
-            <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"/>
-            <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"/>
-          </svg>
-        </button>
-      </div>
+      <% unless parent.is_a?(Spree::Theme) %>
+        <div id="editor-toolbar-section-<%= section.id %>">
+          <button class="editor-toolbar-lower">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              fill="currentColor"
+              class="bi bi-arrow-down"
+              viewBox="0 0 16 16"
+            >
+              <path
+                fill-rule="evenodd"
+                d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"
+              />
+            </svg>
+          </button>
+          <button class="editor-toolbar-higher">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              fill="currentColor"
+              class="bi bi-arrow-up"
+              viewBox="0 0 16 16"
+            >
+              <path
+                fill-rule="evenodd"
+                d="M8 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L7.5 2.707V14.5a.5.5 0 0 0 .5.5z"
+              />
+            </svg>
+          </button>
+          <button class="editor-toolbar-edit">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              fill="currentColor"
+              class="bi bi-pencil"
+              viewBox="0 0 16 16"
+            >
+              <path
+                d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"
+              />
+            </svg>
+          </button>
+          <button class="editor-toolbar-delete">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              fill="currentColor"
+              class="bi bi-trash"
+              viewBox="0 0 16 16"
+            >
+              <path
+                d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"
+              />
+              <path
+                d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"
+              />
+            </svg>
+          </button>
+        </div>
 
-      <%= button_to Spree.t(:move_up), spree.move_higher_admin_page_section_path(@page_preview, section), method: :patch, id: "editor-toolbar-higher-section-#{section.id}" %>
-      <%= button_to Spree.t(:move_down), spree.move_lower_admin_page_section_path(@page_preview, section), method: :patch, id: "editor-toolbar-lower-section-#{section.id}" %>
-      <%= link_to Spree.t(:destroy), spree.admin_page_section_path(section), data: { turbo_confirm: Spree.t(:are_you_sure), turbo_method: :delete }, id: "editor-toolbar-delete-section-#{section.id}" %>
+        <%= button_to Spree.t(:move_up),
+        spree.move_higher_admin_page_section_path(parent, section),
+        method: :patch,
+        id: "editor-toolbar-higher-section-#{section.id}" %>
+        <%= button_to Spree.t(:move_down),
+        spree.move_lower_admin_page_section_path(parent, section),
+        method: :patch,
+        id: "editor-toolbar-lower-section-#{section.id}" %>
+        <%= link_to Spree.t(:destroy),
+        spree.admin_page_section_path(section),
+        data: {
+          turbo_confirm: Spree.t(:are_you_sure),
+          turbo_method: :delete,
+        },
+        id: "editor-toolbar-delete-section-#{section.id}" %>
+
+      <% end %>
 
       <% section.blocks.each do |block| %>
         <div id="editor-toolbar-block-<%= block.id %>">
           <button class="editor-toolbar-lower">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down" viewBox="0 0 16 16">
-              <path fill-rule="evenodd" d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"/>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              fill="currentColor"
+              class="bi bi-arrow-down"
+              viewBox="0 0 16 16"
+            >
+              <path
+                fill-rule="evenodd"
+                d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"
+              />
             </svg>
           </button>
           <button class="editor-toolbar-higher">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-up" viewBox="0 0 16 16">
-              <path fill-rule="evenodd" d="M8 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L7.5 2.707V14.5a.5.5 0 0 0 .5.5z"/>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              fill="currentColor"
+              class="bi bi-arrow-up"
+              viewBox="0 0 16 16"
+            >
+              <path
+                fill-rule="evenodd"
+                d="M8 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L7.5 2.707V14.5a.5.5 0 0 0 .5.5z"
+              />
             </svg>
           </button>
           <button class="editor-toolbar-edit">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil" viewBox="0 0 16 16">
-              <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              fill="currentColor"
+              class="bi bi-pencil"
+              viewBox="0 0 16 16"
+            >
+              <path
+                d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"
+              />
             </svg>
           </button>
           <button class="editor-toolbar-delete">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
-              <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"/>
-              <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"/>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              fill="currentColor"
+              class="bi bi-trash"
+              viewBox="0 0 16 16"
+            >
+              <path
+                d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5Zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6Z"
+              />
+              <path
+                d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1ZM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118ZM2.5 3h11V2h-11v1Z"
+              />
             </svg>
           </button>
         </div>
 
-        <%= button_to Spree.t(:move_up), spree.move_higher_admin_page_section_block_path(section, block), method: :patch, id: "editor-toolbar-higher-block-#{block.id}" %>
-        <%= button_to Spree.t(:move_down), spree.move_lower_admin_page_section_block_path(section, block), method: :patch, id: "editor-toolbar-lower-block-#{block.id}" %>
-        <%= link_to Spree.t(:destroy), spree.admin_page_section_block_path(section, block), data: { turbo_confirm: Spree.t(:are_you_sure), turbo_method: :delete }, id: "editor-toolbar-delete-block-#{block.id}" %>
+        <%= button_to Spree.t(:move_up),
+        spree.move_higher_admin_page_section_block_path(section, block),
+        method: :patch,
+        id: "editor-toolbar-higher-block-#{block.id}" %>
+        <%= button_to Spree.t(:move_down),
+        spree.move_lower_admin_page_section_block_path(section, block),
+        method: :patch,
+        id: "editor-toolbar-lower-block-#{block.id}" %>
+        <%= link_to Spree.t(:destroy),
+        spree.admin_page_section_block_path(section, block),
+        data: {
+          turbo_confirm: Spree.t(:are_you_sure),
+          turbo_method: :delete,
+        },
+        id: "editor-toolbar-delete-block-#{block.id}" %>
       <% end %>
     <% end %>
   </div>

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

@@ -26,9 +26,9 @@
 
   <% if show_add_link_button %>
     <% if parent.is_a?(Spree::PageSection) %>
-      <% add_url = admin_page_section_links_path(parent) %>
+      <% add_url = spree.admin_page_section_links_path(parent) %>
     <% elsif parent.is_a?(Spree::PageBlock) %>
-      <% add_url = admin_page_section_block_links_path(parent.section, parent) %>
+      <% add_url = spree.admin_page_section_block_links_path(parent.section, parent) %>
     <% end %>
 
     <%= link_to_with_icon 'plus', 'Add link', add_url, class: 'btn btn-primary w-100', data: { turbo_method: :post } if add_url && can?(:create, Spree::PageLink.new(parent: parent)) %>

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

@@ -10,9 +10,7 @@
       <%= render 'spree/admin/page_links/form', f: f %>
     <% end %>
   </div>
-  <div class="position-fixed border-top bg-light bottom-bar" style="bottom: 0px; width:344px; z-index: 9999">
-    <div class="px-3 py-2" data-action="click->page-builder#hideSidebarMobile">
-      <%= link_to_delete(@page_link, url: spree.admin_page_link_path(@page_link)) %>
-    </div>
+  <div class="sidebar-footer">
+    <%= link_to_delete(@page_link, url: spree.admin_page_link_path(@page_link)) %>
   </div>
 <% end %>

data/app/views/spree/admin/page_sections/_form_tab_buttons.html.erb

@@ -1,12 +1,8 @@
 <div class="sidebar-footer">
-  <div class="d-flex align-items-center justify-content-end w-100">
-    <% if tab == :design %>
-      <%= link_to_with_icon "restore", Spree.t(:restore_defaults), spree.restore_design_settings_to_defaults_admin_page_section_path(@page_section), {data: {turbo_confirm: Spree.t(:are_you_sure), turbo_method: :patch }, class: 'btn btn-light'} %>
-    <% end %>
-    <% if @page_section.can_be_deleted? %>
-      <div data-action="click->page-builder#hideSidebarMobile" class="ml-auto">
-        <%= link_to_delete(@page_section, url: spree.admin_page_section_path(@page_section)) %>
-      </div>
-    <% end %>
-  </div>
+  <% if @page_section.can_be_deleted? %>
+    <%= link_to_delete(@page_section, url: spree.admin_page_section_path(@page_section)) %>
+  <% end %>
+  <% if tab == :design %>
+    <%= link_to_with_icon "restore", Spree.t(:restore_defaults), spree.restore_design_settings_to_defaults_admin_page_section_path(@page_section), {data: {turbo_confirm: Spree.t(:are_you_sure), turbo_method: :patch }, class: 'btn btn-light btn-sm ml-auto'} %>
+  <% end %>
 </div>

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

@@ -11,7 +11,7 @@
       <%= f.hidden_field :pageable_id %>
       <%= f.hidden_field :pageable_type %>
       <% cache spree_base_cache_scope.call('new-section-list'), expires_in: 1.hour do %>
-        <ul class="list-group list-group-flush m-2 mx-3">
+        <ul class="list-group list-group-flush m-2 mx-3 border p-1 rounded-lg bg-white">
           <% @theme.available_page_sections.each do |section_class| %>
             <li class="list-group-item p-2 list-group-item-action cursor-pointer d-flex align-items-center hover-action text-primary"
               data-action="click->section-form#addSection"

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

@@ -1,14 +1,14 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_with model: @page, url: spree.admin_page_path(@page), data: { controller: 'slug-form seo-form' }, scope: :page do |f| %>
     <div class="modal-content">
-      <%= modal_header(Spree.t(:page_settings)) %>
+      <%= modal_header(@page.display_name) %>
       <div class="modal-body">
         <%= render 'spree/admin/shared/error_messages', target: @page %>
         <%= render 'form', f: f, vertical: true %>
       </div>
       <div class="modal-footer">
         <%= turbo_save_button_tag Spree.t('actions.save'), data: {turbo_frame: :_top} %>
-        <%= link_to Spree.t('actions.destroy'), spree.admin_page_path(@page.id), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'btn btn-danger' %>
+        <%= link_to Spree.t('actions.destroy'), spree.admin_page_path(@page.id), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'btn btn-danger ml-auto' %>
       </div>
     </div>
   <% end %>

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

@@ -55,7 +55,7 @@
         </div>
         <div class="form-group">
           <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
-          <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'custom-select'}) %>
+          <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], {}, {class: 'custom-select'}) %>
         </div>
 
         <div class="form-group">

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

@@ -5,27 +5,28 @@
 <div class="card-lg">
   <div class="table-responsive">
     <table class="table">
-      <thead class="text-muted">
-      <tr>
-        <th></th>
-        <th><%= Spree.t(:payment_method) %></th>
-        <th><%= Spree.t(:visibility) %></th>
-        <th class="text-center"><%= Spree.t(:active) %></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody data-controller="sortable" data-sortable-handle-value=".move-handle" data-sortable-resource-name-value="payment_method" data-sortable-response-kind-value="turbo-stream">
-      <%= render partial: 'spree/admin/payment_methods/payment_method', collection: @payment_methods %>
-    </tbody>
-  </table>
+      <thead>
+        <tr>
+          <th></th>
+          <th><%= Spree.t(:payment_method) %></th>
+          <th><%= Spree.t(:visibility) %></th>
+          <th class="text-center"><%= Spree.t(:active) %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody data-controller="sortable" data-sortable-handle-value=".move-handle" data-sortable-resource-name-value="payment_method" data-sortable-response-kind-value="turbo-stream">
+        <%= render partial: 'spree/admin/payment_methods/payment_method', collection: @payment_methods %>
+      </tbody>
+    </table>
+  </div>
 </div>
 
 <% if available_payment_methods.present? && can?(:create, Spree::PaymentMethod) %>
-  <h5 class="pb-2 pt-3">Available Payment Methods</h5>
+  <h6 class="pb-2 pt-3">Available Payment Methods</h6>
   <div class="card-lg">
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
         <tr>
           <th><%= Spree.t(:name) %></th>
           <th><%= Spree.t(:description) %></th>

data/app/views/spree/admin/payments/_payment.html.erb

@@ -16,7 +16,7 @@
 
     <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">
         <% if payment.try(:gateway_dashboard_payment_url).present? %>

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/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/_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/products/form/_variants.html.erb

@@ -15,6 +15,7 @@
         data-variants-form-currencies-value="<%= supported_currencies.map(&:to_s).to_json %>"
         data-variants-form-current-stock-location-id-value="<%= default_stock_location_for_product(@product).id %>"
         data-variants-form-stock-locations-value="<%= available_stock_locations_for_product(@product).ids.map(&:to_s).to_json %>"
+        data-variants-form-admin-path-value="<%= spree.admin_path %>"
         <% if @product_options.present? %> data-variants-form-options-value="<%= @product_options.to_json %>" <% end %>
         <% if @product_available_options.present? %> data-variants-form-available-options-value="<%= @product_available_options.to_json %>" <% end %>
         <% if @product_stock.present? %> data-variants-form-stock-value="<%= @product_stock.to_json %>" <% 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>