From 2888d75cd31c12d061b092dc4724ee0bcf38bf58 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Mon, 14 Jun 2021 13:04:36 +0100 Subject: [PATCH] Replace #image_tag helper calls with #image_pack_tag --- app/views/admin/enterprise_groups/_form_images.html.haml | 4 ++-- app/views/admin/producer_properties/_form.html.haml | 2 +- app/views/shared/menu/_mobile_menu.html.haml | 4 ++-- app/views/shop/products/_searchbar.haml | 2 +- app/views/spree/admin/images/edit.html.haml | 2 +- app/views/spree/admin/images/index.html.haml | 2 +- .../spree/admin/payments/source_forms/_gateway.html.haml | 2 +- app/views/spree/admin/product_properties/index.html.haml | 2 +- app/views/spree/admin/products/new.html.haml | 2 +- app/views/spree/admin/states/index.html.haml | 2 +- app/views/spree/admin/taxonomies/edit.haml | 2 +- app/views/spree/layouts/_admin_body.html.haml | 2 +- app/views/spree/layouts/bare_admin.html.haml | 2 +- app/views/spree/shared/_variant_thumbnail.html.haml | 4 ++-- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/views/admin/enterprise_groups/_form_images.html.haml b/app/views/admin/enterprise_groups/_form_images.html.haml index aa31913a20..07ccf462fd 100644 --- a/app/views/admin/enterprise_groups/_form_images.html.haml +++ b/app/views/admin/enterprise_groups/_form_images.html.haml @@ -6,7 +6,7 @@ %div{'ofn-with-tip' => t('admin_enterprise_groups_data_powertip_logo')} %a= t 'admin.whats_this' .omega.eight.columns - = image_tag @object.logo.url if @object.logo.present? + = image_pack_tag @object.logo.url if @object.logo.present? = f.file_field :logo .row .alpha.three.columns @@ -14,5 +14,5 @@ %div{'ofn-with-tip' => t('admin_enterprise_groups_data_powertip_promo_image')} %a= t 'admin.whats_this' .omega.eight.columns - = image_tag @object.promo_image.url if @object.promo_image.present? + = image_pack_tag @object.promo_image.url if @object.promo_image.present? = f.file_field :promo_image diff --git a/app/views/admin/producer_properties/_form.html.haml b/app/views/admin/producer_properties/_form.html.haml index 7af322557d..fa05e25b68 100644 --- a/app/views/admin/producer_properties/_form.html.haml +++ b/app/views/admin/producer_properties/_form.html.haml @@ -1,6 +1,6 @@ %fieldset.no-border-top .add_producer_properties{"data-hook" => "add_producer_properties"} - = image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' + = image_pack_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %table.index.sortable{"data-hook" => "", "data-sortable-link" => main_app.update_positions_admin_enterprise_producer_properties_url(@enterprise)} %thead %tr{"data-hook" => "producer_properties_header"} diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index 716db01f73..83c3d1c44d 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -1,7 +1,7 @@ %nav.tab-bar.show-for-medium-down %section.left %a.left-off-canvas-toggle.menu-icon - = image_tag "menu/btn-menu-mobile.png" + = image_pack_tag "menu/btn-menu-mobile.png" %section.left .ofn-logo @@ -14,7 +14,7 @@ %span = t '.cart' %span.count - = image_tag "menu/icn-cart.svg" + = image_pack_tag "menu/icn-cart.svg" %span {{ Cart.total_item_count() }} diff --git a/app/views/shop/products/_searchbar.haml b/app/views/shop/products/_searchbar.haml index bda087f4c7..a17db1e322 100644 --- a/app/views/shop/products/_searchbar.haml +++ b/app/views/shop/products/_searchbar.haml @@ -8,7 +8,7 @@ "ng-debounce" => "200", "disable-enter-with-blur" => true} %a.clear{type: 'button', ng: {show: 'query', click: 'clearQuery()'}, 'focus-search' => true} - = image_tag "icn-close.png" + = image_pack_tag "icn-close.png" .hide-for-large-up %button{type: 'button', ng: {click: 'toggleFilterSidebar()'}} diff --git a/app/views/spree/admin/images/edit.html.haml b/app/views/spree/admin/images/edit.html.haml index 4a7910a223..d54eaa34b7 100644 --- a/app/views/spree/admin/images/edit.html.haml +++ b/app/views/spree/admin/images/edit.html.haml @@ -11,7 +11,7 @@ .field.alpha.three.columns.align-center = f.label t('spree.thumbnail') %br/ - = link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) + = link_to image_pack_tag(@image.attachment.url(:small)), @image.attachment.url(:product) .nine.columns.omega = render partial: 'form', locals: { f: f } .clear diff --git a/app/views/spree/admin/images/index.html.haml b/app/views/spree/admin/images/index.html.haml index 7f777c573a..2d4d9a98ec 100644 --- a/app/views/spree/admin/images/index.html.haml +++ b/app/views/spree/admin/images/index.html.haml @@ -32,7 +32,7 @@ %td.no-border %span.handle %td - = link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) + = link_to image_pack_tag(image.attachment.url(:mini)), image.attachment.url(:product) %td= options_text_for(image) %td= image.alt %td.actions diff --git a/app/views/spree/admin/payments/source_forms/_gateway.html.haml b/app/views/spree/admin/payments/source_forms/_gateway.html.haml index ac88ecd047..ac20d73609 100644 --- a/app/views/spree/admin/payments/source_forms/_gateway.html.haml +++ b/app/views/spree/admin/payments/source_forms/_gateway.html.haml @@ -41,5 +41,5 @@ %a.info.cvvLink{href: "/content/cvv", target: "_blank"} (#{t(:what_is_this)}) .nine.columns - = image_tag 'credit_cards/credit_card.gif', class: 'credit-card-image' + = image_pack_tag 'credit_cards/credit_card.gif', class: 'credit-card-image' .clear diff --git a/app/views/spree/admin/product_properties/index.html.haml b/app/views/spree/admin/product_properties/index.html.haml index 2754133f0c..9763278f63 100644 --- a/app/views/spree/admin/product_properties/index.html.haml +++ b/app/views/spree/admin/product_properties/index.html.haml @@ -12,7 +12,7 @@ = form_for @product, url: admin_product_url(@product, @url_filters), method: :put do |f| %fieldset.no-border-top .add_product_properties - = image_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator' + = image_pack_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator' %table.index.sortable{"data-sortable-link" => update_positions_admin_product_product_properties_url} %thead diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml index 80ab5abfbf..ccf3b1339f 100644 --- a/app/views/spree/admin/products/new.html.haml +++ b/app/views/spree/admin/products/new.html.haml @@ -97,7 +97,7 @@ %fieldset.no-border-bottom{ id: "image" } %legend{align: "center"}= t(".image") .row - = image_tag "/noimage/product.png", class: "four columns alpha" + = image_pack_tag "/noimage/product.png", class: "four columns alpha" .row = f.fields_for 'images_attributes[]', f.object.images.build do |image_fields| = image_fields.file_field :attachment diff --git a/app/views/spree/admin/states/index.html.haml b/app/views/spree/admin/states/index.html.haml index 57035c79af..b9e72fa193 100644 --- a/app/views/spree/admin/states/index.html.haml +++ b/app/views/spree/admin/states/index.html.haml @@ -11,6 +11,6 @@ - databaseurl = "#{admin_states_path(format: :js)}?country_id=" %select#country.observe_field.select2.fullwidth{"data-base-url" => databaseurl, "data-update" => "#state-list"} = options_from_collection_for_select(@countries, :id, :name, @country.id) -= image_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator' += image_pack_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator' #state-list = render partial: 'state_list' diff --git a/app/views/spree/admin/taxonomies/edit.haml b/app/views/spree/admin/taxonomies/edit.haml index 7f37454aec..1f11fbb56c 100755 --- a/app/views/spree/admin/taxonomies/edit.haml +++ b/app/views/spree/admin/taxonomies/edit.haml @@ -21,7 +21,7 @@ Spree.routes.admin_taxonomy_taxons_path = "#{spree.admin_taxonomy_taxons_path(@taxonomy)}"; #taxonomy_tree.tree #progress{style: "display:none;"} - = image_tag 'select2-spinner.gif', title: 'Spinner', style: "vertical-align:bottom;" + = image_pack_tag 'select2-spinner.gif', title: 'Spinner', style: "vertical-align:bottom;" = t("spree.updating") \.. .info= t("spree.taxonomy_tree_instruction") diff --git a/app/views/spree/layouts/_admin_body.html.haml b/app/views/spree/layouts/_admin_body.html.haml index bc380b803c..7c64889aee 100644 --- a/app/views/spree/layouts/_admin_body.html.haml +++ b/app/views/spree/layouts/_admin_body.html.haml @@ -16,7 +16,7 @@ %header#header{"data-hook" => ""} .container %figure.columns.five{"data-hook" => "logo-wrapper"} - = link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_dashboard_path + = link_to image_pack_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_dashboard_path %nav.columns.eleven{"data-hook" => "admin_login_navigation_bar"} = render :partial => 'spree/layouts/admin/login_nav' diff --git a/app/views/spree/layouts/bare_admin.html.haml b/app/views/spree/layouts/bare_admin.html.haml index 085f5be86a..e37a84252a 100644 --- a/app/views/spree/layouts/bare_admin.html.haml +++ b/app/views/spree/layouts/bare_admin.html.haml @@ -12,7 +12,7 @@ %header#header{"data-hook" => ""} .container - %figure.columns.five{"data-hook" => "logo-wrapper"}= link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_dashboard_path + %figure.columns.five{"data-hook" => "logo-wrapper"}= link_to image_pack_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_dashboard_path %nav.columns.eleven{"data-hook" => "admin_login_navigation_bar"} = render partial: "spree/layouts/admin/login_nav" diff --git a/app/views/spree/shared/_variant_thumbnail.html.haml b/app/views/spree/shared/_variant_thumbnail.html.haml index 719725c927..813ea3a3d2 100644 --- a/app/views/spree/shared/_variant_thumbnail.html.haml +++ b/app/views/spree/shared/_variant_thumbnail.html.haml @@ -1,4 +1,4 @@ - if variant.product.images.length == 0 - = image_tag("/noimage/mini.png") + = image_pack_tag("/noimage/mini.png") - else - = image_tag(variant.product.images.first.attachment.url(:mini)) + = image_pack_tag(variant.product.images.first.attachment.url(:mini))