spree_admin 5.0.4 → 5.1.0.beta2

data/app/views/spree/admin/orders/return_authorizations/show.html.erb

@@ -27,7 +27,7 @@ locals: {
 <div class="card-lg mb-4">
   <div class="table-responsive">
     <table class="table table-condensed return-items-table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th><%= Spree.t(:product) %></th>
           <th><%= Spree.t(:status) %></th>
@@ -102,7 +102,7 @@ locals: {
     </div>
     <div class="card-body p-0">
       <table class="table table-condensed">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:reimbursement_type) %></th>
             <th><%= Spree.t(:description) %></th>

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

@@ -1,7 +1,5 @@
-<div class="position-fixed border-top px-3 py-2 d-flex bottom-bar" style="bottom: 0px; left: 0px; width: 344px; z-index: 9999">
-  <% if @page_block.can_be_deleted? %>
-    <div data-action="click->page-builder#hideSidebarMobile">
-      <%= link_to_delete(@page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block)) %>
-    </div>
-  <% end %>
-</div>
+<% if @page_block.can_be_deleted? %>
+  <div class="sidebar-footer">
+    <%= link_to_delete(@page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block)) %>
+  </div>
+<% end %>

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

@@ -9,7 +9,7 @@
   <div class="px-3 pb-5 mb-5 edit-block" style="margin-bottom: 6rem;">
     <%= form_for @page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block), data: { controller: 'auto-submit' }, as: :page_block do |f| %>
       <div data-controller="bootstrap-tabs">
-        <ul class="nav nav-pills nav-fill mb-3 px-0" id="pills-tab" role="tablist">
+        <ul class="nav nav-pills nav-fill mb-3" id="pills-tab" role="tablist">
           <li class="nav-item" role="presentation">
             <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-toggle="pill" data-target="#pills-home" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>" data-action="bootstrap-tabs#change" data-bootstrap-tabs-tab-param="content">Content</button>
           </li>
@@ -36,10 +36,8 @@
           <%= render 'spree/admin/page_sections/fields/button', f: f %>
           <%= yield(:design_tab) %>
 
-          <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_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block)) %>
-            </div>
+          <div class="sidebar-footer">
+            <%= link_to_delete(@page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block)) %>
           </div>
         </div>
       </div>

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

@@ -1,4 +1,4 @@
-<%= form_for section.blocks.new, url: spree.admin_page_section_blocks_path(section), html: { class: 'list-group-item sidebar-page-block px-0 py-0 border-0 rounded'}, data: { controller: 'block-form', block_form_target: :form } do |f| %>
+<%= form_for section.blocks.new, url: spree.admin_page_section_blocks_path(section), html: { class: 'list-group-item sidebar-page-block px-0 py-1 border-0 rounded'}, data: { controller: 'block-form', block_form_target: :form } do |f| %>
   <%= f.hidden_field :type, data: { block_form_target: 'type' } %>
 
   <button class="btn btn-sm btn-link d-flex-inline" data-toggle="dropdown">

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

@@ -1,31 +1,38 @@
 <header id="page-builder-header" class="fixed-top">
   <nav class="navbar navbar-expand-lg">
-    <%= link_to spree.admin_themes_path, class: 'btn btn-light with-tip px-2', title: 'Go back to dashboard' do %>
+    <%= link_to spree.admin_themes_path, class: 'btn hover-gray with-tip px-2', title: Spree.t('admin.back_to_dashboard') do %>
       <%= icon('x', class: 'mr-0') %>
     <% end %>
-    <div class="px-3">
-      <span class="text-muted mr-1"><%= Spree.t(:theme) %>:</span>
-      <strong class="mr-1"><%= @theme.name %></strong>
-      &nbsp;
-      <% if @theme.default? %>
-        <span class="badge badge-success">
-          <%= icon('check') %>
-          Live
-        </span>
-      <% else %>
-        <span class="badge badge-warning">Draft</span>
-      <% end %>
-    </div>
-    <%= render 'spree/admin/page_builder/pages_dropdown' %>
+    <% if @page.custom? %>
+      <div class="px-3">
+        <span class="text-muted mr-1"><%= I18n.t('activerecord.models.spree/page.one') %>:</span>
+        <strong><%= @page.display_name %></strong>
+      </div>
 
-    <ul class="nav nav-pills" role="tablist">
-      <% if @page.custom? %>
-        <li class="nav-item" role="presentation" data-toggle="modal" data-target="#modal">
-          <%= link_to_with_icon 'settings', Spree.t(:page_settings), spree.edit_admin_page_path(@page.id), class: 'btn btn-light', data: { turbo_frame: 'dialog_modal' } %>
-        </li>
-      <% else %>
+      <span data-toggle="modal" data-target="#modal">
+        <%= link_to_with_icon 'settings', Spree.t(:settings), spree.edit_admin_page_path(@page.id), class: 'btn btn-light', data: { turbo_frame: 'dialog_modal' } %>
+      </span>
+    <% else %>
+      <div class="px-3">
+        <span class="text-muted mr-1"><%= Spree.t(:theme) %>:</span>
+        <strong class="mr-1"><%= @theme.name %></strong>
+        &nbsp;
+        <% if @theme.default? %>
+          <span class="badge badge-success">
+            <%= icon('check') %>
+            <%= Spree.t(:live) %>
+          </span>
+        <% else %>
+          <span class="badge badge-warning">
+            <%= Spree.t(:draft) %>
+          </span>
+        <% end %>
+      </div>
+      <%= render 'spree/admin/page_builder/pages_dropdown' %>
+
+      <ul class="nav nav-pills" role="tablist">
         <li class="nav-item" role="presentation">
-          <button class="nav-link active"
+          <button class="nav-link active with-tip"
                         title="Page sections"
                         data-toggle="tab"
                         data-target="#sections"
@@ -39,8 +46,8 @@
           </button>
         </li>
         <li class="nav-item" role="presentation">
-          <button class="nav-link"
-                  title="Theme"
+          <button class="nav-link with-tip"
+                  title="<%= Spree.t(:theme) %>"
                   data-toggle="tab"
                   data-target="#colors"
                   type="button"
@@ -53,7 +60,7 @@
           </button>
         </li>
         <li class="nav-item" role="presentation">
-          <button class="nav-link"
+          <button class="nav-link with-tip"
                 title="Fonts"
                 type="button"
                 data-toggle="tab"
@@ -67,8 +74,8 @@
             <%= icon 'typography', class: 'mr-0' %>
           </button>
         </li>
-      <% end %>
-    </ul>
+      </ul>
+    <% end %>
 
     <ul class="nav nav-pills ml-auto" role="tablist">
       <li class="nav-item" role="presentation">
@@ -94,6 +101,6 @@
     </ul>
 
     <%= link_to_with_icon 'eye', Spree.t(:preview), @page.preview_url(@theme_preview, @page_preview), class: 'btn btn-light ml-auto', target: '_blank' %>
-    <%= turbo_save_button_tag(@theme.default? ? Spree.t('actions.publish') : Spree.t('actions.save')) %>
+    <%= turbo_save_button_tag(@theme.default? ? icon('cloud-up') + Spree.t('actions.publish') : icon('pencil-check') + Spree.t('actions.save')) %>
   </nav>
 </header>

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

@@ -1,23 +1,17 @@
-<% if @page.custom? %>
-  <div class="d-flex justify-content-center h-100 align-items-center px-3">
-    <p class="mb-0 font-weight-bold"><%= truncate(@page.display_name, length: 150) %></p>
-  </div>
-<% else %>
-  <div class="dropdown h-100" id="pages_dropdown">
-    <button class="btn btn-light" type="button" data-toggle="dropdown" aria-expanded="false">
-      <span class="d-flex align-items-center pr-5">
-        <%= icon @page.icon_name, class: 'mr-2' %>
-        <%= @page.display_name %>
-      </span>
-      <%= icon 'selector', class: 'mr-0 ml-2 mb-0 text-muted' %>
-    </button>
-    <div class="dropdown-menu" style="min-width: 300px">
-      <% @theme.pages.standard.order(name: :asc).find_all(&:customizable?).each do |page| %>
-        <%= active_link_to spree.edit_admin_theme_path(@theme, theme_preview_id: @theme_preview.id, page_id: page.id), class: 'dropdown-item', active: @page == page do %>
-          <%= icon page.icon_name, class: 'mr-2' %>
-          <%= page.display_name %>
-        <% end %>
+<div class="dropdown h-100" id="pages_dropdown">
+  <button class="btn btn-light" type="button" data-toggle="dropdown" aria-expanded="false">
+    <span class="d-flex align-items-center pr-5">
+      <%= icon @page.icon_name, class: 'mr-2' %>
+      <%= @page.display_name %>
+    </span>
+    <%= icon 'selector', class: 'mr-0 ml-2 mb-0 text-muted' %>
+  </button>
+  <div class="dropdown-menu" style="min-width: 300px">
+    <% @theme.pages.standard.order(name: :asc).find_all(&:customizable?).each do |page| %>
+      <%= active_link_to spree.edit_admin_theme_path(@theme, theme_preview_id: @theme_preview.id, page_id: page.id), class: 'dropdown-item', active: @page == page do %>
+        <%= icon page.icon_name, class: 'mr-2' %>
+        <%= page.display_name %>
       <% end %>
-    </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,4 +1,4 @@
-<aside id="page-builder-sidebar" class="fixed-top h-100 overflow-auto pb-5">
+<aside id="page-builder-sidebar">
   <div class="tab-content mb5">
     <div class="tab-pane fade show active" id="sections" role="tabpanel" aria-labelledby="sidebar-icon-page">
       <%= render 'spree/admin/page_builder/sidebar_sections' %>

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

@@ -20,7 +20,7 @@
       </div>
       <div class="d-flex align-items-center d-none">
         <% if block.section.can_sort_blocks? %>
-          <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 handle-block">
+          <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 px-1 handle-block">
             <%= icon('grip-vertical', class: 'mr-0') %>
           </button>
         <% end %>

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/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/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>