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
Added `Spree::Admin::ModalHelper` (#12620)
Damian Legawiec45c2ec91405f
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss b/admin/app/assets/stylesheets/spree/admin/components/_modals.scssindex a60ba6c245..5ff4ed2763 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_modals.scss@@ -25,7 +25,7 @@ body.modal-open {}.modal-footer {display: flex;- justify-content: flex-end;+ justify-content: space-between;padding: $modal-inner-padding;background-color: #FAFAFA;border-top: 1px solid $gray-50;diff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rbindex 27e06b1475..aee06bceaa 100644--- a/admin/app/helpers/spree/admin/base_helper.rb+++ b/admin/app/helpers/spree/admin/base_helper.rb@@ -248,10 +248,6 @@ module Spree)end- def path_from_url(url)- url.to_s.gsub('https://', '').gsub('http://', '')- end-def allowed_file_types_for_uploadRails.application.config.active_storage.web_image_content_typesenddiff --git a/admin/app/helpers/spree/admin/modal_helper.rb b/admin/app/helpers/spree/admin/modal_helper.rbnew file mode 100644index 0000000000..2e5eeb2b1a--- /dev/null+++ b/admin/app/helpers/spree/admin/modal_helper.rb@@ -0,0 +1,22 @@+module Spree+ module Admin+ module ModalHelper+ def modal_header(title)+ title = capture(&title) if block_given?+ content_tag(:div, class: 'modal-header') do+ content_tag(:h5, title, class: 'modal-title') + modal_close_button+ end.html_safe+ end++ def modal_close_button+ button_tag('', type: 'button', class: 'btn-close', data: { dismiss: 'modal', aria_label: Spree.t(:close) }).html_safe+ end++ def modal_discard_button+ button_tag(type: 'button', class: 'btn btn-light', data: { dismiss: 'modal' }) do+ Spree.t('actions.discard')+ end.html_safe+ end+ end+ end+enddiff --git a/admin/app/views/spree/admin/assets/edit.html.erb b/admin/app/views/spree/admin/assets/edit.html.erbindex 2ad4c6d5f8..d5cc2bc70d 100644--- a/admin/app/views/spree/admin/assets/edit.html.erb+++ b/admin/app/views/spree/admin/assets/edit.html.erb@@ -1,11 +1,6 @@<%= turbo_frame_tag :dialog_modal_lg do %>- <div class="modal-content" >- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel">- <%= Spree.t(:edit) %> <%= Spree.t(:image) %>- </h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <div class="modal-content">+ <%= modal_header(Spree.t(:edit) + ' ' + Spree.t(:image)) %><%= form_with model: @asset, url: spree.admin_asset_path(@asset), method: :put, scope: :asset do |f| %><div class="modal-body pb-0" data-turbo-permanent id="asset-<%= @asset.key.parameterize %>"><%= render 'active_storage/upload_form', form: f, field_name: :attachment, width: 200, height: 200, can_delete: false %>@@ -16,7 +11,7 @@<%= f.text_area :alt, rows: 4, class: 'form-control' %></div></div>- <div class="modal-footer d-flex justify-content-between">+ <div class="modal-footer"><%= turbo_save_button_tag %><%= link_to Spree.t('actions.destroy'), object_url(@asset),data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: '_top' },diff --git a/admin/app/views/spree/admin/digital_assets/edit.html.erb b/admin/app/views/spree/admin/digital_assets/edit.html.erbindex 2476917b0d..36bcd06c60 100644--- a/admin/app/views/spree/admin/digital_assets/edit.html.erb+++ b/admin/app/views/spree/admin/digital_assets/edit.html.erb@@ -1,20 +1,12 @@<%= turbo_frame_tag :dialog_modal do %><%= form_for :digital_asset, url: spree.admin_product_digital_asset_path(@product, @digital_asset), method: :put do |f| %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel"><%= @digital_asset.attachment.filename %></h5>- <button- type="button"- class="btn-close"- data-dismiss="modal"- aria-label="<%= Spree.t(:close) %>"- />- </div>+ <%= modal_header(@digital_asset.attachment.filename) %><div class="modal-body"><%= render "spree/admin/digital_assets/form", 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"), data: { turbo_frame: :_top } %></div></div>diff --git a/admin/app/views/spree/admin/digital_assets/new.html.erb b/admin/app/views/spree/admin/digital_assets/new.html.erbindex 39bc126923..622e3981f3 100644--- a/admin/app/views/spree/admin/digital_assets/new.html.erb+++ b/admin/app/views/spree/admin/digital_assets/new.html.erb@@ -1,20 +1,12 @@<%= turbo_frame_tag :dialog_modal do %><%= form_for :digital_asset, url: spree.admin_product_digital_assets_path(@product) do |f| %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_digital_asset) %></h5>- <button- type="button"- class="btn-close"- data-dismiss="modal"- aria-label="<%= Spree.t(:close) %>"- />- </div>+ <%= modal_header(Spree.t(:new_digital_asset)) %><div class="modal-body"><%= render "spree/admin/digital_assets/form", 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"), data: { turbo_frame: :_top } %></div></div>diff --git a/admin/app/views/spree/admin/exports/new.html.erb b/admin/app/views/spree/admin/exports/new.html.erbindex 1aabf4e450..f536c91b53 100644--- a/admin/app/views/spree/admin/exports/new.html.erb+++ b/admin/app/views/spree/admin/exports/new.html.erb@@ -3,13 +3,7 @@<%= f.hidden_field :type %><%= f.hidden_field :search_params %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel">- <%= Spree.t(:export) %>- <%= plural_resource_name(@export.model_class) %>- </h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(Spree.t(:export) + ' ' + plural_resource_name(@export.model_class)) %><div class="modal-body"><%= render 'spree/admin/shared/error_messages', target: @export %><div class="custom-control custom-radio">@@ -33,8 +27,8 @@<% end %></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(:export), class: 'btn btn-primary' %></div></div>diff --git a/admin/app/views/spree/admin/line_items/new.html.erb b/admin/app/views/spree/admin/line_items/new.html.erbindex e97f971acb..490a714dc2 100644--- a/admin/app/views/spree/admin/line_items/new.html.erb+++ b/admin/app/views/spree/admin/line_items/new.html.erb@@ -1,9 +1,6 @@<%= turbo_frame_tag :dialog_modal do %><div class="modal-content" data-controller="search-picker">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_variant) %></h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(Spree.t(:add_variant)) %><div class="modal-body border-bottom"><%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %><%= form.hidden_field :omit_ids, value: @order.variant_ids.join(',') %>@@ -20,7 +17,7 @@</p></div></div>- <div class="modal-footer d-flex justify-content-between border-top">+ <div class="modal-footer border-top"><div class="d-flex gap-2 m-0 align-items-center"><%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %><%= form.number_field :quantity, class: "form-control", min: 1 %>diff --git a/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erbindex c2849196fa..dc917821df 100644--- a/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/billing_address/edit.html.erb b/admin/app/views/spree/admin/orders/billing_address/edit.html.erbindex 0b39c7c71c..6d216b72e4 100644--- a/admin/app/views/spree/admin/orders/billing_address/edit.html.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/billing_address/new.html.erb b/admin/app/views/spree/admin/orders/billing_address/new.html.erbindex 5337c0e37b..d9f3cee92d 100644--- a/admin/app/views/spree/admin/orders/billing_address/new.html.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erbindex 26f5e1ad02..bd9606a3db 100644--- a/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/contact_information/edit.html.erb b/admin/app/views/spree/admin/orders/contact_information/edit.html.erbindex 5fd61730b8..2686044fd4 100644--- a/admin/app/views/spree/admin/orders/contact_information/edit.html.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/customer_returns/edit.html.erb b/admin/app/views/spree/admin/orders/customer_returns/edit.html.erbindex 0476ab31a0..39f61a6138 100644--- a/admin/app/views/spree/admin/orders/customer_returns/edit.html.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erbindex 0506e9e5cb..6200b705f5 100644--- a/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb b/admin/app/views/spree/admin/orders/shipping_address/edit.html.erbindex 9d68848231..911e10d4fd 100644--- a/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/shipping_address/new.html.erb b/admin/app/views/spree/admin/orders/shipping_address/new.html.erbindex 19850a4179..b57da5fefb 100644--- a/admin/app/views/spree/admin/orders/shipping_address/new.html.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erbindex 0f89471a8a..f895beaaae 100644--- a/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/pages/edit.html.erb b/admin/app/views/spree/admin/pages/edit.html.erbindex 146619cf10..4a847b87e8 100644--- a/admin/app/views/spree/admin/pages/edit.html.erb+++ b/admin/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>diff --git a/admin/app/views/spree/admin/products/bulk_modal.html.erb b/admin/app/views/spree/admin/products/bulk_modal.html.erbindex 835c295c0f..e903e1fca8 100644--- a/admin/app/views/spree/admin/products/bulk_modal.html.erb+++ b/admin/app/views/spree/admin/products/bulk_modal.html.erb@@ -1,11 +1,6 @@<%= turbo_frame_tag :bulk_modal do %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel">- <%= @title %>- </h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(@title) %><div class="modal-body"><p><%= @body %></p>@@ -15,8 +10,8 @@<%= tom_select_tag 'tags', multiple: true, class: 'w-100', options: tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %><% end %></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 %></div></div>diff --git a/admin/app/views/spree/admin/promotion_actions/new.html.erb b/admin/app/views/spree/admin/promotion_actions/new.html.erbindex 581a6f71b7..20aeb0221d 100644--- a/admin/app/views/spree/admin/promotion_actions/new.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/new.html.erb@@ -1,16 +1,11 @@<%= turbo_frame_tag :dialog_modal do %><%= form_with model: @promotion_action, url: spree.admin_promotion_actions_path(@promotion), method: :post, scope: :promotion_action do |f| %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title">- <% if @promotion_action.type.nil? %>- <%= Spree.t(:add_action_of_type) %>- <% else %>- <%= @promotion_action.human_name %>- <% end %>- </h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <% if @promotion_action.type.nil? %>+ <%= modal_header(Spree.t(:add_action_of_type)) %>+ <% else %>+ <%= modal_header(@promotion_action.human_name) %>+ <% end %><div class="modal-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %><% if @promotion_action.type.nil? %>@@ -38,8 +33,8 @@<% end %></div><% if @promotion_action.type.present? %>- <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.create'), data: { turbo_frame: '_top' } %></div><% end %>diff --git a/admin/app/views/spree/admin/promotion_rules/new.html.erb b/admin/app/views/spree/admin/promotion_rules/new.html.erbindex 3ab2563f5d..64e32bf2a6 100644--- a/admin/app/views/spree/admin/promotion_rules/new.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/new.html.erb@@ -1,16 +1,11 @@<%= turbo_frame_tag :dialog_modal do %><%= form_with model: @promotion_rule, url: spree.admin_promotion_rules_path(@promotion), method: :post, scope: :promotion_rule do |f| %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title">- <% if @promotion_rule.type.nil? %>- <%= Spree.t(:add_rule_of_type) %>- <% else %>- <%= @promotion_rule.human_name %>- <% end %>- </h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <% if @promotion_rule.type.nil? %>+ <%= modal_header(Spree.t(:add_rule_of_type)) %>+ <% else %>+ <%= modal_header(@promotion_rule.human_name) %>+ <% end %><div class="modal-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %><% if @promotion_rule.type.nil? %>@@ -38,8 +33,8 @@<% end %></div><% if @promotion_rule.type.present? %>- <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.create'), data: { turbo_frame: '_top' } %></div><% end %>diff --git a/admin/app/views/spree/admin/refunds/edit.html.erb b/admin/app/views/spree/admin/refunds/edit.html.erbindex 06b4095f64..050f12159d 100644--- a/admin/app/views/spree/admin/refunds/edit.html.erb+++ b/admin/app/views/spree/admin/refunds/edit.html.erb@@ -1,18 +1,13 @@<%= turbo_frame_tag :dialog_modal do %><%= form_for [:admin, @refund.payment.order, @refund.payment, @refund], data: { turbo_frame: '_top' } do |f| %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel">- <%= Spree.t(:edit_refund) %>- </h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(Spree.t(:edit_refund)) %><div class="modal-body"><%= render 'spree/admin/shared/error_messages', target: @refund %><%= render 'spree/admin/refunds/form', 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 %></div></div>diff --git a/admin/app/views/spree/admin/shared/_bulk_modal.html.erb b/admin/app/views/spree/admin/shared/_bulk_modal.html.erbindex 31ae52d597..731e464a6c 100644--- a/admin/app/views/spree/admin/shared/_bulk_modal.html.erb+++ b/admin/app/views/spree/admin/shared/_bulk_modal.html.erb@@ -2,18 +2,17 @@<div class="modal-dialog modal-dialog-centered"><%= turbo_frame_tag :bulk_modal do %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(Spree.t(:loading)) %><div class="modal-body text-center"><div class="spinner-border text-muted" role="status"><span class="sr-only"><%= Spree.t(:loading) %>...</span></div></div>- <div class="modal-footer d-flex justify-content-between">- <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t(:close) %></button>- <button type="button" class="btn btn-primary" disabled="disabled"><%= Spree.t(:save_changes) %></button>+ <div class="modal-footer">+ <%= modal_discard_button %>+ <button type="button" class="btn btn-primary" disabled="disabled">+ <%= Spree.t('actions.save') %>+ </button></div></div><% end %>diff --git a/admin/app/views/spree/admin/shared/_modal.html.erb b/admin/app/views/spree/admin/shared/_modal.html.erbindex 475d01fe58..0bc5836c6b 100644--- a/admin/app/views/spree/admin/shared/_modal.html.erb+++ b/admin/app/views/spree/admin/shared/_modal.html.erb@@ -2,10 +2,7 @@<div class="modal-dialog modal-dialog-centered"><%= turbo_frame_tag :dialog_modal do %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(Spree.t(:loading)) %><div class="modal-body text-center"><div class="spinner-border text-light mx-auto my-5" role="status"><span class="sr-only"><%= Spree.t(:loading) %>...</span>@@ -20,10 +17,7 @@<div class="modal-dialog modal-dialog-centered modal-lg"><%= turbo_frame_tag :dialog_modal_lg do %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(Spree.t(:loading)) %><div class="modal-body text-center" style="min-height: 200px"><div class="spinner-border text-light" role="status"><span class="sr-only"><%= Spree.t(:loading) %>...</span>diff --git a/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb b/admin/app/views/spree/admin/shared/_multi_product_picker.html.erbindex f0d3b2b1cb..12b4fe6ec6 100644--- a/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb+++ b/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb@@ -1,9 +1,6 @@<%= turbo_frame_tag :dialog_modal do %><div class="modal-content" data-controller="search-picker">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_products) %></h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(Spree.t(:add_products)) %><div class="modal-body border-bottom"><%= form_with url: spree.search_admin_products_path, method: :post, data: { controller: 'auto-submit'} do |form| %><%= form.hidden_field :omit_ids, value: parent.product_ids.join(',') %>@@ -19,6 +16,7 @@</div></div><div class="modal-footer border-top">+ <%= modal_discard_button %><%= turbo_save_button_tag Spree.t(:add_selected_products), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %></div><% 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 94501913e6..c676effe8a 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@@ -2,13 +2,7 @@<div class="modal fade" id="switch-store-modal" tabindex="-1" role="dialog" aria-labelledby="switchStoreModalLabel" aria-hidden="true"><div class="modal-dialog" role="document"><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="switchStoreModalLabel">- <%= icon 'switch-horizontal', class: 'mr-2' %>- <%= Spree.t(:switch_store) %>- </h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(icon('switch-horizontal', class: 'mr-2') + Spree.t(:switch_store)) %><div class="modal-body"><div class="list-group"><% available_stores.each do |store| %>diff --git a/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb b/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erbindex 711ba4e23e..ed24e753ec 100644--- a/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb@@ -1,10 +1,7 @@<div class="modal fade" id="stock_transfer_modal" tabindex="-1" aria-labelledby="stock_transfer_modal_label" aria-hidden="true"><div class="modal-dialog modal-dialog-centered"><div class="modal-content" data-controller="search-picker">- <div class="modal-header">- <h5 class="modal-title" id="stock_transfer_modal_label"><%= Spree.t(:add_variant) %></h5>- <button type="button" class="btn-close" data-action="search-picker#closeAndClear" data-dismiss="modal" aria-label="Close" />- </div>+ <%= modal_header(Spree.t(:add_variant)) %><div class="modal-body"><%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %><%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>@@ -22,7 +19,8 @@</p></div></div>- <div class="modal-footer d-flex justify-content-between">+ <div class="modal-footer">+ <%= modal_discard_button %><%= button_tag Spree.t(:add_selected_variant), class: "btn btn-primary text-center", disabled: true, data: { search_picker_target: :submit, action: 'stock-transfer#add search-picker#closeAndClear', dismiss: 'modal' } %></div></div>diff --git a/admin/app/views/spree/admin/stores/new.html.erb b/admin/app/views/spree/admin/stores/new.html.erbindex f930554338..a53199f785 100644--- a/admin/app/views/spree/admin/stores/new.html.erb+++ b/admin/app/views/spree/admin/stores/new.html.erb@@ -3,10 +3,7 @@<%= turbo_frame_tag :dialog_modal_lg do %><%= form_for @store, url: spree.admin_stores_path, data: { turbo_frame: '_top', controller: 'store-form enable-button' } do |f| %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="newStoreModalLabel"><%= Spree.t(:new_store) %></h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>- </div>+ <%= modal_header(Spree.t(:new_store)) %><div class="modal-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store } %><div class="row">@@ -123,8 +120,8 @@</div></div></div>- <div class="modal-footer 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.create') %></div></div>diff --git a/admin/app/views/spree/admin/users/bulk_modal.html.erb b/admin/app/views/spree/admin/users/bulk_modal.html.erbindex c6b4644bb3..bcdd0e5b72 100644--- a/admin/app/views/spree/admin/users/bulk_modal.html.erb+++ b/admin/app/views/spree/admin/users/bulk_modal.html.erb@@ -1,11 +1,6 @@<%= turbo_frame_tag :bulk_modal do %><div class="modal-content">- <div class="modal-header">- <h5 class="modal-title" id="exampleModalLabel">- <%= @title %>- </h5>- <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />- </div>+ <%= modal_header(@title) %><div class="modal-body"><p><%= @body %></p>@@ -13,8 +8,8 @@<%= tom_select_tag 'tags', multiple: true, class: 'w-100', options: user_tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %><% end %></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 %></div></div>diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 17ad94e327..0639d1e5fc 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -1741,7 +1741,6 @@ en:sales_totals: Sales Totalssame_as_shipping_address: Same as shipping addresssave_and_continue: Save and Continue- save_changes: Save changessave_my_address: Save my addresssaving: Savingsay_no: 'No'