raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed transaltion or between buttons from multiple views

Browse Source
This commit is contained in:
Deepak Chauhan
2022-01-19 03:16:55 +05:30
parent 1ed5b3a3f6
commit 7adc1186c6
24 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/templates/admin/schedule_dialog.html.haml
View File

@@ -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()' } }

1
app/views/admin/contents/edit.html.haml
View File

@@ -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'

1
app/views/admin/customers/index.html.haml
View File

@@ -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' } }

1
app/views/admin/order_cycles/_advanced_settings.html.haml
View File

@@ -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)

2
app/views/admin/variant_overrides/_show_more.html.haml
View File

@@ -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' } }

1
app/views/spree/admin/adjustments/edit.html.haml
View File

@@ -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'

1
app/views/spree/admin/adjustments/new.html.haml
View File

@@ -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'

1
app/views/spree/admin/general_settings/edit.html.haml
View File

@@ -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'

1
app/views/spree/admin/images/edit.html.haml
View File

@@ -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'

1
app/views/spree/admin/images/new.html.haml
View File

@@ -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'

2
app/views/spree/admin/orders/_form.html.haml
View File

@@ -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

1
app/views/spree/admin/product_properties/index.html.haml
View File

@@ -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'

2
app/views/spree/admin/products/edit.html.haml
View File

@@ -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'

1
app/views/spree/admin/products/group_buy_options.html.haml
View File

@@ -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'

8
app/views/spree/admin/products/new.html.haml
View File

@@ -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'

1
app/views/spree/admin/products/seo.html.haml
View File

@@ -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'

1
app/views/spree/admin/return_authorizations/edit.html.haml
View File

@@ -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'

1
app/views/spree/admin/return_authorizations/new.html.haml
View File

@@ -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'

1
app/views/spree/admin/shared/_new_resource_links.html.haml
View File

@@ -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'

1
app/views/spree/admin/taxonomies/edit.haml
View File

@@ -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'

1
app/views/spree/admin/taxons/edit.html.haml
View File

@@ -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"

1
app/views/spree/admin/users/_api_fields.html.haml
View File

@@ -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

1
app/views/spree/admin/variants/edit.html.haml
View File

@@ -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'

1
app/views/spree/admin/variants/new.html.haml
View File

@@ -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'