From a31c5c714315a4bd26c434db3f65b62fc6351d6b Mon Sep 17 00:00:00 2001 From: jarndt Date: Tue, 3 Dec 2024 15:36:11 -0700 Subject: [PATCH 1/2] Remove usage of deprecated `product_sub_menu` partial DEPRECATION WARNING: Using the "spree/admin/shared/_product_sub_menu" partial is deprecated, please use MenuItem#children instead. --- app/views/spree/admin/digitals/index.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/spree/admin/digitals/index.html.erb b/app/views/spree/admin/digitals/index.html.erb index 7eebcc5..e65bd27 100644 --- a/app/views/spree/admin/digitals/index.html.erb +++ b/app/views/spree/admin/digitals/index.html.erb @@ -1,4 +1,3 @@ -<%= render :partial => 'spree/admin/shared/product_sub_menu' %> <%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => "Digital Versions"} %> <% if @product.has_variants? %> From 62784ee0211f1226685050994c6faf26b6e2e361 Mon Sep 17 00:00:00 2001 From: jarndt Date: Tue, 3 Dec 2024 15:38:46 -0700 Subject: [PATCH 2/2] Update UI to match look-n-feel of current admin Solidus admin v4.4 does not use icon links or delete buttons --- ...d_digital_versions_to_admin_product_tabs.html.erb.deface | 2 +- ...d_digital_versions_to_admin_product_tabs.html.erb.deface | 6 +++--- app/views/spree/admin/digitals/_form.html.erb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/overrides/spree/admin/shared/_order_submenu/add_digital_versions_to_admin_product_tabs.html.erb.deface b/app/overrides/spree/admin/shared/_order_submenu/add_digital_versions_to_admin_product_tabs.html.erb.deface index 640c43e..0319c7f 100644 --- a/app/overrides/spree/admin/shared/_order_submenu/add_digital_versions_to_admin_product_tabs.html.erb.deface +++ b/app/overrides/spree/admin/shared/_order_submenu/add_digital_versions_to_admin_product_tabs.html.erb.deface @@ -1,7 +1,7 @@ <% if can?(:update, @order) && @order.digital? %>
  • - <%= link_to_with_icon 'icon-cloud', I18n.t('spree.digitals.reset_downloads'), reset_digitals_admin_order_url(@order) %> + <%= link_to I18n.t('spree.digitals.reset_downloads'), reset_digitals_admin_order_url(@order) %>
  • <% end %> diff --git a/app/overrides/spree/admin/shared/_product_tabs/add_digital_versions_to_admin_product_tabs.html.erb.deface b/app/overrides/spree/admin/shared/_product_tabs/add_digital_versions_to_admin_product_tabs.html.erb.deface index ee7aa8f..d633b5f 100644 --- a/app/overrides/spree/admin/shared/_product_tabs/add_digital_versions_to_admin_product_tabs.html.erb.deface +++ b/app/overrides/spree/admin/shared/_product_tabs/add_digital_versions_to_admin_product_tabs.html.erb.deface @@ -1,5 +1,5 @@ -> - <%= link_to_with_icon 'cloud', I18n.t('spree.digitals.digital_versions'), admin_product_digitals_path(@product) %> - +<%= content_tag :li, class: ('active' if current == 'Digital Versions') do %> + <%= link_to t('spree.digitals.digital_versions'), admin_product_digitals_path(@product) %> +<% end if can?(:admin, Spree::Digital) %> diff --git a/app/views/spree/admin/digitals/_form.html.erb b/app/views/spree/admin/digitals/_form.html.erb index 80b2300..dc7ff62 100644 --- a/app/views/spree/admin/digitals/_form.html.erb +++ b/app/views/spree/admin/digitals/_form.html.erb @@ -18,7 +18,7 @@ <%= render digital %> <% if can?(:destroy, Spree::Digital) %> - <%= link_to_with_icon 'delete', I18n.t('spree.digitals.delete_file'), admin_product_digital_url(@product, digital), data: {confirm: I18n.t('spree.digitals.delete_file_confirmation', filename: digital.attachment_file_name)}, method: :delete, class: 'btn btn-danger btn-sm delete-resource' %> + <%= link_to_delete nil, url: admin_product_digital_url(@product, digital), no_text: true, confirm: I18n.t('spree.digitals.delete_file_confirmation', filename: digital.attachment_file_name) %> <% end %>