From 7adc1186c6b4d676386f207e8e4a58bd49d3ea46 Mon Sep 17 00:00:00 2001 From: Deepak Chauhan Date: Wed, 19 Jan 2022 03:16:55 +0530 Subject: [PATCH] removed transaltion or between buttons from multiple views --- .../javascripts/templates/admin/schedule_dialog.html.haml | 1 - app/views/admin/contents/edit.html.haml | 1 - app/views/admin/customers/index.html.haml | 1 - app/views/admin/order_cycles/_advanced_settings.html.haml | 1 - app/views/admin/variant_overrides/_show_more.html.haml | 2 +- app/views/spree/admin/adjustments/edit.html.haml | 1 - app/views/spree/admin/adjustments/new.html.haml | 1 - app/views/spree/admin/general_settings/edit.html.haml | 1 - app/views/spree/admin/images/edit.html.haml | 1 - app/views/spree/admin/images/new.html.haml | 1 - app/views/spree/admin/orders/_form.html.haml | 2 -- app/views/spree/admin/product_properties/index.html.haml | 1 - app/views/spree/admin/products/edit.html.haml | 2 +- .../spree/admin/products/group_buy_options.html.haml | 1 - app/views/spree/admin/products/new.html.haml | 8 +++----- app/views/spree/admin/products/seo.html.haml | 1 - .../spree/admin/return_authorizations/edit.html.haml | 1 - app/views/spree/admin/return_authorizations/new.html.haml | 1 - .../spree/admin/shared/_new_resource_links.html.haml | 1 - app/views/spree/admin/taxonomies/edit.haml | 1 - app/views/spree/admin/taxons/edit.html.haml | 1 - app/views/spree/admin/users/_api_fields.html.haml | 1 - app/views/spree/admin/variants/edit.html.haml | 1 - app/views/spree/admin/variants/new.html.haml | 1 - 24 files changed, 5 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/templates/admin/schedule_dialog.html.haml b/app/assets/javascripts/templates/admin/schedule_dialog.html.haml index 1792c38a4f..421cf25d42 100644 --- a/app/assets/javascripts/templates/admin/schedule_dialog.html.haml +++ b/app/assets/javascripts/templates/admin/schedule_dialog.html.haml @@ -21,5 +21,4 @@ %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", ng: { show: 'schedule.id' } } %span{ ng: { show: 'schedule.id' } } or %input.button.red{ type: 'button', value: "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", ng: { show: 'schedule.id', click: 'delete()'} } - or %input.button{ type: 'button', value: "{{ 'actions.cancel' | t }}", ng: { click: 'close()' } } diff --git a/app/views/admin/contents/edit.html.haml b/app/views/admin/contents/edit.html.haml index 21ce8f52fd..0486990c18 100644 --- a/app/views/admin/contents/edit.html.haml +++ b/app/views/admin/contents/edit.html.haml @@ -10,5 +10,4 @@ .form-buttons.filter-actions.actions{"data-hook" => "buttons"} = button t(:update), 'icon-refresh' - %span.or= t(:or) = link_to_with_icon 'icon-remove', t(:cancel), main_app.edit_admin_contents_path, class: 'button' diff --git a/app/views/admin/customers/index.html.haml b/app/views/admin/customers/index.html.haml index 877e9a1d91..320a721f73 100644 --- a/app/views/admin/customers/index.html.haml +++ b/app/views/admin/customers/index.html.haml @@ -100,5 +100,4 @@ -# %show-more.text-center{ data: "filteredCustomers", limit: "customerLimit", increment: "20" } %div.text-center{ ng: { show: "filteredCustomers.length > customerLimit" } } %input{ type: 'button', value: t(:show_more), ng: { click: 'customerLimit = customerLimit + 20' } } - or %input{ type: 'button', value: t(:show_all_with_more, num: '{{ filteredCustomers.length - customerLimit }}'), ng: { click: 'customerLimit = filteredCustomers.length' } } diff --git a/app/views/admin/order_cycles/_advanced_settings.html.haml b/app/views/admin/order_cycles/_advanced_settings.html.haml index bf74af5c33..cc957b1d36 100644 --- a/app/views/admin/order_cycles/_advanced_settings.html.haml +++ b/app/views/admin/order_cycles/_advanced_settings.html.haml @@ -25,5 +25,4 @@ .row .sixteen.columns.alpha.omega.text-center %input{ type: 'submit', value: t('.save_reload') } - = t(:or) %a{ href: "#", onClick: "toggleSettings()" }= t(:close) diff --git a/app/views/admin/variant_overrides/_show_more.html.haml b/app/views/admin/variant_overrides/_show_more.html.haml index 5e8274d99c..2c2daacad6 100644 --- a/app/views/admin/variant_overrides/_show_more.html.haml +++ b/app/views/admin/variant_overrides/_show_more.html.haml @@ -1,5 +1,5 @@ -# %show-more.text-center{ data: "filteredProducts", limit: "productLimit", increment: "10" } .text-center{ ng: { show: "filteredProducts.length > productLimit" } } %input{ type: 'button', value: t(:show_more), ng: { click: 'productLimit = productLimit + 10' } } - = t(:or) + %input{ type: 'button', value: "#{t(:show_all)} ({{ filteredProducts.length - productLimit }} More)", ng: { click: 'productLimit = filteredProducts.length' } } diff --git a/app/views/spree/admin/adjustments/edit.html.haml b/app/views/spree/admin/adjustments/edit.html.haml index 756288c4f4..957f84c476 100644 --- a/app/views/spree/admin/adjustments/edit.html.haml +++ b/app/views/spree/admin/adjustments/edit.html.haml @@ -16,5 +16,4 @@ = render :partial => 'form', :locals => { :f => f } .filter-actions.actions{"data-hook" => "buttons"} = button Spree.t(:continue), 'icon-arrow-right' - %span.or= Spree.t(:or) = link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' diff --git a/app/views/spree/admin/adjustments/new.html.haml b/app/views/spree/admin/adjustments/new.html.haml index 2af33aae54..822af53609 100644 --- a/app/views/spree/admin/adjustments/new.html.haml +++ b/app/views/spree/admin/adjustments/new.html.haml @@ -15,5 +15,4 @@ = render :partial => 'form', :locals => { :f => f } .filter-actions.actions{"data-hook" => "buttons"} = button Spree.t(:continue), 'icon-arrow-right' - %span.or= Spree.t(:or) = button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'icon-remove' diff --git a/app/views/spree/admin/general_settings/edit.html.haml b/app/views/spree/admin/general_settings/edit.html.haml index f268a6fc96..ae21b3939b 100644 --- a/app/views/spree/admin/general_settings/edit.html.haml +++ b/app/views/spree/admin/general_settings/edit.html.haml @@ -95,5 +95,4 @@ .form-buttons.filter-actions.actions{"data-hook" => "buttons"} = button Spree.t('actions.update'), 'icon-refresh' - %span.or= Spree.t(:or) = link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' diff --git a/app/views/spree/admin/images/edit.html.haml b/app/views/spree/admin/images/edit.html.haml index 4a7910a223..49d1361daf 100644 --- a/app/views/spree/admin/images/edit.html.haml +++ b/app/views/spree/admin/images/edit.html.haml @@ -17,5 +17,4 @@ .clear .form-buttons.filter-actions.actions = button t('spree.actions.update'), 'icon-refresh' - %span.or= t('spree.or') = link_to t('spree.actions.cancel'), admin_product_images_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove' diff --git a/app/views/spree/admin/images/new.html.haml b/app/views/spree/admin/images/new.html.haml index 1b120d3f22..b2f2acf1d3 100644 --- a/app/views/spree/admin/images/new.html.haml +++ b/app/views/spree/admin/images/new.html.haml @@ -6,7 +6,6 @@ = render partial: 'form', locals: { f: f } .form-buttons.filter-actions.actions = button t('actions.create'), 'icon-ok' - %span.or= t('spree.or') = link_to_with_icon 'icon-remove', t('spree.actions.cancel'), admin_product_images_url(@product, @url_filters), id: 'cancel_link', class: 'button' = javascript_include_tag 'admin/spree/images/new.js' diff --git a/app/views/spree/admin/orders/_form.html.haml b/app/views/spree/admin/orders/_form.html.haml index 72dbf3d81b..047565d1e0 100644 --- a/app/views/spree/admin/orders/_form.html.haml +++ b/app/views/spree/admin/orders/_form.html.haml @@ -17,8 +17,6 @@ .filter-actions.actions{"ng-show" => "distributionChosen()"} = button t(:update_and_recalculate_fees), 'icon-refresh' - %span.or - = t(:or) = link_to_with_icon 'button icon-arrow-left', t(:back), spree.admin_orders_url = javascript_tag do diff --git a/app/views/spree/admin/product_properties/index.html.haml b/app/views/spree/admin/product_properties/index.html.haml index 9763278f63..12660fc2cd 100644 --- a/app/views/spree/admin/product_properties/index.html.haml +++ b/app/views/spree/admin/product_properties/index.html.haml @@ -48,7 +48,6 @@ .form-buttons.filter-actions.actions = button t('spree.actions.update'), 'icon-refresh' - %span.or= t('spree.or') = link_to t('spree.actions.cancel'), admin_product_product_properties_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove' = hidden_field_tag 'clear_product_properties', 'true' diff --git a/app/views/spree/admin/products/edit.html.haml b/app/views/spree/admin/products/edit.html.haml index 7a9a3e1670..6a5ccb4c21 100644 --- a/app/views/spree/admin/products/edit.html.haml +++ b/app/views/spree/admin/products/edit.html.haml @@ -15,5 +15,5 @@ = render :partial => 'form', :locals => { :f => f } .form-buttons.filter-actions.actions = button t(:update), 'icon-refresh' - %span.or= t(:or) + = button_link_to t(:cancel), "#{collection_url}#{(@url_filters.empty? ? "" : "#?#{@url_filters.to_query}")}", icon: 'icon-remove' diff --git a/app/views/spree/admin/products/group_buy_options.html.haml b/app/views/spree/admin/products/group_buy_options.html.haml index 7cc3348d66..cb9579a122 100644 --- a/app/views/spree/admin/products/group_buy_options.html.haml +++ b/app/views/spree/admin/products/group_buy_options.html.haml @@ -7,5 +7,4 @@ = render partial: 'group_buy_form', locals: { f: f } .form-buttons.filter-actions.actions = button t('spree.actions.update'), 'icon-refresh' - %span.or= t('spree.or') = link_to t('spree.actions.cancel'), edit_admin_product_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove' diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml index 80ab5abfbf..4e0ea2b7c5 100644 --- a/app/views/spree/admin/products/new.html.haml +++ b/app/views/spree/admin/products/new.html.haml @@ -59,7 +59,7 @@ %question-mark-with-tooltip{"question-mark-with-tooltip" => "_", "question-mark-with-tooltip-append-to-body" => "true", "question-mark-with-tooltip-placement" => "top", - "question-mark-with-tooltip-animation" => true, + "question-mark-with-tooltip-animation" => true, key: "'js.admin.unit_price_tooltip'"} %input{ "type" => "text", "id" => "product_unit_price", "name" => "product[unit_price]", "class" => 'fullwidth', "disabled" => true, "ng-model" => "unit_price"} @@ -104,11 +104,9 @@ .sixteen.columns.alpha .form-buttons.filter-actions.actions = button t('actions.create'), 'icon-ok', :submit, value: "create" - %span.or - = t(".or") + = button t('actions.create_and_add_another'), 'icon-repeat', :submit, value: 'add_another' - %span.or - = t(".or") + = link_to_with_icon 'icon-remove', t('actions.cancel'), admin_products_path, :class => 'button' diff --git a/app/views/spree/admin/products/seo.html.haml b/app/views/spree/admin/products/seo.html.haml index 40172c7c95..a2618e3265 100644 --- a/app/views/spree/admin/products/seo.html.haml +++ b/app/views/spree/admin/products/seo.html.haml @@ -8,5 +8,4 @@ = render :partial => 'seo_form', :locals => { :f => f } .form-buttons.filter-actions.actions = button t('spree.actions.update'), 'icon-refresh' - %span.or= t('spree.or') = link_to t('spree.actions.cancel'), edit_admin_product_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove' diff --git a/app/views/spree/admin/return_authorizations/edit.html.haml b/app/views/spree/admin/return_authorizations/edit.html.haml index 9f5429640d..71c32c0ab3 100644 --- a/app/views/spree/admin/return_authorizations/edit.html.haml +++ b/app/views/spree/admin/return_authorizations/edit.html.haml @@ -22,5 +22,4 @@ = render partial: 'form', locals: { f: f } .form-buttons.filter-actions.actions = button t('actions.update'), 'icon-repeat' - %span.or= t(:or) = button_link_to t('actions.cancel'), admin_order_return_authorizations_url(@order), icon: 'icon-remove' diff --git a/app/views/spree/admin/return_authorizations/new.html.haml b/app/views/spree/admin/return_authorizations/new.html.haml index 5594288cf3..20c582dcd9 100644 --- a/app/views/spree/admin/return_authorizations/new.html.haml +++ b/app/views/spree/admin/return_authorizations/new.html.haml @@ -15,5 +15,4 @@ = render partial: 'form', locals: { f: f } .form-buttons.filter-actions.actions = button t('.continue'), 'icon-arrow-right' - %span.or= t(:or) = button_link_to t('actions.cancel'), admin_order_return_authorizations_url(@order), icon: 'icon-remove' diff --git a/app/views/spree/admin/shared/_new_resource_links.html.haml b/app/views/spree/admin/shared/_new_resource_links.html.haml index ede33d407d..e58c0ca14d 100644 --- a/app/views/spree/admin/shared/_new_resource_links.html.haml +++ b/app/views/spree/admin/shared/_new_resource_links.html.haml @@ -1,4 +1,3 @@ .form-buttons.filter-actions.actions = button t('actions.create'), 'icon-ok' - %span.or= t(:or) = button_link_to t('actions.cancel'), collection_url, icon: 'icon-remove' diff --git a/app/views/spree/admin/taxonomies/edit.haml b/app/views/spree/admin/taxonomies/edit.haml index 1f11fbb56c..6e0f331e02 100755 --- a/app/views/spree/admin/taxonomies/edit.haml +++ b/app/views/spree/admin/taxonomies/edit.haml @@ -28,5 +28,4 @@ %br/ .filter-actions.actions = button t('spree.actions.update'), 'icon-refresh' - %span.or= t("spree.or") = button_link_to t('spree.actions.cancel'), admin_taxonomies_path, icon: 'icon-remove' diff --git a/app/views/spree/admin/taxons/edit.html.haml b/app/views/spree/admin/taxons/edit.html.haml index 7e1e0a45e4..efb5c29e91 100644 --- a/app/views/spree/admin/taxons/edit.html.haml +++ b/app/views/spree/admin/taxons/edit.html.haml @@ -13,5 +13,4 @@ = render partial: 'form', locals: { f: f } .form-buttons = button t('spree.actions.update'), 'icon-refresh' - = t("spree.or") = button_link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "icon-remove" diff --git a/app/views/spree/admin/users/_api_fields.html.haml b/app/views/spree/admin/users/_api_fields.html.haml index 9f27251cca..bd4bf6eb3f 100644 --- a/app/views/spree/admin/users/_api_fields.html.haml +++ b/app/views/spree/admin/users/_api_fields.html.haml @@ -8,7 +8,6 @@ .filter-actions.actions = form_tag spree.clear_api_key_admin_user_path(@user), method: :put do = button t('spree.api.clear_key'), 'icon-trash' - %span.or= t(:or) = form_tag spree.generate_api_key_admin_user_path(@user), method: :put do = button t('spree.api.regenerate_key'), 'icon-refresh' - else diff --git a/app/views/spree/admin/variants/edit.html.haml b/app/views/spree/admin/variants/edit.html.haml index ba8d63ea20..c29771455d 100644 --- a/app/views/spree/admin/variants/edit.html.haml +++ b/app/views/spree/admin/variants/edit.html.haml @@ -12,5 +12,4 @@ = render partial: 'form', locals: { f: f } .form-buttons.filter-actions.actions = button t(:update), 'icon-refresh' - %span.or= t(:or) = button_link_to t(:cancel), collection_url(@url_filters), icon: 'icon-remove' diff --git a/app/views/spree/admin/variants/new.html.haml b/app/views/spree/admin/variants/new.html.haml index 824741715d..7df8311330 100644 --- a/app/views/spree/admin/variants/new.html.haml +++ b/app/views/spree/admin/variants/new.html.haml @@ -9,5 +9,4 @@ .form-buttons.filter-actions.actions = button t('actions.create'), 'icon-ok' - %span.or= t(:or) = button_link_to t('actions.cancel'), collection_url(@url_filters), icon: 'icon-remove'