spree_admin 5.0.0 → 5.0.2

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

@@ -3,7 +3,7 @@
 <%= content_for(:title, Spree.t('admin.oauth_applications.list')) %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn-primary", icon: 'plus' %>
+  <%= link_to_with_icon 'plus', Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::OauthApplication %>
 
 <%= content_for :page_alerts do %>
@@ -15,61 +15,60 @@
   </div>
 <% end %>
 
-<% if @oauth_applications.any? %>
-  <div class="table-responsive rounded border mt-4 bg-white">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th>Client ID</th>
-          <th><%= Spree.t('admin.oauth_applications.scopes') %></th>
-          <th><%= Spree.t('admin.oauth_applications.last_used') %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% @oauth_applications.each do |application| %>
-          <tr id="<%= spree_dom_id application %>">
-            <td class="w-20"><code><%= application.name %></code></td>
-            <td class="w-40">
-              <div class="input-group" data-controller="password-toggle">
-                <%= button_tag class: 'btn hover-gray px-1', data: { action: 'click->password-toggle#password' } do %>
-                  <%= icon 'eye', class: 'mr-0' %>
-                <% end %>
-                <%= password_field_tag :password, application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
-              </div>
-            </td>
-            <td class="w-15">
-              <% if application.scopes.include?('write') %>
-                <span class="badge badge-warning">
-                  <%= icon('pencil', class: 'mr-1') %>
-                  <%= Spree.t('admin.oauth_applications.read_and_write') %>
-                </span>
-              <% else %>
-                <span class="badge badge-light">
-                  <%= icon('eye', class: 'mr-1') %>
-                  <%= Spree.t('admin.oauth_applications.read_only') %>
-                </span>
-              <% end %>
-            </td>
-            <td class="w-15">
-              <% if application.last_used_at %>
-                <%= local_time(application.last_used_at) %>
-              <% else %>
-                <span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
-              <% end %>
-            </td>
-            <td class="actions w-10">
-              <%= link_to_edit(application, no_text: true) if can? :edit, application %>
-            </td>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th>Client ID</th>
+            <th><%= Spree.t('admin.oauth_applications.scopes') %></th>
+            <th><%= Spree.t('admin.oauth_applications.last_used') %></th>
+            <th></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-    <%= Spree.t(:no_resource_found, resource: 'API keys') %>
-    <%= link_to_with_icon('plus', Spree.t(:add_one), new_object_url, class: 'btn btn-link ml-3') if can? :create, Spree::OauthApplication %>
-  </div>
-<% end %>
+        </thead>
+        <tbody>
+          <% @collection.each do |application| %>
+            <tr id="<%= spree_dom_id application %>">
+              <td class="w-20"><code><%= application.name %></code></td>
+              <td class="w-40">
+                <div class="input-group" data-controller="password-toggle">
+                  <%= button_tag class: 'btn hover-gray px-1', data: { action: 'click->password-toggle#password' } do %>
+                    <%= icon 'eye', class: 'mr-0' %>
+                  <% end %>
+                  <%= password_field_tag :password, application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
+                </div>
+              </td>
+              <td class="w-15">
+                <% if application.scopes.include?('write') %>
+                  <span class="badge badge-warning">
+                    <%= icon('pencil', class: 'mr-1') %>
+                    <%= Spree.t('admin.oauth_applications.read_and_write') %>
+                  </span>
+                <% else %>
+                  <span class="badge badge-light">
+                    <%= icon('eye', class: 'mr-1') %>
+                    <%= Spree.t('admin.oauth_applications.read_only') %>
+                  </span>
+                <% end %>
+              </td>
+              <td class="w-15">
+                <% if application.last_used_at %>
+                  <%= local_time(application.last_used_at) %>
+                <% else %>
+                  <span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
+                <% end %>
+              </td>
+              <td class="actions w-10">
+                <%= link_to_edit(application, no_text: true) if can? :edit, application %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found', resource_name: 'API keys' %>
+  <% end %>
+</div>

data/app/views/spree/admin/option_types/_filter.html.erb

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= 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) %>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -3,11 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <span id="new_ot_link">
-    <%= button_link_to Spree.t(:new_option_type),
-    new_object_url,
-    { class: "btn-primary", icon: "plus", id: "new_option_type_link" } %>
-  </span>
+  <%= link_to_with_icon 'plus', Spree.t(:new_option_type), new_object_url, class: 'btn btn-primary' %>
 <% end if can?(:create, Spree::OptionType) %>
 
 <%= content_for(:page_alerts) do %>
@@ -17,12 +13,8 @@
   </div>
 <% end %>
 
-<div id="new_option_type"></div>
-
-<div class="card-lg p-0">
-
+<div class="card-lg">
   <%= render partial: "spree/admin/option_types/filter" %>
-
   <% if @option_types.any? %>
     <div class="table-responsive">
       <table class="table" id="listing_option_types">
@@ -44,7 +36,7 @@
             <th>
               <%= Spree.t(:products) %>
             </th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody
@@ -61,3 +53,7 @@
     <%= render "spree/admin/shared/no_resource_found" %>
   <% end %>
 </div>
+
+<p class="documentation-link-container">
+  <%= external_link_to "Learn more about options", "https://spreecommerce.org/docs/user/manage-products/product-options" %>
+</p>

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

@@ -2,7 +2,7 @@
 
 <%= search_form_for [:admin, @vendor || @user, @search],
   url: controller_name == 'checkouts' ? spree.admin_checkouts_path : nil,
-  class: "filter-wrap border-bottom",
+  class: "filter-wrap",
   data: {
     controller: "filters reveal",
     reveal_hidden_class: "d-none",
@@ -92,12 +92,7 @@
       <%= render_admin_partials(:orders_filters_partials, f: f) %>
     </div>
 
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
-    </div>
+    <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -23,8 +23,6 @@
     </table>
   </div>
 <% else %>
-  <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>
-  </div>
+  <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil, model_class: Spree::Order %>
 <% end %>
-<%= render 'spree/admin/shared/index_table_options', collection: @orders, simple: true if @orders.any? %>
+<%= render 'spree/admin/shared/index_table_options', collection: @orders if @orders.any? %>

data/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb

@@ -1,10 +1,7 @@
 <%= turbo_stream.update :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_billing_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:new_billing_address)) %>
       <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
         <div>
           <% if @order.shipping_address.present? %>
@@ -26,8 +23,8 @@
         </div>
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.save') %>
       </div>
     </div>

data/app/views/spree/admin/orders/billing_address/edit.html.erb

@@ -1,10 +1,7 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
-      </div>
+      <%= modal_header(Spree.t(:billing_address)) %>
       <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
         <div>
           <% if @order.shipping_address.present? %>
@@ -33,8 +30,8 @@
         </div>
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

data/app/views/spree/admin/orders/billing_address/new.html.erb

@@ -1,10 +1,7 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:billing_address)) %>
       <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
         <div>
           <% if @order.shipping_address.present? %>
@@ -26,8 +23,8 @@
         </div>
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.save') %>
       </div>
     </div>

data/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb

@@ -1,10 +1,7 @@
 <%= turbo_stream.update :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_billing_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
-      </div>
+      <%= modal_header(Spree.t(:update_billing_address)) %>
       <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
         <div>
           <% if @order.shipping_address.present? %>
@@ -26,8 +23,8 @@
         </div>
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

data/app/views/spree/admin/orders/contact_information/edit.html.erb

@@ -1,18 +1,15 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @order, url: spree.admin_order_contact_information_path(@order), method: :put, data: { turbo_frame: :_top } do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_contact_information) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-      </div>
+      <%= modal_header(Spree.t(:update_contact_information)) %>
       <div class="modal-body">
         <div class="form-group">
           <%= f.label :email, Spree.t(:email) %>
           <%= f.email_field :email, class: 'form-control', required: true %>
         </div>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

data/app/views/spree/admin/orders/customer_returns/edit.html.erb

@@ -110,16 +110,7 @@
         reimbursements: @customer_return.reimbursements,
       } %>
     <% else %>
-      <div
-        class="
-          text-muted p-5 d-flex align-items-center w-100 justify-content-center
-        "
-      >
-        <%= Spree.t(
-          :no_resource_found,
-          resource: plural_resource_name(Spree::Reimbursement),
-        ) %>
-      </div>
+      <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
     <% end %>
   </div>
 </div>

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

@@ -10,7 +10,7 @@
   <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.admin_orders_path, class: "btn btn-primary", data: { turbo_method: :post } if can?(:create, Spree::Order)  %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <% if params[:frame_name].present? %>
     <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
       <%= render 'spree/admin/orders/filters', frame_name: params[:frame_name] %>

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

@@ -1,7 +1,7 @@
 <% allow_return_item_changes = !@return_authorization.customer_returned_items? %>
 
 <div data-controller="return-items">
-  <div class="table-responsive card-lg p-0 mb-4">
+  <div class="table-responsive card-lg mb-4">
     <table class="table table-condensed return-items-table">
       <thead class="text-muted">
         <tr>

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

@@ -24,51 +24,53 @@ locals: {
   </div>
 <% end %>
 
-<div class="table-responsive card-lg p-0 mb-4">
-  <table class="table table-condensed return-items-table">
-    <thead class="text-muted">
-      <tr>
-        <th><%= Spree.t(:product) %></th>
-        <th><%= Spree.t(:status) %></th>
-        <th><%= Spree.t(:purchased_quantity) %></th>
-        <th><%= Spree.t(:return_quantity) %></th>
-        <th><%= Spree.t(:total) %></th>
-        <th><%= Spree.t(:refund_amount) %></th>
-        <th><%= Spree.t(:reimbursement_type) %></th>
-        <th><%= Spree.t(:exchange_for) %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @return_authorization.return_items.each do |return_item| %>
+<div class="card-lg mb-4">
+  <div class="table-responsive">
+    <table class="table table-condensed return-items-table">
+      <thead class="text-muted">
         <tr>
-          <td>
-            <div class="variant-name">
-              <%= link_to return_item.inventory_unit.variant.name,
-              spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
-            </div>
-            <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
-          </td>
-          <td><%= return_item.inventory_unit.state.humanize %></td>
-          <td class="purchased-quantity">
-            <%= return_item.line_item.quantity %>
-          </td>
-          <td><%= return_item.return_quantity %></td>
-          <td><%= return_item.pre_tax_amount %></td>
-          <td><%= return_item.display_total %></td>
-          <td><%= if return_item.preferred_reimbursement_type.present?
-              return_item.preferred_reimbursement_type.name.humanize
-            else
-              "-"
-            end %></td>
-          <td><%= if return_item.exchange_processed?
-              return_item.exchange_variant.exchange_name
-            else
-              "-"
-            end %></td>
+          <th><%= Spree.t(:product) %></th>
+          <th><%= Spree.t(:status) %></th>
+          <th><%= Spree.t(:purchased_quantity) %></th>
+          <th><%= Spree.t(:return_quantity) %></th>
+          <th><%= Spree.t(:total) %></th>
+          <th><%= Spree.t(:refund_amount) %></th>
+          <th><%= Spree.t(:reimbursement_type) %></th>
+          <th><%= Spree.t(:exchange_for) %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @return_authorization.return_items.each do |return_item| %>
+          <tr>
+            <td>
+              <div class="variant-name">
+                <%= link_to return_item.inventory_unit.variant.name,
+                spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+              </div>
+              <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+            </td>
+            <td><%= return_item.inventory_unit.state.humanize %></td>
+            <td class="purchased-quantity">
+              <%= return_item.line_item.quantity %>
+            </td>
+            <td><%= return_item.return_quantity %></td>
+            <td><%= return_item.pre_tax_amount %></td>
+            <td><%= return_item.display_total %></td>
+            <td><%= if return_item.preferred_reimbursement_type.present?
+                return_item.preferred_reimbursement_type.name.humanize
+              else
+                "-"
+              end %></td>
+            <td><%= if return_item.exchange_processed?
+                return_item.exchange_variant.exchange_name
+              else
+                "-"
+              end %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>
 
 <% if @return_authorization.reason.present? %>

data/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb

@@ -1,15 +1,12 @@
 <%= turbo_stream.update :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_shipping_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:new_shipping_address)) %>
       <div class="modal-body d-flex flex-col gap-3">
         <%= render 'form', address: @address, f: f%>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.save') %>
       </div>
     </div>

data/app/views/spree/admin/orders/shipping_address/edit.html.erb

@@ -1,15 +1,12 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_shipping_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:update_shipping_address)) %>
       <div class="modal-body d-flex flex-col gap-3">
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

data/app/views/spree/admin/orders/shipping_address/new.html.erb

@@ -1,15 +1,12 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_shipping_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:new_shipping_address)) %>
       <div class="modal-body d-flex flex-col gap-3">
         <%= render 'form', address: @address, f: f%>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.save') %>
       </div>
     </div>

data/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb

@@ -1,15 +1,12 @@
 <%= turbo_stream.update :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_shipping_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:update_shipping_address)) %>
       <div class="modal-body d-flex flex-col gap-3">
         <%= render 'form', address: @address, f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t('actions.update') %>
       </div>
     </div>

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

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], url: spree.admin_pages_path , class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], url: spree.admin_pages_path , 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) %>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -0,0 +1,26 @@
+<tr id="<%= dom_id page %>" data-controller="row-link" class="cursor-pointer">
+  <td scope="row" data-action="click->row-link#openLink" class="w-60">
+    <%= link_to page.name, spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), data: { row_link_target: :link } %>
+  </td>
+  <td data-action="click->row-link#openLink" class="w-15">
+    <%= local_time_ago(page.created_at, class: 'with-tip') %>
+  </td>
+  <td data-action="click->row-link#openLink" class="w-15">
+    <%= local_time_ago(page.updated_at, class: 'with-tip') %>
+  </td>
+  <td class="w-10 text-right">
+    <div class="dropdown">
+      <button class="btn btn-sm btn-light" type="button" data-toggle="dropdown" aria-expanded="false">
+        <%= icon('dots-vertical', class: 'mr-0') %>
+      </button>
+      <ul class="dropdown-menu">
+        <li>
+          <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), class: 'dropdown-item' %>
+        </li>
+        <li>
+          <%= link_to_delete(page, class: 'dropdown-item btn-danger', icon: 'trash') %>
+        </li>
+      </ul>
+    </div>
+  </td>
+</tr>

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

@@ -1,15 +1,12 @@
 <%= 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">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:page_settings) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
-      </div>
+      <%= modal_header(Spree.t(:page_settings)) %>
       <div class="modal-body">
         <%= render 'spree/admin/shared/error_messages', target: @page %>
         <%= render 'form', f: f, vertical: true %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
+      <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' %>
       </div>