spree_admin 5.0.3 → 5.1.0.beta

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

@@ -5,7 +5,7 @@
     </h5>
     <% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
       <div class="dropdown ml-auto" id="customer-edit-dropdown">
-        <%= link_to_with_icon 'dots', nil, '#', class: 'btn btn-light btn-sm px-2', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %>
+        <%= link_to_with_icon 'dots-vertical', nil, '#', class: 'btn btn-light btn-sm px-2', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %>
         <div class="dropdown-menu dropdown-menu-right" >
           <div data-toggle="modal" data-target="#modal">
             <% if can?(:update_customer, @order) && !@order.user.present? %>
@@ -17,7 +17,6 @@
             <% end %>
           </div>
           <% if can?(:update_customer, @order) %>
-            <div class="dropdown-divider"></div>
             <% if @order.user.present? %>
               <%= link_to Spree.t('admin.orders.remove_user_from_this_order'), spree.admin_order_user_path(@order), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: :_top } %>
             <% else %>

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

@@ -1,7 +1,17 @@
 <% frame_name ||= nil %>
 
+<% search_form_path = if @user.present?
+                        spree.admin_user_orders_path(@user)
+                      elsif @vendor.present? && spree.respond_to?(:admin_vendor_orders_path)
+                        spree.admin_vendor_orders_path(@vendor)
+                      elsif controller_name == 'checkouts'
+                        spree.admin_checkouts_path
+                      else
+                        spree.admin_orders_path
+                      end %>
+
 <%= search_form_for [:admin, @vendor || @user, @search],
-  url: controller_name == 'checkouts' ? spree.admin_checkouts_path : nil,
+  url: search_form_path,
   class: "filter-wrap",
   data: {
     controller: "filters reveal",
@@ -13,28 +23,24 @@
   <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">
-      <div class="mr-2 h-100">
-        <% if controller_name == 'checkouts' %>
-          <%= render "spree/admin/shared/calendar_range_picker",
-          date_from_input_name: "q[created_at_gt]",
-          date_to_input_name: "q[created_at_lt]",
-          date_from_value: params.dig(:q, :created_at_gt),
-          date_to_value: params.dig(:q, :created_at_lt),
-          dropdown_direction: "right" %>
-        <% else %>
-          <%= render "spree/admin/shared/calendar_range_picker",
-          date_from_input_name: "q[completed_at_gt]",
-          date_to_input_name: "q[completed_at_lt]",
-          date_from_value: params.dig(:q, :completed_at_gt),
-          date_to_value: params.dig(:q, :completed_at_lt),
-          dropdown_direction: "right" %>
-        <% end %>
-      </div>
+    <% if controller_name == 'checkouts' %>
+      <%= render "spree/admin/shared/calendar_range_picker",
+      date_from_input_name: "q[created_at_gt]",
+      date_to_input_name: "q[created_at_lt]",
+      date_from_value: params.dig(:q, :created_at_gt),
+      date_to_value: params.dig(:q, :created_at_lt),
+      dropdown_direction: "right" %>
+    <% else %>
+      <%= render "spree/admin/shared/calendar_range_picker",
+      date_from_input_name: "q[completed_at_gt]",
+      date_to_input_name: "q[completed_at_lt]",
+      date_from_value: params.dig(:q, :completed_at_gt),
+      date_to_value: params.dig(:q, :completed_at_lt),
+      dropdown_direction: "right" %>
+    <% end %>
 
-      <%= render "spree/admin/orders/table_filter_dropdown" %>
-      <%= render 'spree/admin/shared/filters_button' %>
-    </div>
+    <%= render "spree/admin/orders/table_filter_dropdown" %>
+    <%= render 'spree/admin/shared/filters_button' %>
   </div>
   <div data-reveal-target="item" class="d-none" id="table-filter">
     <%= f.hidden_field :payment_state_eq, value: params.dig(:q, :payment_state_eq) %>

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

@@ -1,7 +1,7 @@
 <% if @orders.any? %>
   <div class="table-responsive">
     <table class="table position-relative" id="listing_orders">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th><%= I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
           <% if controller_name == 'orders' %>

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

@@ -10,7 +10,7 @@
     <div class="card-body p-0">
       <div class="table-responsive">
         <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
-          <thead class="text-muted">
+          <thead>
             <tr data-hook="refunds_header" class="border-bottom">
               <th><%= Spree.t(:amount) %></th>
               <th><%= Spree.t(:status) %></th>

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

@@ -65,7 +65,7 @@
           <strong><%= Spree.t(:tracking) %>: </strong>
           <% if shipment.tracked? %>
             <% if shipment.tracking_url.present? %>
-              <span><%= link_to shipment.tracking, shipment.tracking_url, target: '_blank', rel: "noopener noreferrer" %></span>
+              <span><%= link_to ERB::Util.html_escape(shipment.tracking), ERB::Util.html_escape(shipment.tracking_url), target: '_blank', rel: "noopener noreferrer" %></span>
             <% elsif shipment.tracking.present? %>
               <span><%= shipment.tracking %></span>
             <% end %>

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

@@ -74,7 +74,7 @@
       <%= render 'tax_lines', tax_lines: tax_lines, id: 'tax-lines-additional' %>
     </li>
 
-    <%= render_admin_partials(:order_page_body_partials, order: @order) %>
+    <%= render_admin_partials(:order_page_summary_partials, order: @order) %>
 
     <li class="list-group-item d-flex justify-content-between align-items-center border-0">
       <span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>

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

@@ -1,6 +1,6 @@
 <% if controller_name == 'orders' %>
-  <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(:show) %>
       </span>

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

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

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

@@ -1,5 +1,5 @@
 <table class="show return-items-table table table-condensed index">
-  <thead class="text-muted">
+  <thead>
     <tr>
       <th><%= Spree.t(:product) %></th>
       <th><%= Spree.t(:pre_tax_amount) %></th>

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

@@ -3,7 +3,7 @@
 <div data-controller="return-items">
   <div class="table-responsive card-lg mb-4">
     <table class="table table-condensed return-items-table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th>
             <% if allow_return_item_changes %>

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_blocks/forms/_image.html.erb

@@ -1 +1,10 @@
 <%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 512, height: 512, auto_submit: true %>
+
+<% content_for(:design_tab) do %>
+  <%= render 'spree/admin/page_builder/labeled_range_input',
+    f: f, field: :preferred_height, min: 1, max: 1024, unit: 'px', _label: 'Max image height on desktop'
+  %>
+  <%= render 'spree/admin/page_builder/labeled_range_input',
+    f: f, field: :preferred_mobile_height, min: 1, max: 512, unit: 'px', _label: 'Max image height on mobile'
+  %>
+<% end %>

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

@@ -7,19 +7,20 @@
                                      } do %>
     <div class="d-flex align-items-center justify-content-between sidebar-block-title p-1 rounded-sm">
       <div class="d-flex align-items-center flex-fill">
-        <%= icon "#{block.icon_name}", class: 'mr-2' if block.icon_name.present? %>
-        <%= link_to block.display_name, edit_admin_page_section_block_path(block.section, block),
-                    class: 'block-edit-link flex-fill text-dark',
-                    data: {
-                      turbo_frame: :page_sidebar,
-                      action: 'click->page-builder#makeOverlayActive',
-                      page_builder_editor_id_param: "block-#{block.id}"
-                    }
-        %>
+        <%= link_to(edit_admin_page_section_block_path(block.section, block),
+          class: 'block-edit-link flex-fill text-dark',
+          data: {
+            turbo_frame: :page_sidebar,
+            action: 'click->page-builder#makeOverlayActive',
+            page_builder_editor_id_param: "block-#{block.id}"
+          }) do %>
+          <%= icon "#{block.icon_name}", class: 'mr-2' if block.icon_name.present? %>
+          <%= block.display_name %>
+        <% end %>
       </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 %>