Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Replace bootstrap dropdowns with Stimulus dropdown controller (#13235)
Damian Legawiec04cc98ebb8bd
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scssindex 12bcc4c89b..ecc00ec49c 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss@@ -20,10 +20,18 @@}}-.dropdown-menu {+.dropdown-menu, .dropdown-container {margin-top: 0.25rem !important;overflow: hidden !important;box-shadow: $dropdown-box-shadow;+ border-radius: $dropdown-border-radius;+ box-shadow: $dropdown-box-shadow;+ background-color: $dropdown-bg;+ z-index: $zindex-dropdown;+ min-width: $dropdown-min-width;+ padding: $dropdown-padding-y $dropdown-padding-x;+ font-size: $dropdown-font-size;+ color: $dropdown-color;.dropdown-item, .dropdown-header {padding-top: $dropdown-item-padding-y;@@ -98,6 +106,24 @@margin-bottom: 0px;}}+// new non-bootstrap dropdowns+.dropdown-container {+ position: absolute;+ top: 100%;+ right: 0;+ animation: fadeIn 0.15s ease-in-out;+ transform-origin: top right;++ &.dropdown-container-left {+ left: 0;+ right: auto;+ }+ &.dropdown-container-top {+ top: auto;+ bottom: 100%;+ height: auto;+ }+}.dropdown-toggle {&:after {diff --git a/admin/app/helpers/spree/admin/dropdown_helper.rb b/admin/app/helpers/spree/admin/dropdown_helper.rbnew file mode 100644index 0000000000..6f6d475f34--- /dev/null+++ b/admin/app/helpers/spree/admin/dropdown_helper.rb@@ -0,0 +1,32 @@+module Spree+ module Admin+ module DropdownHelper+ def dropdown(options = {}, &block)+ options[:class] = ['dropdown'] + Array(options[:class])+ options[:data] = { controller: 'dropdown' }.merge(options[:data] || {})+ content_tag(:div, options, &block)+ end++ def dropdown_toggle(options = {}, &block)+ options[:type] = 'button'+ options[:class] = ['btn'] + Array(options[:class])+ options[:data] = { action: 'dropdown#toggle click@window->dropdown#hide' }.merge(options[:data] || {})+ button_tag(options, &block)+ end++ def dropdown_menu(options = {}, &block)+ options[:class] = ['dropdown-container hidden'] + Array(options[:class])++ if options[:direction] == 'left'+ options[:class] << 'dropdown-container-left'+ elsif options[:direction] == 'top'+ options[:class] << 'dropdown-container-top'+ elsif options[:direction] == 'top-left'+ options[:class] << 'dropdown-container-top dropdown-container-left'+ end+ options[:data] = { dropdown_target: 'menu' }.merge(options[:data] || {})+ content_tag(:div, options, &block)+ end+ end+ end+enddiff --git a/admin/app/helpers/spree/admin/navigation_helper.rb b/admin/app/helpers/spree/admin/navigation_helper.rbindex 33b2219f36..9765b8598d 100644--- a/admin/app/helpers/spree/admin/navigation_helper.rb+++ b/admin/app/helpers/spree/admin/navigation_helper.rb@@ -39,17 +39,18 @@ module Spreeper_page_default * 8]- selected_option = (params[:per_page].try(:to_i) || per_page_default).to_s-- selected_option += icon('chevron-down', class: 'ml-1 mr-0 arrow')-- content_tag :div, id: 'per-page-dropdown' do- button_tag(raw(selected_option), class: 'btn btn-light btn-sm', data: { toggle: 'dropdown', expanded: false }) +- content_tag(:div, class: 'dropdown-menu') do- per_page_options.map do |option|- link_to option, per_page_dropdown_params(option), class: "dropdown-item #{'active' if option.to_i == selected_option.to_i}"- end.join.html_safe- end+ selected_option = (params[:per_page].try(:to_i) || per_page_default).to_i+ selected_option_label = selected_option.to_s + icon('chevron-down', class: 'ml-1 mr-0 arrow')++ dropdown(id: 'per-page-dropdown') do+ dropdown_toggle(class: 'btn-light btn-sm') do+ raw(selected_option_label)+ end ++ dropdown_menu(direction: 'top-left') do+ per_page_options.map do |option|+ link_to option, per_page_dropdown_params(option), class: "dropdown-item #{'active' if option.to_i == selected_option}"+ end.join.html_safe+ endendenddiff --git a/admin/app/views/spree/admin/coupon_codes/_filters.html.erb b/admin/app/views/spree/admin/coupon_codes/_filters.html.erbindex aa52136e67..22470b7416 100644--- a/admin/app/views/spree/admin/coupon_codes/_filters.html.erb+++ b/admin/app/views/spree/admin/coupon_codes/_filters.html.erb@@ -3,16 +3,16 @@<%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont %><div class="d-flex align-items-center justify-content-between">- <div class="dropdown">- <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %><span class="text-muted font-weight-normal mr-1"><%= Spree.t(:show) %></span><%= Spree.t(:all) if (params[:q] || {}).values_at(:state_eq).all?(&:blank?) %><%= Spree.t('admin.coupon_codes.used') if params.dig(:q, :state_eq) == 'used' %><%= Spree.t('admin.coupon_codes.unused') if params.dig(:q, :state_eq) == 'unused' %>- </button>- <div class="dropdown-menu w-100 font-size-sm" style="min-width: 200px">+ <% end %>+ <%= dropdown_menu do %><%= active_link_to Spree.t(:all),spree.admin_promotion_coupon_codes_path(@promotion),class: 'dropdown-item',@@ -23,8 +23,8 @@<%= link_to Spree.t('admin.coupon_codes.unused'),spree.admin_promotion_coupon_codes_path(@promotion, q: {state_eq: :unused}),class: "dropdown-item #{'active' if params.dig(:q, :state_eq) == 'unused'}" %>- </div>- </div>+ <% end %>+ <% end %></div><div data-controller="tooltip">diff --git a/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erbindex 4b1487ea0f..5a76b6d580 100644--- a/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb@@ -1,9 +1,9 @@-<div class="dropdown">- <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">+<%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %><span class="text-muted font-weight-normal">Show:</span><%= gift_cards_filter_dropdown_value %>- </button>- <div class="dropdown-menu w-100" style="min-width: 200px">+ <% end %>+ <%= dropdown_menu do %><%= active_link_to Spree.t('admin.gift_cards.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: nil, redeemed: nil, partially_redeemed: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[active expired redeemed partially_redeemed] ).all?(&:blank?) %>@@ -21,5 +21,5 @@<%= Spree.t('admin.gift_cards.redeemed') %><% end %>- </div>-</div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/gift_cards/index.html.erb b/admin/app/views/spree/admin/gift_cards/index.html.erbindex d665617e52..1ccc4197df 100644--- a/admin/app/views/spree/admin/gift_cards/index.html.erb+++ b/admin/app/views/spree/admin/gift_cards/index.html.erb@@ -7,9 +7,12 @@<%= render_admin_partials(:gift_cards_actions_partials) %><%= link_to_export_modal %>- <div class="dropdown" id="page_actions_dropdown">- <%= link_to_with_icon 'plus', Spree.t(:new_gift_card), '#', class: 'text-nowrap btn btn-primary align-self-center', data: { toggle: 'dropdown' }, id: 'more-actions-link' %>- <div class="dropdown-menu dropdown-menu-right">+ <%= dropdown id: 'page_actions_dropdown' do %>+ <%= dropdown_toggle class: 'text-nowrap btn-primary align-self-center', id: 'more-actions-link' do %>+ <%= icon 'plus' %>+ <%= Spree.t(:new_gift_card) %>+ <% end %>+ <%= dropdown_menu class: 'dropdown-menu-right' do %><%= link_to spree.new_admin_gift_card_path,class: 'text-left dropdown-item' do %><%= icon 'add' %>@@ -21,8 +24,8 @@<%= icon 'add' %><%= Spree.t(:gift_card_batch) %><% end %>- </div>- </div>+ <% end %>+ <% end %><% end %><% end %>diff --git a/admin/app/views/spree/admin/invitations/_invitation.html.erb b/admin/app/views/spree/admin/invitations/_invitation.html.erbindex fc4f96b276..8ee1f64f32 100644--- a/admin/app/views/spree/admin/invitations/_invitation.html.erb+++ b/admin/app/views/spree/admin/invitations/_invitation.html.erb@@ -29,24 +29,24 @@</td><td class="w-10 actions"><% if invitation.pending? && !invitation.expired? %>- <div class="dropdown" data-controller="clipboard">- <%= hidden_field_tag nil, spree.admin_invitation_url(invitation, token: invitation.token), data: { clipboard_target: "source" } %>-- <button class="btn btn-sm btn-light" type="button" id="dropdownMenuButton-<%= invitation.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm' do %><%= icon('dots-vertical', class: 'mr-0') %>- </button>- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= invitation.id %>">+ <% end %>+ <%= dropdown_menu data: { controller: 'clipboard', 'clipboard-success-content-value': icon('check') + ' ' +Spree.t(:copied) } do %>+ <%= hidden_field_tag nil, spree.admin_invitation_url(invitation, token: invitation.token), data: { clipboard_target: "source" } %>+<%= link_to_with_icon 'copy', Spree.t(:copy_link), '#',class: "dropdown-item",- data: { action: "clipboard#copy" } %>+ data: { action: "clipboard#copy", clipboard_target: "button" } %><%= link_to_with_icon 'send', Spree.t('actions.resend'), spree.resend_admin_invitation_path(invitation),class: "dropdown-item",data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>- <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_invitation_path(invitation),- class: "dropdown-item btn-danger",+ <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_invitation_path(invitation),+ class: "dropdown-item btn-danger",data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } if can?(:destroy, invitation) %>- </div>- </div>+ <% end %>+ <% end %><% end %></td></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/invitations/index.html.erb b/admin/app/views/spree/admin/invitations/index.html.erbindex 529f4a0433..fc6e8fe57e 100644--- a/admin/app/views/spree/admin/invitations/index.html.erb+++ b/admin/app/views/spree/admin/invitations/index.html.erb@@ -7,21 +7,19 @@<%= render_admin_partials(:invitations_header_partials) %><div class="card-lg">- <div class="table-responsive">- <table class="table">- <thead>- <tr>- <th scope="col" class="rounded-lg-top-left"><%= Spree.t(:email) %></th>- <th scope="col"><%= I18n.t('activerecord.attributes.spree/invitation.inviter') %></th>- <th scope="col"><%= Spree.t(:role_id) %></th>- <th scope="col"><%= Spree.t(:status) %></th>- <th scope="col" class="rounded-lg-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>- <th scope="col"></th>- </tr>- </thead>- <tbody id="invitations">- <%= render collection: @collection, partial: 'spree/admin/invitations/invitation', as: :invitation %>- </tbody>- </table>- </div>+ <table class="table">+ <thead>+ <tr>+ <th scope="col" class="rounded-lg-top-left"><%= Spree.t(:email) %></th>+ <th scope="col"><%= I18n.t('activerecord.attributes.spree/invitation.inviter') %></th>+ <th scope="col"><%= Spree.t(:role_id) %></th>+ <th scope="col"><%= Spree.t(:status) %></th>+ <th scope="col" class="rounded-lg-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>+ <th scope="col"></th>+ </tr>+ </thead>+ <tbody id="invitations">+ <%= render collection: @collection, partial: 'spree/admin/invitations/invitation', as: :invitation %>+ </tbody>+ </table></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb b/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erbindex e5ecce0159..2156bcc592 100644--- a/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb+++ b/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb@@ -2,8 +2,8 @@<div class="d-flex flex-column flex-lg-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :email_cont, label: Spree.t(:email) %>- <div class="dropdown">- <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %><span class="text-muted font-weight-normal mr-1"><%= Spree.t(:show) %></span>@@ -18,8 +18,8 @@end%><%= current_value %>- </button>- <div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">+ <% end %>+ <%= dropdown_menu do %><%= active_link_to Spree.t('admin.newsletter_subscribers.all'),params.to_unsafe_h.deep_merge(q: { verified: nil, unverified: nil }),class: 'dropdown-item',@@ -32,8 +32,8 @@params.to_unsafe_h.deep_merge(q: { verified: nil, unverified: true }),class: 'dropdown-item',active: params.dig(:q, :unverified).to_s == 'true' %>- </div>- </div>+ <% end %>+ <% end %></div><%= render "spree/admin/shared/filter_badge_template" %>diff --git a/admin/app/views/spree/admin/newsletter_subscribers/_table_row.html.erb b/admin/app/views/spree/admin/newsletter_subscribers/_table_row.html.erbindex 1ee96b4ce8..16ae85ab3f 100644--- a/admin/app/views/spree/admin/newsletter_subscribers/_table_row.html.erb+++ b/admin/app/views/spree/admin/newsletter_subscribers/_table_row.html.erb@@ -24,13 +24,13 @@<%= spree_date(newsletter_subscriber.created_at) %></td><td class="w-5">- <div class="dropdown" data-toggle="dropdown">- <button class="btn btn-sm btn-light" type="button" id="newsletter-subscriber-actions-<%= newsletter_subscriber.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm' do %><%= icon('dots-vertical', class: 'mr-0') %>- </button>- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="newsletter-subscriber-actions-<%= newsletter_subscriber.id %>">+ <% end %>+ <%= dropdown_menu do %><%= link_to_delete(newsletter_subscriber, icon: 'trash', class: 'dropdown-item text-danger') %>- </div>- </div>+ <% end %>+ <% end %></td></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erbindex 4fae2f2d3f..dda97ace31 100644--- a/admin/app/views/spree/admin/orders/_customer.html.erb+++ b/admin/app/views/spree/admin/orders/_customer.html.erb@@ -4,9 +4,11 @@<%= Spree.t(:customer) %></h5><% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>- <div class="dropdown ml-auto" id="customer-edit-dropdown">- <%= link_to_with_icon 'dots-vertical', nil, '#', class: 'btn btn-light btn-sm px-1', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %>- <div class="dropdown-menu dropdown-menu-right" >+ <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto' do %>+ <%= dropdown_toggle class: 'btn-sm px-1', data: { test_id: 'dropdown-toggle' } do %>+ <%= icon 'dots-vertical' %>+ <% end %>+ <%= dropdown_menu class: 'dropdown-menu-right' do %><% if can?(:update_customer, @order) && [email protected]? %><%= link_to Spree.t('admin.edit_contact_information'), spree.edit_admin_order_contact_information_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog', action: 'dialog#open' } %><% end %>@@ -21,8 +23,8 @@<%= link_to Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: 'dropdown-item' %><% end %><% end %>- </div>- </div>+ <% end %>+ <% end %><% end %></div><div class="card-body">diff --git a/admin/app/views/spree/admin/orders/_line_item.html.erb b/admin/app/views/spree/admin/orders/_line_item.html.erbindex 2f4c5baf53..5c01c90f92 100644--- a/admin/app/views/spree/admin/orders/_line_item.html.erb+++ b/admin/app/views/spree/admin/orders/_line_item.html.erb@@ -23,16 +23,11 @@</div><div class="w-5"><% if can?(:edit, line_item) %>- <div class="dropdown">- <button- class="btn btn-sm btn-light"- type="button"- data-toggle="dropdown"- aria-expanded="false"- >+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm' do %><%= icon "dots-vertical", class: "mr-0" %>- </button>- <div class="dropdown-menu dropdown-menu-right w-100">+ <% end %>+ <%= dropdown_menu do %><%= link_to_with_icon "edit",Spree.t(:edit),spree.edit_admin_order_line_item_path(@order, line_item),@@ -53,8 +48,8 @@<div class="dropdown-divider"></div><%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(@order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item btn-danger' %><% end %>- </div>- </div>+ <% end %>+ <% end %><% end %></div></div>diff --git a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erbindex 70e0dd2248..750277e62e 100644--- a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb@@ -1,12 +1,12 @@<% if controller_name == 'orders' %>- <div class="dropdown">- <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %><span class="text-muted font-weight-normal mr-1"><%= Spree.t(:show) %></span><%= order_filter_dropdown_value %>- </button>- <div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">+ <% end %>+ <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %><%= active_link_to Spree.t('admin.orders.all_orders'), params.to_unsafe_h.deep_merge({q: {shipment_state_eq: '', shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: '' }}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[payment_state_not_eq shipment_state_not_in shipment_state_eq state_eq state_in refunded partially_refunded] ).all?(&:blank?) %><%= link_to params.to_unsafe_h.deep_merge({q: {shipment_state_not_in: [:shipped, :canceled], shipment_state_eq: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),class: "dropdown-item d-flex align-items-center justify-content-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %>@@ -29,6 +29,6 @@<%= link_to Spree.t('admin.orders.partially_refunded'),params.to_unsafe_h.deep_merge({q: {partially_refunded: '1', shipment_state_not_in: '', shipment_state_eq: '', state_eq: '', state_in: '', refunded: '' }}),class: "dropdown-item #{'active' if params.dig(:q, :partially_refunded) && params[:q][:partially_refunded].present?}" %>- </div>- </div>+ <% end %>+ <% end %><% end %>diff --git a/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb b/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erbindex e513bb2599..98dcbccceb 100644--- a/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb@@ -28,16 +28,11 @@<td data-action="click->row-link#openLink"><%= spree_time(customer_return.created_at) %></td><td class="text-right"><% if can_create_reimbursement %>- <span class="dropdown">- <button- class="btn btn-light btn-sm"- type="button"- data-toggle="dropdown"- aria-expanded="false"- >+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm' do %><%= icon('dots-vertical', class: "mr-0") %>- </button>- <div class="dropdown-menu">+ <% end %>+ <%= dropdown_menu do %><%= link_to_edit(customer_return,data: {@@ -53,8 +48,8 @@<%= Spree.t(:create_reimbursement) %><% end %><% end %>- </div>- </span>+ <% end %>+ <% end %><% else %><%= link_to_edit(customer_return,diff --git a/admin/app/views/spree/admin/page_builder/_add_block.html.erb b/admin/app/views/spree/admin/page_builder/_add_block.html.erbindex f935993a31..2073a3744f 100644--- a/admin/app/views/spree/admin/page_builder/_add_block.html.erb+++ b/admin/app/views/spree/admin/page_builder/_add_block.html.erb@@ -1,11 +1,12 @@<%= 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-secondary d-flex-inline" data-toggle="dropdown">- <%= icon("circle-plus") %>- Add block- </button>- <div class="dropdown-menu p-1">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-sm btn-secondary d-flex-inline' do %>+ <%= icon("circle-plus") %>+ Add block+ <% end %>+ <%= dropdown_menu class: 'p-1' do %><% section.available_blocks_to_add.each do |block_class| %><a href="#" class="dropdown-item btn-sm"data-action="click->block-form#addBlock"@@ -16,5 +17,6 @@<%= block_instance.display_name.presence || block_class.to_s.demodulize.titleize %></a><% end %>- </div>+ <% end %>+ <% end %><% end %>diff --git a/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb b/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erbindex 70c6f9d54e..555f2c4cdb 100644--- a/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb+++ b/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb@@ -1,17 +1,17 @@-<div class="dropdown" id="pages_dropdown">- <button class="btn btn-light" type="button" data-toggle="dropdown" aria-expanded="false">+<%= dropdown id: 'pages_dropdown' do %>+ <%= dropdown_toggle do %><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">+ <% end %>+ <%= dropdown_menu style: 'min-width: 300px' do %><% @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, data: { turbo_prefetch: false } do %><%= icon page.icon_name, class: 'mr-2' %><%= page.display_name %><% end %><% end %>- </div>-</div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/pages/_table_row.html.erb b/admin/app/views/spree/admin/pages/_table_row.html.erbindex da275dbd33..749cbed962 100644--- a/admin/app/views/spree/admin/pages/_table_row.html.erb+++ b/admin/app/views/spree/admin/pages/_table_row.html.erb@@ -9,18 +9,20 @@<%= spree_time_ago(page.updated_at) %></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">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm' do %><%= 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', data: { turbo_frame: '_top', turbo_prefetch: false } %>- </li>- <li>- <%= link_to_delete(page, class: 'dropdown-item btn-danger', icon: 'trash') %>- </li>- </ul>- </div>+ <% end %>+ <%= dropdown_menu do %>+ <ul class="list-unstyled mb-0">+ <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', data: { turbo_frame: '_top', turbo_prefetch: false } %>+ </li>+ <li>+ <%= link_to_delete(page, class: 'dropdown-item btn-danger', icon: 'trash') %>+ </li>+ </ul>+ <% end %>+ <% end %></td></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/payments/_payment.html.erb b/admin/app/views/spree/admin/payments/_payment.html.erbindex aed10b9fd9..b38a3f89e8 100644--- a/admin/app/views/spree/admin/payments/_payment.html.erb+++ b/admin/app/views/spree/admin/payments/_payment.html.erb@@ -16,11 +16,11 @@<strong><%= payment.number.upcase %></strong><%= spree_time(payment.created_at, class: 'ml-auto text-muted font-size-sm') %>- <div class="dropdown">- <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-sm px-1' do %><%= icon('dots-vertical', class: 'mr-0') %>- </button>- <div class="dropdown-menu">+ <% end %>+ <%= dropdown_menu do %><% if payment.try(:gateway_dashboard_payment_url).present? %><%= link_to_with_icon 'eye', Spree.t(:details), payment.gateway_dashboard_payment_url, class: 'dropdown-item', target: '_blank' %><% end %>@@ -42,8 +42,8 @@<div class="dropdown-divider"></div><%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_order_payment_path(@order, payment), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %><% end %>- </div>- </div>+ <% end %>+ <% end %></div><div class="card-body"><div class="d-flex">diff --git a/admin/app/views/spree/admin/products/_bulk_operations.html.erb b/admin/app/views/spree/admin/products/_bulk_operations.html.erbindex f31e91565e..f1360e75f6 100644--- a/admin/app/views/spree/admin/products/_bulk_operations.html.erb+++ b/admin/app/views/spree/admin/products/_bulk_operations.html.erb@@ -18,21 +18,11 @@url: spree.bulk_status_update_admin_products_path(status: :draft)) %>- <div class="dropdown dropup" role="group">- <button- type="button"- data-display="static"- class="btn"- data-placement="bottom"- data-toggle="dropdown"- aria-expanded="false"- >+ <%= dropdown do %>+ <%= dropdown_toggle do %><%= icon('dots-vertical', class: "mr-0") %>- </button>- <div- class="dropdown-menu dropdown-menu-left"- aria-labelledby="btnGroupDrop1"- >+ <% end %>+ <%= dropdown_menu direction: 'top', class: 'mb-2' do %><%= bulk_action_link(Spree.t("admin.bulk_ops.products.title.set_status", status: :archived),spree.bulk_modal_admin_products_path(kind: :set_status, status: :archived),@@ -80,8 +70,8 @@class: "dropdown-item") %><% end %>- </div>- </div>+ <% end %>+ <% end %><%= bulk_operations_close_button %></div>diff --git a/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erbindex dd45969db2..fab1f080fc 100644--- a/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb@@ -1,5 +1,5 @@-<div class="dropdown">- <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">+<%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %><span class="text-muted font-weight-normal mr-1"><%= Spree.t(:show) %></span>@@ -12,8 +12,8 @@<% end %><%= product_filter_stock_dropdown_value if product_filter_stock_dropdown_value != Spree.t('admin.products.any_stock') %><% end %>- </button>- <div class="dropdown-menu w-100" style="min-width: 200px">+ <% end %>+ <%= dropdown_menu class: 'w-100', style: 'min-width: 200px' do %><h6 class="dropdown-header"><%= Spree.t('admin.products.by_status') %>:</h6><%= active_link_to Spree.t('admin.products.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock_items out_of_stock_items] ).all?(&:blank?) %>@@ -38,5 +38,5 @@<%= link_to Spree.t('admin.products.out_of_stock'),params.to_unsafe_h.deep_merge({page: nil, q: {out_of_stock_items: '1', in_stock_items: nil}}),class: "dropdown-item #{'active' if params[:q][:out_of_stock_items] == '1'}" %>- </div>-</div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb b/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erbindex d1b2bee2f9..6915f8fc9a 100644--- a/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb@@ -4,15 +4,15 @@<h5 class="card-title"><%= promotion_action.human_name %></h5><% if can?(:update, promotion_action) || can?(:destroy, promotion_action) %>- <div class="dropdown">- <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-sm px-1' do %><%= 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) %>+ <% end %>+ <%= dropdown_menu do %>+ <%= 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) %><%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_promotion_action_path(promotion_action.promotion, promotion_action), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, promotion_action) %>- </div>- </div>+ <% end %>+ <% end %><% end %></div><div class="card-body">diff --git a/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb b/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erbindex f73adac8e6..9a4f0cc34d 100644--- a/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb@@ -4,15 +4,15 @@<h5 class="card-title"><%= promotion_rule.human_name %></h5><% if can?(:update, promotion_rule) || can?(:destroy, promotion_rule) %>- <div class="dropdown">- <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-sm px-1' do %><%= 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) %>- <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_promotion_rule_path(promotion_rule.promotion, promotion_rule), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, promotion_rule) %>- </div>- </div>+ <% end %>+ <%= dropdown_menu do %>+ <%= 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) %>+ <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_promotion_rule_path(promotion_rule.promotion, promotion_rule), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, promotion_rule) %>+ <% end %>+ <% end %><% end %></div><div class="card-body">diff --git a/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erbindex 8ea7662cfd..4f44dae2f9 100644--- a/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb@@ -1,11 +1,11 @@-<div class="dropdown">- <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">+<%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %><span class="text-muted font-weight-normal mr-1"><%= Spree.t(:status) %>- </span>+ </span><%= promotion_filter_dropdown_value %>- </button>- <div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">+ <% end %>+ <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %><%= active_link_to 'All Promotions', params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[expired active] ).all?(&:blank?) %><%= link_to Spree.t(:expired),params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: true}}),@@ -13,5 +13,5 @@<%= link_to Spree.t(:active),params.to_unsafe_h.deep_merge({page: nil, q: {active: true, expired: false}}),class: "dropdown-item #{'active' if params[:q][:active]}" %>- </div>-</div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/return_authorizations/filters.html.erb b/admin/app/views/spree/admin/return_authorizations/filters.html.erbindex f6983a51a8..ebf8d11213 100644--- a/admin/app/views/spree/admin/return_authorizations/filters.html.erb+++ b/admin/app/views/spree/admin/return_authorizations/filters.html.erb@@ -2,13 +2,8 @@<div class="d-flex flex-column flex-lg-row gap-2"><%= render "spree/admin/shared/filters_search_bar", param: :number_cont %>- <div class="dropdown">- <button- class="btn btn-light dropdown-toggle"- type="button"- data-toggle="dropdown"- aria-expanded="false"- >+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %><span class="text-muted font-weight-normal mr-1"><%= Spree.t(:show) %>:</span>@@ -17,8 +12,8 @@<% else %><%= Spree.t(:all) %><% end %>- </button>- <div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">+ <% end %>+ <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %><%= active_link_to Spree.t(:all),params.to_unsafe_h.deep_merge({ q: { state_eq: "" } }),class: "dropdown-item",@@ -29,8 +24,8 @@<%= link_to Spree.t("return_authorization_states.canceled"),params.to_unsafe_h.deep_merge({ q: { state_eq: :canceled } }),class: "dropdown-item #{"active" if params.dig(:q, :state_eq) == "canceled"}" %>- </div>- </div>+ <% end %>+ <% end %></div><%= render "spree/admin/shared/filter_badge_template" %>diff --git a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erbindex e8fcb4eac8..75ec9a8efd 100644--- a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb+++ b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb@@ -7,9 +7,8 @@<% dropdown_direction ||= 'left' %>-<div data-controller="calendar-range" class="dropdown h-100"- data-action="click->calendar-range#open">- <div class="<%= css_classes %>" data-toggle="dropdown">+<%= dropdown data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open' }, class: 'h-100' do %>+ <%= dropdown_toggle class: css_classes do %><%= icon('calendar', class: 'mr-2') %><div data-calendar-range-target="label"><% if date_from_value.present? && date_to_value.present? %>@@ -18,11 +17,11 @@<%= Spree.t(:all_time) %><% end %></div>- </div>- <div class="dropdown-menu dropdown-menu-<%= dropdown_direction %> pt-2 px-2 pb-1" onclick="event.stopPropagation()">+ <% end %>+ <%= dropdown_menu direction: dropdown_direction, class: "pt-2 px-2 pb-1" do %><div data-calendar-range-target="picker" class="d-none"></div>- </div>+ <% end %><%= hidden_field_tag date_from_input_name, date_from_value&.to_date, data: { 'calendar-range-target': 'dateFrom' } %><%= hidden_field_tag date_to_input_name, date_to_value&.to_date, data: { 'calendar-range-target': 'dateTo' } %>-</div>+<% end %>diff --git a/admin/app/views/spree/admin/shared/_content_header.html.erb b/admin/app/views/spree/admin/shared/_content_header.html.erbindex b58e63450a..f6bc772e35 100644--- a/admin/app/views/spree/admin/shared/_content_header.html.erb+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb@@ -22,11 +22,11 @@<% end %><% if show_record_subtitle || content_for(:page_actions_dropdown) %>- <div class="dropdown h-100" id="page_actions_dropdown">- <%= link_to '#', class: 'btn btn-light h-100 p-2', data: { toggle: 'dropdown' }, id: 'more-actions-link' do %>+ <%= dropdown id: 'page_actions_dropdown', class: 'h-100' do %>+ <%= dropdown_toggle id: 'more-actions-link', class: 'btn-light h-100 p-2' do %><%= icon 'dots-vertical', class: 'mr-0' %><% end %>- <div class="dropdown-menu dropdown-menu-right">+ <%= dropdown_menu id: 'page_actions_dropdown_menu' do %><%= yield :page_actions_dropdown if content_for(:page_actions_dropdown) %><% if record && record.persisted? %><%= link_to_edit_metafields(record) %>@@ -40,17 +40,17 @@</a><% end %><% if record.respond_to?(:number) %>- <div data-controller="clipboard">+ <div data-controller="clipboard" data-clipboard-success-content-value='<%= icon('check') + ' ' + Spree.t(:copied) %>'><%= hidden_field_tag :record_number, record.number, data: { clipboard_target: 'source' } %>- <button data-action="clipboard#copy" class="text-left dropdown-item">+ <button data-action="clipboard#copy" class="text-left dropdown-item" data-clipboard-target="button"><%= icon 'copy' %><%= 'Copy number' %></button></div><% end %>- <div data-controller="clipboard">+ <div data-controller="clipboard" data-clipboard-success-content-value='<%= icon('check') + ' ' + Spree.t(:copied) %>'><%= hidden_field_tag :record_id, record.id, data: { clipboard_target: 'source' } %>- <button data-action="clipboard#copy" class="text-left dropdown-item">+ <button data-action="clipboard#copy" class="text-left dropdown-item" data-clipboard-target="button"><%= icon 'copy' %><%= Spree.t(:copy_id) %></button>@@ -61,8 +61,8 @@<%= link_to_with_icon 'trash', Spree.t('actions.destroy'), object_url, class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %><% end %><% end %>- </div>- </div>+ <% end %>+ <% end%><% end %></div></header>diff --git a/admin/app/views/spree/admin/shared/_index_table.html.erb b/admin/app/views/spree/admin/shared/_index_table.html.erbindex 6486b50310..71272d602a 100644--- a/admin/app/views/spree/admin/shared/_index_table.html.erb+++ b/admin/app/views/spree/admin/shared/_index_table.html.erb@@ -8,7 +8,7 @@<% end %><% if paginated_collection.any? %>- <div class="table-responsive <% if lookup_context.template_exists?('filters', lookup_context.prefixes, true) %>with-filters<% end %>" id="listing_<%= controller_name %>">+ <div class="<% if lookup_context.template_exists?('filters', lookup_context.prefixes, true) %>with-filters<% end %>" id="listing_<%= controller_name %>"><table class="table"><thead><%= render 'table_header' %>diff --git a/admin/app/views/spree/admin/shared/_index_table_options.html.erb b/admin/app/views/spree/admin/shared/_index_table_options.html.erbindex d5a2d3b14f..cb15e6a1bb 100644--- a/admin/app/views/spree/admin/shared/_index_table_options.html.erb+++ b/admin/app/views/spree/admin/shared/_index_table_options.html.erb@@ -7,14 +7,12 @@<% if collection.any? && collection.respond_to?(:current_page) %><div class="pagination-container">- <div class="index-pagination-row d-flex align-items-center">- <div class="col-6 col-lg-3">- <%= per_page_dropdown %>- </div>- <div class="d-none d-lg-block col-lg-6 text-center text-muted">+ <div class="index-pagination-row d-flex align-items-center justify-content-between px-2">+ <%= per_page_dropdown %>+ <div class="d-none d-lg-block text-center text-muted"><%= page_entries_info(collection, entry_name: entry_name) %></div>- <div class="col-6 col-lg-3 text-right pr-lg-2">+ <div class="text-right pr-lg-2"><%= paginate collection, theme: 'admin-twitter-bootstrap-4' %></div></div>diff --git a/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb b/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erbindex c96e7bcf38..f7e96d6237 100644--- a/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb@@ -1,8 +1,8 @@-<div class="dropdown">- <button type="button" class="btn btn-sm btn-light px-1" data-toggle="dropdown" aria-expanded="false">+<%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %><%= icon 'plus', class: 'mr-0' %>- </button>- <div class="dropdown-menu">+ <% end %>+ <%= dropdown_menu direction: 'left' do %><%= link_to_with_icon 'shopping-bag-plus', Spree.t(:new_order), spree.new_admin_order_path, class: "dropdown-item" if can?(:manage, Spree::Order) %><%= link_to spree.new_admin_product_path, class: 'dropdown-item' do %>@@ -26,5 +26,5 @@<%= link_to_with_icon 'building-store', Spree.t(:new_store), spree.new_admin_store_path, class: 'dropdown-item' %><% end %>- </div>-</div>\ No newline at end of file+ <% end %>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb b/admin/app/views/spree/admin/shared/_user_dropdown.html.erbindex a838275e6b..d01cd83e07 100644--- a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/_user_dropdown.html.erb@@ -1,11 +1,9 @@<% if try_spree_current_user.present? %>- <div class="dropdown" id="<%= dom_id(try_spree_current_user, 'account-dropdown') %>" data-turbo-permanent>- <button type="button"- class="btn d-flex align-items-center justify-content-between text-left w-100 pr-0"- data-toggle="dropdown" aria-expanded="false" id="accountNav">+ <%= dropdown id: dom_id(try_spree_current_user, 'account-dropdown') do %>+ <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0' do %><%= render_avatar(try_spree_current_user, width: 32, height: 32) %>- </button>- <div class="dropdown-menu dropdown-menu-right" style="min-width: 250px;">+ <% end %>+ <%= dropdown_menu class: 'dropdown-menu-right', style: 'min-width: 250px;' do %><div class="d-flex align-items-center p-2 bg-light rounded-lg"><%= render_avatar(try_spree_current_user, width: 34, height: 34) %><span class="d-none d-lg-inline ml-lg-2">@@ -41,6 +39,6 @@<%= icon('logout', class: "icon icon-logout") %><%= Spree.t(:logout) %><% end if defined?(spree_admin_logout_path) %>- </div>- </div>+ <% end %>+ <% end %><% end %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erbindex 2e6221a206..b44cd7b65a 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb@@ -1,11 +1,10 @@-<div class="store-dropdown" id="store-menu" data-turbo-permanent>- <div class="dropdown">- <button type="button" class="btn store-dropdown-button dropdown-toggle"- data-toggle="dropdown" aria-expanded="false">+<div class="store-dropdown" id="store-menu">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'store-dropdown-button dropdown-toggle' do %><%= store_admin_icon(current_store, height: 32, width: 32) %><%= truncate(current_store.name, length: 10) %>- </button>- <div class="dropdown-menu ml-2">+ <% end %>+ <%= dropdown_menu class: 'ml-2', direction: 'left' do %><%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %><%= icon 'eye' %><%= Spree.t(:view_store) %>@@ -47,8 +46,8 @@<% end %></div><% end %>- </div>- </div>+ <% end %>+ <% end %><%= render 'spree/admin/shared/new_item_dropdown' %></div>diff --git a/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb b/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erbindex 439803e4d0..359234a947 100644--- a/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb+++ b/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb@@ -29,18 +29,18 @@<div class="d-flex align-items-center px-3 ml-3 gap-2"><%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link, turbo_frame: '_top' }) if can?(:edit, taxon) %>- <div class="dropdown h-100">- <button class="btn btn-light btn-sm px-1 h-100" type="button" id="dropdownMenuButton-<%= taxon.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <%= dropdown class: 'h-100' do %>+ <%= dropdown_toggle class: 'btn-sm px-1 h-100' do %><%= icon('dots-vertical', class: 'mr-0') %>- </button>- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= taxon.id %>">+ <% end %>+ <%= dropdown_menu class: 'dropdown-menu-right' do %><% if can?(:create, Spree::Taxon) %><%= link_to_with_icon 'plus', Spree.t(:new_nested_taxon), spree.new_admin_taxonomy_taxon_path(taxonomy, taxon: { parent_id: taxon.id }), class: 'dropdown-item' %><div class="dropdown-divider"></div><% end %><%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id), class: 'dropdown-item btn-danger') if can?(:destroy, taxon) %>- </div>- </div>+ <% end %>+ <% end %></div></div>diff --git a/admin/app/views/spree/admin/stock_locations/_table_row.html.erb b/admin/app/views/spree/admin/stock_locations/_table_row.html.erbindex 7806a01054..c19a2c8456 100644--- a/admin/app/views/spree/admin/stock_locations/_table_row.html.erb+++ b/admin/app/views/spree/admin/stock_locations/_table_row.html.erb@@ -16,18 +16,19 @@<div><%= link_to_edit stock_location, data: { row_link_target: 'link', turbo_frame: '_top' } %></div><% if !stock_location.default? && can?(:mark_as_default, Spree::StockLocation) %>- <div class="dropdown">- <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-sm h-100' do %><%= icon('dots-vertical', class: 'mr-0') %>- </button>- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">+ <% end %>+ <%= dropdown_menu class: 'dropdown-menu-right' do %><%= link_to_with_icon 'check',Spree.t(:mark_as_default),spree.mark_as_default_admin_stock_location_path(stock_location),class: 'dropdown-item',data: { turbo_method: :put } %>- </div>+ <% end %><% end %>+ <% end %></div></div><% end %>diff --git a/admin/app/views/spree/admin/taxonomies/_table_row.html.erb b/admin/app/views/spree/admin/taxonomies/_table_row.html.erbindex fa8683a402..400d16e32e 100644--- a/admin/app/views/spree/admin/taxonomies/_table_row.html.erb+++ b/admin/app/views/spree/admin/taxonomies/_table_row.html.erb@@ -5,11 +5,11 @@<td class="w-50 cursor-pointer py-0" data-action="click->row-link#openLink"><%= link_to taxonomy.name, spree.admin_taxonomy_path(taxonomy), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %></td>- <td class="w-30 cursor-pointer" data-action="click->row-link#openLink">+ <td class="w-15 cursor-pointer" data-action="click->row-link#openLink"><!-- We don't want to include the root taxon --><%= taxonomy.taxons.count - 1 %></td>- <td class="w-10 actions">+ <td class="w-30 actions"><%= link_to_with_icon 'list-tree', Spree.t('admin.manage_taxons'), spree.admin_taxonomy_path(taxonomy), class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' } %><%= link_to_edit(taxonomy, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can?(:edit, taxonomy) %></td>diff --git a/admin/app/views/spree/admin/themes/_theme.html.erb b/admin/app/views/spree/admin/themes/_theme.html.erbindex 4bd603256d..453445c34f 100644--- a/admin/app/views/spree/admin/themes/_theme.html.erb+++ b/admin/app/views/spree/admin/themes/_theme.html.erb@@ -38,17 +38,18 @@<% if theme.ready? %><div class="d-flex justify-content-end w-100"><%= link_to Spree.t('actions.publish'), publish_admin_theme_path(theme), class: 'btn btn-sm btn-light mr-2', data: { turbo_method: :put } unless theme.default? %>- <div class="dropdown">- <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm' do %><%= icon('dots-vertical', class: 'mr-0') %>- </button>- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">+ <% end %>+ <%= dropdown_menu do %><%= link_to_edit theme, class: 'dropdown-item', data: { turbo_prefetch: false } %><%= link_to_with_icon 'copy', Spree.t(:clone), spree.clone_admin_theme_path(theme), class: 'dropdown-item', data: { turbo_method: :post } %><% unless theme.default? %><%= link_to_delete(theme, icon: 'trash', class: 'dropdown-item btn-danger shadow-none') if can?(:delete, theme) %><% end %>- </div>+ <% end %>+ <% end %></div><% end %></td>diff --git a/admin/app/views/spree/admin/themes/index.html.erb b/admin/app/views/spree/admin/themes/index.html.erbindex 74ba576213..f4b40e70a2 100644--- a/admin/app/views/spree/admin/themes/index.html.erb+++ b/admin/app/views/spree/admin/themes/index.html.erb@@ -30,20 +30,18 @@<%= render_admin_partials(:themes_header_partials) %><div class="card-lg">- <div class="table-responsive rounded-lg">- <table class="table">- <thead>- <tr>- <th><%= Spree.t(:theme) %></th>- <th><%= Spree.t(:status) %></th>- <th></th>- </tr>- </thead>- <tbody>- <%= render partial: 'spree/admin/themes/theme', collection: @themes, cached: spree_base_cache_scope %>- </tbody>- </table>- </div>+ <table class="table">+ <thead>+ <tr>+ <th><%= Spree.t(:theme) %></th>+ <th><%= Spree.t(:status) %></th>+ <th></th>+ </tr>+ </thead>+ <tbody>+ <%= render partial: 'spree/admin/themes/theme', collection: @themes, cached: spree_base_cache_scope %>+ </tbody>+ </table></div><% if available_themes.any? %>diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 016c172039..e6c5edc5cf 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -846,6 +846,7 @@ en:continue_selling_when_out_of_stock: Continue selling when out of stockcontinue_shopping: Continue shoppingcontinue_without_logging_in: Continue without logging in+ copied: Copied!copy: Copycopy_id: Copy IDcopy_link: Copy link