From 252ce6859d956077ef7c77855019d91d9550fb62 Mon Sep 17 00:00:00 2001 From: Alberto Vena <kennyadsl@gmail.com> Date: Sat, 30 Jul 2016 14:19:02 +0200 Subject: [PATCH] Remove remaining icons from backend buttons and tabs - remove icons from products, orders and users edit tabs - remove plus icon form line item autocomplete hbs template - remove order actions icons - remove search, plus, ok, refresh, trash, key, arrows, reply, rocket, ban, repeat, remove, archive, email, froward, truck, globe - leave icons when needed (buttons have no text) --- .../line_items_autocomplete_stock.hbs | 2 +- .../spree/admin/adjustments/edit.html.erb | 4 ++-- .../spree/admin/adjustments/index.html.erb | 2 +- .../spree/admin/adjustments/new.html.erb | 4 ++-- .../_return_item_decision.html.erb | 2 +- .../admin/customer_returns/edit.html.erb | 2 +- .../admin/customer_returns/index.html.erb | 2 +- .../spree/admin/customer_returns/new.html.erb | 4 ++-- .../admin/general_settings/edit.html.erb | 4 ++-- .../views/spree/admin/images/edit.html.erb | 4 ++-- .../app/views/spree/admin/images/new.html.erb | 6 +++--- .../spree/admin/log_entries/index.html.erb | 4 ++-- .../views/spree/admin/orders/cart.html.erb | 2 +- .../views/spree/admin/orders/confirm.html.erb | 2 +- .../admin/orders/confirm_advance.html.erb | 2 +- .../orders/customer_details/_form.html.erb | 2 +- .../orders/customer_details/show.html.erb | 2 +- .../views/spree/admin/orders/edit.html.erb | 2 +- .../views/spree/admin/orders/index.html.erb | 2 +- .../spree/admin/payment_methods/edit.html.erb | 2 +- .../spree/admin/payment_methods/new.html.erb | 2 +- .../views/spree/admin/payments/new.html.erb | 2 +- .../views/spree/admin/payments/show.html.erb | 2 +- .../views/spree/admin/prices/index.html.erb | 4 ++-- .../views/spree/admin/products/index.html.erb | 2 +- .../spree/admin/promotions/_actions.html.erb | 4 ++-- .../spree/admin/promotions/_rules.html.erb | 4 ++-- .../tiered_flat_rate/_fields.html.erb | 2 +- .../tiered_percent/_fields.html.erb | 2 +- .../spree/admin/promotions/edit.html.erb | 2 +- .../spree/admin/promotions/index.html.erb | 2 +- .../promotions/rules/_option_value.html.erb | 2 +- .../spree/admin/properties/index.html.erb | 2 +- .../admin/prototypes/_prototypes.html.erb | 2 +- .../views/spree/admin/refunds/edit.html.erb | 4 ++-- .../views/spree/admin/refunds/new.html.erb | 4 ++-- .../spree/admin/reimbursements/edit.html.erb | 6 +++--- .../spree/admin/reimbursements/index.html.erb | 2 +- .../spree/admin/reimbursements/show.html.erb | 2 +- .../admin/return_authorizations/edit.html.erb | 6 +++--- .../admin/return_authorizations/new.html.erb | 4 ++-- .../shared/_edit_resource_links.html.erb | 4 ++-- .../admin/shared/_new_resource_links.html.erb | 4 ++-- .../admin/shared/_order_submenu.html.erb | 20 +++++++++---------- .../spree/admin/shared/_product_tabs.html.erb | 12 +++++------ .../admin/shared/_report_criteria.html.erb | 4 ++-- .../shared/_report_order_criteria.html.erb | 4 ++-- .../admin/shared/_variant_search.html.erb | 2 +- .../_transfer_stock_form.html.erb | 4 ++-- .../admin/stock_locations/index.html.erb | 2 +- .../admin/stock_movements/index.html.erb | 2 +- .../spree/admin/stock_transfers/edit.html.erb | 3 +-- .../admin/stock_transfers/index.html.erb | 2 +- .../spree/admin/stock_transfers/new.html.erb | 4 ++-- .../admin/stock_transfers/receive.html.erb | 3 +-- .../spree/admin/stock_transfers/show.html.erb | 2 +- .../stock_transfers/tracking_info.html.erb | 3 +-- .../store_credits/edit_validity.html.erb | 4 ++-- .../spree/admin/store_credits/index.html.erb | 2 +- .../topics/typography/_icons.html.erb | 4 ++-- .../app/views/spree/admin/taxonomies/edit.erb | 6 +++--- .../views/spree/admin/taxonomies/new.html.erb | 2 +- .../views/spree/admin/taxons/edit.html.erb | 6 +++--- .../views/spree/admin/users/_tabs.html.erb | 10 +++++----- .../app/views/spree/admin/users/edit.html.erb | 6 +++--- .../views/spree/admin/users/index.html.erb | 2 +- .../views/spree/admin/variants/index.html.erb | 9 ++++----- .../admin/orders/customer_details_spec.rb | 2 +- .../features/admin/orders/new_order_spec.rb | 10 +++++----- .../admin/orders/order_details_spec.rb | 4 ++-- .../features/admin/products/products_spec.rb | 10 +++++----- .../admin/products/properties_spec.rb | 2 +- 72 files changed, 134 insertions(+), 138 deletions(-) diff --git a/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs b/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs index c582e0f78fc..3f56e20bd90 100644 --- a/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs +++ b/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs @@ -61,7 +61,7 @@ <fieldset class="no-border-bottom"> <legend align="center" class="stock-location"> - <button class="add_variant no-text fa fa-plus icon_link" title="{{ t "add" }}" data-action="add">{{ t "add" }}</button> + <button class="add_variant" title="{{ t "add" }}" data-action="add">{{ t "add" }}</button> </legend> </fieldset> </fieldset> diff --git a/backend/app/views/spree/admin/adjustments/edit.html.erb b/backend/app/views/spree/admin/adjustments/edit.html.erb index 7cf4a8350d1..8e7cc4b7426 100644 --- a/backend/app/views/spree/admin/adjustments/edit.html.erb +++ b/backend/app/views/spree/admin/adjustments/edit.html.erb @@ -12,8 +12,8 @@ <%= render :partial => 'form', :locals => { :f => f } %> <div class="filter-actions actions" data-hook="buttons"> - <%= button Spree.t(:continue), 'arrow-right' %> - <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %> + <%= button Spree.t(:continue) %> + <%= link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/adjustments/index.html.erb b/backend/app/views/spree/admin/adjustments/index.html.erb index df1d9857027..7b396b30695 100644 --- a/backend/app/views/spree/admin/adjustments/index.html.erb +++ b/backend/app/views/spree/admin/adjustments/index.html.erb @@ -15,7 +15,7 @@ <% if @order.can_add_coupon? %> <div data-hook="adjustments_new_coupon_code"> <%= text_field_tag "coupon_code", "", :placeholder => Spree.t(:coupon_code) %> - <%= button Spree.t(:add_coupon_code), 'plus', 'submit', :id => "add_coupon_code" %> + <%= button Spree.t(:add_coupon_code), nil, 'submit', :id => "add_coupon_code" %> </div> <% end %> <%= javascript_tag do -%> diff --git a/backend/app/views/spree/admin/adjustments/new.html.erb b/backend/app/views/spree/admin/adjustments/new.html.erb index 041113460b7..2ae472d46ac 100644 --- a/backend/app/views/spree/admin/adjustments/new.html.erb +++ b/backend/app/views/spree/admin/adjustments/new.html.erb @@ -14,8 +14,8 @@ <%= render :partial => 'form', :locals => { :f => f } %> <div class="filter-actions actions" data-hook="buttons"> - <%= button Spree.t(:continue), 'arrow-right' %> - <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'remove' %> + <%= button Spree.t(:continue) %> + <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order) %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb b/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb index fe4271d8d7c..2034d7517f5 100644 --- a/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +++ b/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb @@ -45,7 +45,7 @@ <td class='align-center'> <%= form_for [:admin, return_item] do |f| %> <%= f.hidden_field 'reception_status_event', value: 'receive' %> - <%= f.button Spree.t('actions.receive'), class: 'fa icon_link no-text with-tip', "data-action" => 'save' %> + <%= f.button Spree.t('actions.receive'), class: 'with-tip', "data-action" => 'save' %> <% end %> </td> <% end %> diff --git a/backend/app/views/spree/admin/customer_returns/edit.html.erb b/backend/app/views/spree/admin/customer_returns/edit.html.erb index b3cd3e5863d..6254f221337 100644 --- a/backend/app/views/spree/admin/customer_returns/edit.html.erb +++ b/backend/app/views/spree/admin/customer_returns/edit.html.erb @@ -39,7 +39,7 @@ <% if @customer_return.completely_decided? %> <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %> <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %> - <%= f.button class: 'button fa fa-reply' do %> + <%= f.button class: 'button' do %> <%= Spree.t(:create_reimbursement) %> <% end %> <% end %> diff --git a/backend/app/views/spree/admin/customer_returns/index.html.erb b/backend/app/views/spree/admin/customer_returns/index.html.erb index b3b0a1d81a9..f9e5e928429 100644 --- a/backend/app/views/spree/admin/customer_returns/index.html.erb +++ b/backend/app/views/spree/admin/customer_returns/index.html.erb @@ -3,7 +3,7 @@ <% content_for :page_actions do %> <% if can? :create, Spree::CustomerReturn %> <li> - <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'plus' %> + <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order) %> </li> <% end %> <% end %> diff --git a/backend/app/views/spree/admin/customer_returns/new.html.erb b/backend/app/views/spree/admin/customer_returns/new.html.erb index 56a4b43b775..9e37e3f2e24 100644 --- a/backend/app/views/spree/admin/customer_returns/new.html.erb +++ b/backend/app/views/spree/admin/customer_returns/new.html.erb @@ -40,8 +40,8 @@ </div> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.create'), 'ok' %> - <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order), :icon => 'remove' %> + <%= button Spree.t('actions.create') %> + <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order) %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/general_settings/edit.html.erb b/backend/app/views/spree/admin/general_settings/edit.html.erb index 7526f34ac08..564b3d17b08 100644 --- a/backend/app/views/spree/admin/general_settings/edit.html.erb +++ b/backend/app/views/spree/admin/general_settings/edit.html.erb @@ -60,8 +60,8 @@ <% if can? :update, :general_settings %> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.update'), 'refresh' %> - <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %> + <%= button Spree.t('actions.update') %> + <%= link_to Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %> </div> <% end %> diff --git a/backend/app/views/spree/admin/images/edit.html.erb b/backend/app/views/spree/admin/images/edit.html.erb index 4e774ef0fe0..95ee08986bb 100644 --- a/backend/app/views/spree/admin/images/edit.html.erb +++ b/backend/app/views/spree/admin/images/edit.html.erb @@ -7,7 +7,7 @@ <% content_for :page_actions do %> - <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product), :icon => 'arrow-left' %></li> + <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product) %></li> <% end %> <%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %> @@ -22,7 +22,7 @@ </div> <div class="clear"></div> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.update'), 'refresh' %> + <%= button Spree.t('actions.update') %> <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button remove' %> </div> </fieldset> diff --git a/backend/app/views/spree/admin/images/new.html.erb b/backend/app/views/spree/admin/images/new.html.erb index 0dc8387441c..2f5295eaf0d 100644 --- a/backend/app/views/spree/admin/images/new.html.erb +++ b/backend/app/views/spree/admin/images/new.html.erb @@ -3,10 +3,10 @@ <legend align="center"><%= Spree.t(:new_image) %></legend> <%= render :partial => 'form', :locals => { :f => f } %> - + <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.update'), 'refresh' %> - <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %> + <%= button Spree.t('actions.update') %> + <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/log_entries/index.html.erb b/backend/app/views/spree/admin/log_entries/index.html.erb index 316f9cf8db6..dd87493a8a3 100644 --- a/backend/app/views/spree/admin/log_entries/index.html.erb +++ b/backend/app/views/spree/admin/log_entries/index.html.erb @@ -4,8 +4,8 @@ <% admin_breadcrumb(plural_resource_name(Spree::LogEntry)) %> <% content_for :page_actions do %> - <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'archive' %></li> - <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment), :icon => 'arrow-left' %></li> + <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment) %></li> + <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment) %></li> <% end %> <table class='index' id='listing_log_entries'> diff --git a/backend/app/views/spree/admin/orders/cart.html.erb b/backend/app/views/spree/admin/orders/cart.html.erb index 4ff3c6ead2c..209b4a3c64d 100644 --- a/backend/app/views/spree/admin/orders/cart.html.erb +++ b/backend/app/views/spree/admin/orders/cart.html.erb @@ -3,7 +3,7 @@ <li><%= event_links %></li> <% end %> <% if can?(:resend, @order) && @order.completed? %> - <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'email' %></li> + <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post %></li> <% end %> <% end %> diff --git a/backend/app/views/spree/admin/orders/confirm.html.erb b/backend/app/views/spree/admin/orders/confirm.html.erb index e64b8a0cdeb..31f035b7eac 100644 --- a/backend/app/views/spree/admin/orders/confirm.html.erb +++ b/backend/app/views/spree/admin/orders/confirm.html.erb @@ -54,7 +54,7 @@ <%= render partial: 'spree/admin/orders/confirm/payments', locals: {payments: @order.payments} %> <div class="form-buttons filter-actions actions" data-hook="complete-order-button"> - <%= button_to [:complete, :admin, @order], {class: 'button fa fa-rocket', method: 'put'} do %> + <%= button_to [:complete, :admin, @order], { class: 'button', method: 'put' } do %> <%= Spree.t(:complete_order) %> <% end %> </div> diff --git a/backend/app/views/spree/admin/orders/confirm_advance.html.erb b/backend/app/views/spree/admin/orders/confirm_advance.html.erb index 1e4fe57f348..f17f16d99d3 100644 --- a/backend/app/views/spree/admin/orders/confirm_advance.html.erb +++ b/backend/app/views/spree/admin/orders/confirm_advance.html.erb @@ -5,7 +5,7 @@ <div class="form-buttons filter-actions actions" data-hook="complete-order-button"> <div><%= Spree.t(:order_please_refresh) %></div><br/> - <%= button_to [:advance, :admin, @order], {class: 'button fa fa-refresh', method: 'put'} do %> + <%= button_to [:advance, :admin, @order], { class: 'button', method: 'put' } do %> <%= Spree.t(:order_refresh_totals) %> <% end %> </div> diff --git a/backend/app/views/spree/admin/orders/customer_details/_form.html.erb b/backend/app/views/spree/admin/orders/customer_details/_form.html.erb index de0a0af31e3..c8c063f3215 100644 --- a/backend/app/views/spree/admin/orders/customer_details/_form.html.erb +++ b/backend/app/views/spree/admin/orders/customer_details/_form.html.erb @@ -68,6 +68,6 @@ <div class="clear"></div> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.update'), 'refresh' %> + <%= button Spree.t('actions.update') %> </div> </fieldset> diff --git a/backend/app/views/spree/admin/orders/customer_details/show.html.erb b/backend/app/views/spree/admin/orders/customer_details/show.html.erb index bbf5f5e3f9e..0fbdda442ec 100644 --- a/backend/app/views/spree/admin/orders/customer_details/show.html.erb +++ b/backend/app/views/spree/admin/orders/customer_details/show.html.erb @@ -4,7 +4,7 @@ <% content_for :page_actions do %> - <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li> + <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path %></li> <% end %> diff --git a/backend/app/views/spree/admin/orders/edit.html.erb b/backend/app/views/spree/admin/orders/edit.html.erb index 0c2a766e817..a7129f750d3 100644 --- a/backend/app/views/spree/admin/orders/edit.html.erb +++ b/backend/app/views/spree/admin/orders/edit.html.erb @@ -3,7 +3,7 @@ <li><%= event_links %></li> <% end %> <% if can?(:resend, @order) && @order.completed? %> - <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post, icon: 'email' %></li> + <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post %></li> <% end %> <% end %> diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erb index a7327a99e6f..ed1fe9cdef3 100644 --- a/backend/app/views/spree/admin/orders/index.html.erb +++ b/backend/app/views/spree/admin/orders/index.html.erb @@ -95,7 +95,7 @@ <div class="actions filter-actions"> <div data-hook="admin_orders_index_search_buttons"> - <%= button Spree.t(:filter_results), 'search' %> + <%= button Spree.t(:filter_results) %> </div> </div> <% end %> diff --git a/backend/app/views/spree/admin/payment_methods/edit.html.erb b/backend/app/views/spree/admin/payment_methods/edit.html.erb index 912b6c165e5..a2689a168ee 100644 --- a/backend/app/views/spree/admin/payment_methods/edit.html.erb +++ b/backend/app/views/spree/admin/payment_methods/edit.html.erb @@ -14,7 +14,7 @@ <fieldset class="no-border-top"> <%= render :partial => 'form', :locals => { :f => f } %> <div data-hook="buttons" class="filter-actions actions"> - <%= button Spree.t('actions.update'), 'refresh' %> + <%= button Spree.t('actions.update') %> </div> </fieldset> diff --git a/backend/app/views/spree/admin/payment_methods/new.html.erb b/backend/app/views/spree/admin/payment_methods/new.html.erb index fb6adac6378..82375fd8ff9 100644 --- a/backend/app/views/spree/admin/payment_methods/new.html.erb +++ b/backend/app/views/spree/admin/payment_methods/new.html.erb @@ -15,7 +15,7 @@ <fieldset class="no-border-top"> <%= render :partial => 'form', :locals => { :f => f } %> <div data-hook="buttons" class="filter-actions actions"> - <%= button Spree.t('actions.create'), 'ok' %> + <%= button Spree.t('actions.create') %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/payments/new.html.erb b/backend/app/views/spree/admin/payments/new.html.erb index c9024a1ef88..eff1b2f1d5d 100644 --- a/backend/app/views/spree/admin/payments/new.html.erb +++ b/backend/app/views/spree/admin/payments/new.html.erb @@ -15,7 +15,7 @@ <%= render :partial => 'form', :locals => { :f => f } %> <div class="filter-actions actions" data-hook="buttons"> - <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? 'arrow-right' : 'refresh' %> + <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update') %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/payments/show.html.erb b/backend/app/views/spree/admin/payments/show.html.erb index 9d50a433d7f..d198c9833d1 100644 --- a/backend/app/views/spree/admin/payments/show.html.erb +++ b/backend/app/views/spree/admin/payments/show.html.erb @@ -10,7 +10,7 @@ <% content_for :page_actions do %> - <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'archive' %></li> + <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment) %></li> <% end %> <%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}", :locals => { :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %> diff --git a/backend/app/views/spree/admin/prices/index.html.erb b/backend/app/views/spree/admin/prices/index.html.erb index 6745258d109..d8387f2767b 100644 --- a/backend/app/views/spree/admin/prices/index.html.erb +++ b/backend/app/views/spree/admin/prices/index.html.erb @@ -2,7 +2,7 @@ <% content_for :page_actions do %> <li id="new_price_link"> - <%= button_link_to t(".new_price"), new_object_url, { :remote => true, :icon => 'plus', :id => 'admin_new_product' } %> + <%= button_link_to t(".new_price"), new_object_url, { :remote => true, :id => 'admin_new_product' } %> </li> <% end if can?(:create, Spree::Product) %> @@ -62,7 +62,7 @@ <div class="actions filter-actions"> <div data-hook="admin_orders_index_search_buttons"> - <%= button Spree.t(:filter_results), 'search' %> + <%= button Spree.t(:filter_results) %> </div> </div> diff --git a/backend/app/views/spree/admin/products/index.html.erb b/backend/app/views/spree/admin/products/index.html.erb index afac8e90abe..953455b6b2d 100644 --- a/backend/app/views/spree/admin/products/index.html.erb +++ b/backend/app/views/spree/admin/products/index.html.erb @@ -36,7 +36,7 @@ </div> <div class="actions filter-actions" data-hook="admin_products_index_search_buttons"> - <%= button Spree.t(:search), 'search' %> + <%= button Spree.t(:search) %> </div> <% end %> </div> diff --git a/backend/app/views/spree/admin/promotions/_actions.html.erb b/backend/app/views/spree/admin/promotions/_actions.html.erb index 732fe20cf27..273411aea03 100644 --- a/backend/app/views/spree/admin/promotions/_actions.html.erb +++ b/backend/app/views/spree/admin/promotions/_actions.html.erb @@ -10,7 +10,7 @@ <%= select_tag 'action_type', options, :class => 'select2 fullwidth' %> </div> <div class="filter-actions actions"> - <%= button Spree.t('actions.add'), 'plus' %> + <%= button Spree.t('actions.add') %> </div> <% end %> </fieldset> @@ -28,7 +28,7 @@ </div> <% if can?(:update, @promotion) %> <div class="filter-actions actions promotion-update"> - <%= button Spree.t('actions.update'), 'refresh' %> + <%= button Spree.t('actions.update') %> </div> <% end %> <% end %> diff --git a/backend/app/views/spree/admin/promotions/_rules.html.erb b/backend/app/views/spree/admin/promotions/_rules.html.erb index cc1f7a6c6e4..761f3f5f3db 100644 --- a/backend/app/views/spree/admin/promotions/_rules.html.erb +++ b/backend/app/views/spree/admin/promotions/_rules.html.erb @@ -10,7 +10,7 @@ <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %> </div> <div class="filter-actions actions"> - <%= button Spree.t('actions.add'), 'plus' %> + <%= button Spree.t('actions.add') %> </div> <% end %> </fieldset> @@ -39,7 +39,7 @@ <% if can?(:update, @promotion) %> <div class="promotion-update filter-actions actions"> - <%= button Spree.t('actions.update'), 'refresh' %> + <%= button Spree.t('actions.update') %> </div> <% end %> </fieldset> diff --git a/backend/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb b/backend/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb index 82760537a8e..c8376bf2d3a 100644 --- a/backend/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +++ b/backend/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb @@ -11,4 +11,4 @@ 'form-prefix' => prefix, 'calculator' => 'tiered_flat_rate' } %> -<button class="fa fa-plus button js-add-tier"><%= Spree.t('actions.add') %></button> +<button class="button js-add-tier"><%= Spree.t('actions.add') %></button> diff --git a/backend/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb b/backend/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb index 568ed7ad329..7e2e773be6c 100644 --- a/backend/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +++ b/backend/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb @@ -11,4 +11,4 @@ 'form-prefix' => prefix, 'calculator' => 'tiered_percent' } %> -<button class="fa fa-plus button js-add-tier"><%= Spree.t('actions.add') %></button> +<button class="button js-add-tier"><%= Spree.t('actions.add') %></button> diff --git a/backend/app/views/spree/admin/promotions/edit.html.erb b/backend/app/views/spree/admin/promotions/edit.html.erb index 801e5ea42ba..87ce84c55c6 100644 --- a/backend/app/views/spree/admin/promotions/edit.html.erb +++ b/backend/app/views/spree/admin/promotions/edit.html.erb @@ -5,7 +5,7 @@ <% content_for :page_actions do %> <li> <% if can?(:display, Spree::PromotionCode) %> - <%= button_link_to Spree.t(:download_promotion_code_list), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), :icon => 'arrow-down' %> + <%= button_link_to Spree.t(:download_promotion_code_list), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv) %> <% end %> </li> <% end %> diff --git a/backend/app/views/spree/admin/promotions/index.html.erb b/backend/app/views/spree/admin/promotions/index.html.erb index bb0015e69ba..49b973dfa73 100644 --- a/backend/app/views/spree/admin/promotions/index.html.erb +++ b/backend/app/views/spree/admin/promotions/index.html.erb @@ -47,7 +47,7 @@ <div class="actions filter-actions"> <div data-hook="admin_promotions_index_search_buttons"> - <%= button Spree.t(:filter_results), 'search' %> + <%= button Spree.t(:filter_results) %> </div> </div> <% end %> diff --git a/backend/app/views/spree/admin/promotions/rules/_option_value.html.erb b/backend/app/views/spree/admin/promotions/rules/_option_value.html.erb index 0c3a888f179..4d22b66e121 100644 --- a/backend/app/views/spree/admin/promotions/rules/_option_value.html.erb +++ b/backend/app/views/spree/admin/promotions/rules/_option_value.html.erb @@ -6,7 +6,7 @@ <div class="js-promo-rule-option-values"></div> - <button class="fa fa-plus button js-add-promo-rule-option-value"><%= Spree.t('actions.add') %></button> + <button class="button js-add-promo-rule-option-value"><%= Spree.t('actions.add') %></button> </div> <%= content_tag :div, nil, class: "hidden js-original-promo-rule-option-values", diff --git a/backend/app/views/spree/admin/properties/index.html.erb b/backend/app/views/spree/admin/properties/index.html.erb index f17e1762a06..9d55ced1005 100644 --- a/backend/app/views/spree/admin/properties/index.html.erb +++ b/backend/app/views/spree/admin/properties/index.html.erb @@ -33,7 +33,7 @@ <div class="clear"></div> <div class="form-buttons actions filter-actions" data-hook="admin_pproperties_index_search_buttons"> - <%= button Spree.t(:search), 'search' %> + <%= button Spree.t(:search) %> </div> <% end %> </div> diff --git a/backend/app/views/spree/admin/prototypes/_prototypes.html.erb b/backend/app/views/spree/admin/prototypes/_prototypes.html.erb index a2c10d11797..abf54083e9b 100644 --- a/backend/app/views/spree/admin/prototypes/_prototypes.html.erb +++ b/backend/app/views/spree/admin/prototypes/_prototypes.html.erb @@ -14,7 +14,7 @@ <tr id="row_<%= prototype.id %>" data-hook="available_row" class="<%= cycle('odd', 'even')%>"> <td><%= prototype.name %></td> <td class="actions"> - <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), class: 'ajax button select_properties_from_prototype fa fa-ok', data: { remote: true } %> + <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), class: 'ajax button select_properties_from_prototype', data: { remote: true } %> </td> </tr> <% end %> diff --git a/backend/app/views/spree/admin/refunds/edit.html.erb b/backend/app/views/spree/admin/refunds/edit.html.erb index c0f52bef949..231a5408619 100644 --- a/backend/app/views/spree/admin/refunds/edit.html.erb +++ b/backend/app/views/spree/admin/refunds/edit.html.erb @@ -22,8 +22,8 @@ </div> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.save'), 'ok' %> - <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), icon: 'remove' %> + <%= button Spree.t('actions.save') %> + <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order) %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/refunds/new.html.erb b/backend/app/views/spree/admin/refunds/new.html.erb index 11379d82d0c..abdcca53438 100644 --- a/backend/app/views/spree/admin/refunds/new.html.erb +++ b/backend/app/views/spree/admin/refunds/new.html.erb @@ -35,8 +35,8 @@ </div> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree::Refund.model_name.human, 'ok' %> - <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), icon: 'remove' %> + <%= button Spree::Refund.model_name.human %> + <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order) %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/reimbursements/edit.html.erb b/backend/app/views/spree/admin/reimbursements/edit.html.erb index 855b93fa60d..9cf0dd3e12b 100644 --- a/backend/app/views/spree/admin/reimbursements/edit.html.erb +++ b/backend/app/views/spree/admin/reimbursements/edit.html.erb @@ -4,7 +4,7 @@ <% content_for :page_actions do %> - <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]), :icon => 'arrow-left' %></li> + <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li> <% end %> <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @reimbursement } %> @@ -97,10 +97,10 @@ <% end %> <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons"> <% if !@reimbursement.reimbursed? %> - <%= button_to [:perform, :admin, @order, @reimbursement], {class: 'button fa fa-reply', method: 'post'} do %> + <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button', method: 'post' } do %> <%= Spree.t(:reimburse) %> <% end %> - <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), :icon => 'remove' %> + <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]) %> <% end %> </div> </fieldset> diff --git a/backend/app/views/spree/admin/reimbursements/index.html.erb b/backend/app/views/spree/admin/reimbursements/index.html.erb index e9d25b0ea32..ce0fc166bf5 100644 --- a/backend/app/views/spree/admin/reimbursements/index.html.erb +++ b/backend/app/views/spree/admin/reimbursements/index.html.erb @@ -3,7 +3,7 @@ <% admin_breadcrumb(plural_resource_name(Spree::Reimbursement)) %> <% content_for :page_actions do %> - <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li> + <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order) %></li> <% end %> <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %> diff --git a/backend/app/views/spree/admin/reimbursements/show.html.erb b/backend/app/views/spree/admin/reimbursements/show.html.erb index 9fae134b908..f65cb009e58 100644 --- a/backend/app/views/spree/admin/reimbursements/show.html.erb +++ b/backend/app/views/spree/admin/reimbursements/show.html.erb @@ -4,7 +4,7 @@ <% content_for :page_actions do %> - <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]), :icon => 'arrow-left' %></li> + <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li> <% end %> <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @reimbursement } %> diff --git a/backend/app/views/spree/admin/return_authorizations/edit.html.erb b/backend/app/views/spree/admin/return_authorizations/edit.html.erb index 15d7fafa3ce..4214e0c652a 100644 --- a/backend/app/views/spree/admin/return_authorizations/edit.html.erb +++ b/backend/app/views/spree/admin/return_authorizations/edit.html.erb @@ -1,7 +1,7 @@ <% content_for :page_actions do %> <% if @return_authorization.can_cancel? %> <li> - <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: 'remove' %> + <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) } %> </li> <% end %> <% end %> @@ -18,8 +18,8 @@ <%= render :partial => 'form', :locals => { :f => f } %> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.update'), 'repeat' %> - <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %> + <%= button Spree.t('actions.update') %> + <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order) %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/return_authorizations/new.html.erb b/backend/app/views/spree/admin/return_authorizations/new.html.erb index 0536511cfbd..2c54f192e11 100644 --- a/backend/app/views/spree/admin/return_authorizations/new.html.erb +++ b/backend/app/views/spree/admin/return_authorizations/new.html.erb @@ -13,8 +13,8 @@ <%= render :partial => 'form', :locals => { :f => f } %> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t(:'actions.create'), 'ok' %> - <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %> + <%= button Spree.t(:'actions.create') %> + <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order) %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/shared/_edit_resource_links.html.erb b/backend/app/views/spree/admin/shared/_edit_resource_links.html.erb index e4e81b8c740..beeee2bc454 100644 --- a/backend/app/views/spree/admin/shared/_edit_resource_links.html.erb +++ b/backend/app/views/spree/admin/shared/_edit_resource_links.html.erb @@ -1,4 +1,4 @@ <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.update'), 'refresh' %> - <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'remove' %> + <%= button Spree.t('actions.update') %> + <%= button_link_to Spree.t('actions.cancel'), collection_url %> </div> diff --git a/backend/app/views/spree/admin/shared/_new_resource_links.html.erb b/backend/app/views/spree/admin/shared/_new_resource_links.html.erb index dc840eb0c44..ffed66586f9 100644 --- a/backend/app/views/spree/admin/shared/_new_resource_links.html.erb +++ b/backend/app/views/spree/admin/shared/_new_resource_links.html.erb @@ -1,4 +1,4 @@ <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.create'), 'ok' %> - <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %> + <%= button Spree.t('actions.create') %> + <%= link_to Spree.t('actions.cancel'), collection_url, :class => 'button' %> </div> diff --git a/backend/app/views/spree/admin/shared/_order_submenu.html.erb b/backend/app/views/spree/admin/shared/_order_submenu.html.erb index 951dda957d0..84b2dec77dd 100644 --- a/backend/app/views/spree/admin/shared/_order_submenu.html.erb +++ b/backend/app/views/spree/admin/shared/_order_submenu.html.erb @@ -2,46 +2,46 @@ <ul class="tabs" data-hook="admin_order_tabs"> <% if (@order.shipments.count == 0 || @order.shipped_shipments.count == 0) %> <li class="<%= "active" if current == "Cart" %>" data-hook='admin_order_tabs_order_details'> - <%= link_to_with_icon 'shopping-cart', Spree.t(:cart), cart_admin_order_url(@order) %> + <%= link_to Spree.t(:cart), cart_admin_order_url(@order) %> </li> <% end %> <% if checkout_steps.include?("address") %> <li class="<%= "active" if (current == "Customer Details") %>" data-hook='admin_order_tabs_customer_details'> <% if can?(:update, @order) %> - <%= link_to_with_icon 'user', Spree.t(:customer), edit_admin_order_customer_url(@order) %> + <%= link_to Spree.t(:customer), edit_admin_order_customer_url(@order) %> <% else %> - <%= link_to_with_icon 'user', Spree.t(:customer), admin_order_customer_url(@order) %> + <%= link_to Spree.t(:customer), admin_order_customer_url(@order) %> <% end %> </li> <% end %> <li class="<%= "active" if current == "Shipments" %>" data-hook='admin_order_tabs_order_details'> - <%= link_to_with_icon 'edit', plural_resource_name(Spree::Shipment), edit_admin_order_url(@order) %> + <%= link_to plural_resource_name(Spree::Shipment), edit_admin_order_url(@order) %> </li> <% if can? :display, Spree::Adjustment %> <li class="<%= "active" if current == "Adjustments" %>" data-hook='admin_order_tabs_adjustments'> - <%= link_to_with_icon 'cogs', plural_resource_name(Spree::Adjustment), admin_order_adjustments_url(@order) %> + <%= link_to plural_resource_name(Spree::Adjustment), admin_order_adjustments_url(@order) %> </li> <% end %> <% if can?(:display, Spree::Payment) %> <li class="<%= "active" if current == "Payments" %>" data-hook='admin_order_tabs_payments'> - <%= link_to_with_icon 'credit-card', plural_resource_name(Spree::Payment), admin_order_payments_url(@order) %> + <%= link_to plural_resource_name(Spree::Payment), admin_order_payments_url(@order) %> </li> <% end %> <% if !@order.completed? && can?(:update, @order) %> <li class="<%= "active" if current == "Confirm" %>" data-hook='admin_order_tabs_confirm'> - <%= link_to_with_icon 'check', Spree.t(:confirm), confirm_admin_order_url(@order) %> + <%= link_to Spree.t(:confirm), confirm_admin_order_url(@order) %> </li> <% end %> <% if can? :display, Spree::ReturnAuthorization %> <% if @order.completed? %> <li class="tab <%= "active" if current == "Return Authorizations" %>" data-hook='admin_order_tabs_return_authorizations'> - <%= link_to_with_icon 'share', Spree.t('admin.tab.rma'), admin_order_return_authorizations_url(@order) %> + <%= link_to Spree.t('admin.tab.rma'), admin_order_return_authorizations_url(@order) %> </li> <% end %> <% end %> @@ -49,14 +49,14 @@ <% if can? :display, Spree::CustomerReturn %> <% if @order.completed? %> <li class="<%= "active" if current == "Customer Returns" %>"> - <%= link_to_with_icon 'download', plural_resource_name(Spree::CustomerReturn), admin_order_customer_returns_url(@order) %> + <%= link_to plural_resource_name(Spree::CustomerReturn), admin_order_customer_returns_url(@order) %> </li> <% end %> <% end %> <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %> <%= content_tag('li', class: "#{'active' if current == 'Cancel Inventory'}", :data => {:hook => 'admin_order_tabs_cancel_inventory'}) do %> - <%= link_to_with_icon 'cancel', Spree.t(:cancel_inventory), admin_order_cancellations_path(@order) %> + <%= link_to Spree.t(:cancel_inventory), admin_order_cancellations_path(@order) %> <% end %> <% end %> </ul> diff --git a/backend/app/views/spree/admin/shared/_product_tabs.html.erb b/backend/app/views/spree/admin/shared/_product_tabs.html.erb index 43808076b2b..0ae485f4ad2 100644 --- a/backend/app/views/spree/admin/shared/_product_tabs.html.erb +++ b/backend/app/views/spree/admin/shared/_product_tabs.html.erb @@ -5,22 +5,22 @@ <nav> <ul class="tabs" data-hook="admin_product_tabs"> <%= content_tag :li, :class => ('active' if current == 'Product Details') do %> - <%= link_to_with_icon 'edit', Spree.t(:product_details), spree.edit_admin_product_url(@product) %> + <%= link_to Spree.t(:product_details), spree.edit_admin_product_url(@product) %> <% end if can?(:admin, Spree::Product) %> <%= content_tag :li, :class => ('active' if current == 'Images') do %> - <%= link_to_with_icon 'picture-o', Spree.t(:images), spree.admin_product_images_url(@product) %> + <%= link_to Spree.t(:images), spree.admin_product_images_url(@product) %> <% end if can?(:admin, Spree::Image) %> <%= content_tag :li, :class => ('active' if current == 'Variants') do %> - <%= link_to_with_icon 'th-large', plural_resource_name(Spree::Variant), spree.admin_product_variants_url(@product) %> + <%= link_to plural_resource_name(Spree::Variant), spree.admin_product_variants_url(@product) %> <% end if can?(:admin, Spree::Variant) %> <%= content_tag :li, :class => ('active' if current == 'Prices') do %> - <%= link_to_with_icon 'money', plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product) %> + <%= link_to plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product) %> <% end if can?(:admin, Spree::Price) %> <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %> - <%= link_to_with_icon 'tasks', plural_resource_name(Spree::ProductProperty), spree.admin_product_product_properties_url(@product) %> + <%= link_to plural_resource_name(Spree::ProductProperty), spree.admin_product_product_properties_url(@product) %> <% end if can?(:admin, Spree::ProductProperty) %> <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %> - <%= link_to_with_icon 'cubes', Spree.t(:stock_management), spree.admin_product_stock_url(@product) %> + <%= link_to Spree.t(:stock_management), spree.admin_product_stock_url(@product) %> <% end if can?(:admin, Spree::StockItem) %> </ul> </nav> diff --git a/backend/app/views/spree/admin/shared/_report_criteria.html.erb b/backend/app/views/spree/admin/shared/_report_criteria.html.erb index 52facef01f1..a99a0a21dc5 100644 --- a/backend/app/views/spree/admin/shared/_report_criteria.html.erb +++ b/backend/app/views/spree/admin/shared/_report_criteria.html.erb @@ -2,7 +2,7 @@ <div class="date-range-filter field align-center"> <%= label_tag nil, Spree.t(:start), :class => 'inline' %> <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %> - + <span class="range-divider"> <i class="fa fa-arrow-right"></i> </span> @@ -12,6 +12,6 @@ </div> <div class="actions filter-actions"> - <%= button Spree.t(:search), 'search' %> + <%= button Spree.t(:search) %> </div> <% end %> diff --git a/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb b/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb index deb7fb043a5..01a97745c27 100644 --- a/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb +++ b/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb @@ -2,7 +2,7 @@ <div class="date-range-filter field align-center"> <%= label_tag :q_completed_at_gt, Spree.t(:start), :class => 'inline' %> <%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:completed_at_gt]) %> - + <span class="range-divider"> <i class="fa fa-arrow-right"></i> </span> @@ -12,6 +12,6 @@ </div> <div class="actions filter-actions"> - <%= button Spree.t(:search), 'search' %> + <%= button Spree.t(:search) %> </div> <% end %> diff --git a/backend/app/views/spree/admin/shared/_variant_search.html.erb b/backend/app/views/spree/admin/shared/_variant_search.html.erb index 85454a11d78..24f6d57cfa0 100644 --- a/backend/app/views/spree/admin/shared/_variant_search.html.erb +++ b/backend/app/views/spree/admin/shared/_variant_search.html.erb @@ -15,7 +15,7 @@ <div class="actions filter-actions"> <div data-hook="admin_orders_index_search_buttons"> - <%= button Spree.t(:filter_results), 'search' %> + <%= button Spree.t(:filter_results) %> </div> </div> <% end %> diff --git a/backend/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb b/backend/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb index 7028fb4ff12..ad5efff8611 100644 --- a/backend/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +++ b/backend/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb @@ -31,8 +31,8 @@ </div> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t(:transfer_stock), 'plus' %> - <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %> + <%= button Spree.t(:transfer_stock) %> + <%= link_to Spree.t('actions.cancel'), collection_url, :class => 'button' %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/stock_locations/index.html.erb b/backend/app/views/spree/admin/stock_locations/index.html.erb index 91b8e387fb3..1890364148c 100644 --- a/backend/app/views/spree/admin/stock_locations/index.html.erb +++ b/backend/app/views/spree/admin/stock_locations/index.html.erb @@ -15,7 +15,7 @@ <% if can?(:create, Spree::StockTransfer) %> <li> - <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'forward' } %> + <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path %> </li> <% end %> </ul> diff --git a/backend/app/views/spree/admin/stock_movements/index.html.erb b/backend/app/views/spree/admin/stock_movements/index.html.erb index 5dc8bde8d57..23f3e42fdac 100644 --- a/backend/app/views/spree/admin/stock_movements/index.html.erb +++ b/backend/app/views/spree/admin/stock_movements/index.html.erb @@ -6,7 +6,7 @@ <% content_for :page_actions do %> <% if can?(:create, Spree::StockMovement) %> <li> - <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'plus', id: 'admin_new_stock_movement_link' %> + <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), id: 'admin_new_stock_movement_link' %> </li> <% end %> diff --git a/backend/app/views/spree/admin/stock_transfers/edit.html.erb b/backend/app/views/spree/admin/stock_transfers/edit.html.erb index 78f4f9a7226..d1dbc8159e3 100644 --- a/backend/app/views/spree/admin/stock_transfers/edit.html.erb +++ b/backend/app/views/spree/admin/stock_transfers/edit.html.erb @@ -9,7 +9,6 @@ <li> <%= button_link_to Spree.t(:ready_to_ship), finalize_admin_stock_transfer_path(@stock_transfer), - icon: 'truck', method: 'put', data: { confirm: Spree.t('finalize_stock_transfer.confirm') } %> @@ -33,7 +32,7 @@ <%= f.error_message_on :destination_location %> <% end %> <div class="filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.save'), 'ok' %> + <%= button Spree.t('actions.save') %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/stock_transfers/index.html.erb b/backend/app/views/spree/admin/stock_transfers/index.html.erb index fec80391654..7151d3cd24d 100644 --- a/backend/app/views/spree/admin/stock_transfers/index.html.erb +++ b/backend/app/views/spree/admin/stock_transfers/index.html.erb @@ -59,7 +59,7 @@ <div class="actions filter-actions"> <div data-hook="admin_stock_transfers_index_search_buttons"> - <%= button Spree.t(:filter_results), 'search' %> + <%= button Spree.t(:filter_results) %> </div> </div> <% end %> diff --git a/backend/app/views/spree/admin/stock_transfers/new.html.erb b/backend/app/views/spree/admin/stock_transfers/new.html.erb index 3085feeb868..9e5c787f40a 100644 --- a/backend/app/views/spree/admin/stock_transfers/new.html.erb +++ b/backend/app/views/spree/admin/stock_transfers/new.html.erb @@ -19,8 +19,8 @@ <%= f.error_message_on :description %> <% end %> <div class="filter-actions actions" data-hook="buttons"> - <%= button Spree.t(:continue), 'arrow-right' %> - <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_stock_transfers_path, class: 'button' %> + <%= button Spree.t(:continue) %> + <%= link_to Spree.t('actions.cancel'), admin_stock_transfers_path, class: 'button' %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/stock_transfers/receive.html.erb b/backend/app/views/spree/admin/stock_transfers/receive.html.erb index b2e990ac26b..69d4be34125 100644 --- a/backend/app/views/spree/admin/stock_transfers/receive.html.erb +++ b/backend/app/views/spree/admin/stock_transfers/receive.html.erb @@ -3,12 +3,11 @@ <% content_for :page_actions do %> <li> - <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %> + <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path %> </li> <li> <%= button_link_to Spree.t(:close), close_admin_stock_transfer_path(@stock_transfer), - icon: 'lock', method: 'put', data: { confirm: Spree.t('close_stock_transfer.confirm') } %> </li> diff --git a/backend/app/views/spree/admin/stock_transfers/show.html.erb b/backend/app/views/spree/admin/stock_transfers/show.html.erb index 1868e8e52bc..e907df5c036 100644 --- a/backend/app/views/spree/admin/stock_transfers/show.html.erb +++ b/backend/app/views/spree/admin/stock_transfers/show.html.erb @@ -4,7 +4,7 @@ <% content_for :page_actions do %> <li> - <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %> + <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path %> </li> <% end %> diff --git a/backend/app/views/spree/admin/stock_transfers/tracking_info.html.erb b/backend/app/views/spree/admin/stock_transfers/tracking_info.html.erb index 8c41c4c4094..16003e92f4f 100644 --- a/backend/app/views/spree/admin/stock_transfers/tracking_info.html.erb +++ b/backend/app/views/spree/admin/stock_transfers/tracking_info.html.erb @@ -3,12 +3,11 @@ <% content_for :page_actions do %> <li> - <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, icon: 'arrow-left' %> + <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path %> </li> <li> <%= button_link_to Spree.t('actions.ship'), ship_admin_stock_transfer_path(@stock_transfer), - icon: 'check', method: 'put', data: { confirm: Spree.t('ship_stock_transfer.confirm') } %> diff --git a/backend/app/views/spree/admin/store_credits/edit_validity.html.erb b/backend/app/views/spree/admin/store_credits/edit_validity.html.erb index e17419f182e..ecf70f2244e 100644 --- a/backend/app/views/spree/admin/store_credits/edit_validity.html.erb +++ b/backend/app/views/spree/admin/store_credits/edit_validity.html.erb @@ -17,8 +17,8 @@ <%= render partial: 'update_reason_field', locals: { f: f } %> </div> <div class="form-buttons filter-actions actions" data-hook="buttons"> - <%= button Spree.t('store_credit.actions.invalidate'), 'ban' %> - <%= button_link_to Spree.t('actions.cancel'), admin_user_store_credit_path(@user, @store_credit), icon: 'remove' %> + <%= button Spree.t('store_credit.actions.invalidate') %> + <%= button_link_to Spree.t('actions.cancel'), admin_user_store_credit_path(@user, @store_credit) %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/store_credits/index.html.erb b/backend/app/views/spree/admin/store_credits/index.html.erb index e119ae14cf1..fcc62c1767d 100644 --- a/backend/app/views/spree/admin/store_credits/index.html.erb +++ b/backend/app/views/spree/admin/store_credits/index.html.erb @@ -7,7 +7,7 @@ <%= render 'spree/admin/users/tabs', current: :store_credits %> <% content_for :page_actions do %> <% if can?(:create, Spree::StoreCredit) %> - <li><%= link_to_with_icon 'plus', Spree.t("admin.store_credits.add"), new_admin_user_store_credit_path(@user), class: 'button' %></li> + <li><%= link_to Spree.t("admin.store_credits.add"), new_admin_user_store_credit_path(@user), class: 'button' %></li> <% end %> <% end %> diff --git a/backend/app/views/spree/admin/style_guide/topics/typography/_icons.html.erb b/backend/app/views/spree/admin/style_guide/topics/typography/_icons.html.erb index 6078c364d2a..887b295761f 100644 --- a/backend/app/views/spree/admin/style_guide/topics/typography/_icons.html.erb +++ b/backend/app/views/spree/admin/style_guide/topics/typography/_icons.html.erb @@ -7,7 +7,7 @@ <pre><code class="language-ruby"> icon('fa fa-user') link_to_with_icon('send', 'link text', '#') - button('button text', 'trash') - button_link_to('button link text', '#', icon: 'globe') + button('button text') + button_link_to('button link text', '#') </code></pre> </div> diff --git a/backend/app/views/spree/admin/taxonomies/edit.erb b/backend/app/views/spree/admin/taxonomies/edit.erb index f4e51cde1bf..060270eb707 100644 --- a/backend/app/views/spree/admin/taxonomies/edit.erb +++ b/backend/app/views/spree/admin/taxonomies/edit.erb @@ -5,7 +5,7 @@ <% content_for :page_actions do %> <li> - <%= button_link_to Spree.t(:add_taxon), spree.admin_taxonomies_path, { icon: 'plus', class: 'add-taxon-button' } %> + <%= button_link_to Spree.t(:add_taxon), spree.admin_taxonomies_path, { class: 'add-taxon-button' } %> </li> <% end %> @@ -13,8 +13,8 @@ <fieldset class="no-border-top"> <%= render :partial => 'form', :locals => { :f => f } %> <div class="filter-actions actions"> - <%= button Spree.t('actions.update'), 'refresh' %> - <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, :icon => 'remove' %> + <%= button Spree.t('actions.update') %> + <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path %> </div> </fieldset> diff --git a/backend/app/views/spree/admin/taxonomies/new.html.erb b/backend/app/views/spree/admin/taxonomies/new.html.erb index cf3f303a382..7b223eb532b 100644 --- a/backend/app/views/spree/admin/taxonomies/new.html.erb +++ b/backend/app/views/spree/admin/taxonomies/new.html.erb @@ -12,7 +12,7 @@ <fieldset class="no-border-top"> <br> <div class="filter-actions actions" data-hook="buttons"> - <%= button Spree.t('actions.create'), 'ok' %> + <%= button Spree.t('actions.create') %> </div> </fieldset> <% end %> diff --git a/backend/app/views/spree/admin/taxons/edit.html.erb b/backend/app/views/spree/admin/taxons/edit.html.erb index 426bfd9424b..4fe12c06201 100644 --- a/backend/app/views/spree/admin/taxons/edit.html.erb +++ b/backend/app/views/spree/admin/taxons/edit.html.erb @@ -3,7 +3,7 @@ <% content_for :page_actions do %> <li> - <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %> + <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path %> </li> <% end %> @@ -13,8 +13,8 @@ <%= render 'form', :f => f %> <div class="form-buttons filter-actions" data-hook="buttons"> - <%= button Spree.t('actions.update'), 'refresh' %> - <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), :icon => "remove" %> + <%= button Spree.t('actions.update') %> + <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy) %> </div> <% end %> diff --git a/backend/app/views/spree/admin/users/_tabs.html.erb b/backend/app/views/spree/admin/users/_tabs.html.erb index 0f8116c3f0a..eaf71cc7200 100644 --- a/backend/app/views/spree/admin/users/_tabs.html.erb +++ b/backend/app/views/spree/admin/users/_tabs.html.erb @@ -2,26 +2,26 @@ <nav> <ul class='tabs' data-hook="admin_user_tab_options"> <li<%== ' class="active"' if current == :account %>> - <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %> + <%= link_to Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %> </li> <% if can?(:addresses, @user) %> <li<%== ' class="active"' if current == :address %>> - <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %> + <%= link_to Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %> </li> <% end %> <% if can?(:orders, @user) %> <li<%== ' class="active"' if current == :orders %>> - <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.order_history"), spree.orders_admin_user_path(@user) %> + <%= link_to Spree.t(:"admin.user.order_history"), spree.orders_admin_user_path(@user) %> </li> <% end %> <% if can?(:items, @user) %> <li<%== ' class="active"' if current == :items %>> - <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %> + <%= link_to Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %> </li> <% end %> <% if can?(:display, Spree::StoreCredit) %> <li<%== ' class="active"' if current == :store_credits %>> - <%= link_to_with_icon 'money', Spree.t(:"admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %> + <%= link_to Spree.t(:"admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %> </li> <% end %> </ul> diff --git a/backend/app/views/spree/admin/users/edit.html.erb b/backend/app/views/spree/admin/users/edit.html.erb index cafbe93b3e6..636e22181b8 100644 --- a/backend/app/views/spree/admin/users/edit.html.erb +++ b/backend/app/views/spree/admin/users/edit.html.erb @@ -36,11 +36,11 @@ </div> <div class="filter-actions actions"> <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %> - <%= button Spree.t('clear_key', :scope => 'api'), 'trash' %> + <%= button Spree.t('clear_key', :scope => 'api') %> <% end %> <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %> - <%= button Spree.t('regenerate_key', :scope => 'api'), 'refresh' %> + <%= button Spree.t('regenerate_key', :scope => 'api') %> <% end %> </div> @@ -50,7 +50,7 @@ <div class="filter-actions actions"> <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %> - <%= button Spree.t('generate_key', :scope => 'api'), 'key' %> + <%= button Spree.t('generate_key', :scope => 'api') %> <% end %> </div> <% end %> diff --git a/backend/app/views/spree/admin/users/index.html.erb b/backend/app/views/spree/admin/users/index.html.erb index 6dec4ae8e48..dc4cc5e44e1 100644 --- a/backend/app/views/spree/admin/users/index.html.erb +++ b/backend/app/views/spree/admin/users/index.html.erb @@ -51,7 +51,7 @@ <%= f.text_field :email_cont, :class => 'fullwidth' %> </div> <div data-hook="admin_users_index_search_buttons"> - <%= button Spree.t(:search), 'search' %> + <%= button Spree.t(:search) %> </div> <% end %> </div> diff --git a/backend/app/views/spree/admin/variants/index.html.erb b/backend/app/views/spree/admin/variants/index.html.erb index 7537e1db966..b321606b7cb 100644 --- a/backend/app/views/spree/admin/variants/index.html.erb +++ b/backend/app/views/spree/admin/variants/index.html.erb @@ -36,11 +36,10 @@ <ul class="inline-menu" data-hook="toolbar"> <% if can?(:create, Spree::Variant) %> <li id="new_var_link" data-hook> - <%= link_to_with_icon 'plus', - Spree.t(:new_variant), - new_admin_product_variant_url(@product), - :remote => :true, - :class => 'button' %> + <%= link_to Spree.t(:new_variant), + new_admin_product_variant_url(@product), + remote: :true, + class: 'button' %> </li> <% end %> </ul> diff --git a/backend/spec/features/admin/orders/customer_details_spec.rb b/backend/spec/features/admin/orders/customer_details_spec.rb index 2ada0cc90f0..aefb04399c2 100644 --- a/backend/spec/features/admin/orders/customer_details_spec.rb +++ b/backend/spec/features/admin/orders/customer_details_spec.rb @@ -26,7 +26,7 @@ within("table.stock-levels") do find('.variant_quantity').set(1) end - click_icon :plus + click_button 'Add' expect(page).to have_css('.line-item') click_link "Customer" targetted_select2 "foobar@example.com", from: "#s2id_customer_search" diff --git a/backend/spec/features/admin/orders/new_order_spec.rb b/backend/spec/features/admin/orders/new_order_spec.rb index 14b17523597..ac3dd7b573b 100644 --- a/backend/spec/features/admin/orders/new_order_spec.rb +++ b/backend/spec/features/admin/orders/new_order_spec.rb @@ -28,7 +28,7 @@ fill_in_quantity("table.stock-levels", "quantity_0", 2) - click_icon :plus + click_button 'Add' click_on "Customer" within "#select-customer" do @@ -65,8 +65,8 @@ select2_search product.name, from: Spree.t(:name_or_sku) fill_in_quantity("table.stock-levels", "quantity_0", 2) - click_icon :plus + click_button 'Add' click_on "Customer" within "#select-customer" do @@ -96,7 +96,7 @@ fill_in_quantity('table.stock-levels', 'quantity_0', 2) - click_icon :plus + click_button 'Add' within(".line-items") do expect(page).to have_content(product.name) @@ -132,7 +132,7 @@ fill_in_quantity('table.stock-levels', 'quantity_0', 1) - click_icon :plus + click_button 'Add' within(".line-items") do within(".line-item-name") do @@ -190,7 +190,7 @@ find('.variant_quantity').set(1) end - click_icon :plus + click_button 'Add' expect(page).to have_css('.line-item') diff --git a/backend/spec/features/admin/orders/order_details_spec.rb b/backend/spec/features/admin/orders/order_details_spec.rb index ddea4c53856..c386a13ea88 100644 --- a/backend/spec/features/admin/orders/order_details_spec.rb +++ b/backend/spec/features/admin/orders/order_details_spec.rb @@ -47,7 +47,7 @@ fill_in "quantity_0", with: 2 end - click_icon :plus + click_button "Add" within("#order_total") do expect(page).to have_content("$80.00") @@ -135,7 +135,7 @@ fill_in "variant_quantity", with: 1 end - click_icon :plus + click_button 'Add' within(".line-items") do expect(page).to have_content(tote.name) diff --git a/backend/spec/features/admin/products/products_spec.rb b/backend/spec/features/admin/products/products_spec.rb index 152d6c2d41a..24b30b0df43 100644 --- a/backend/spec/features/admin/products/products_spec.rb +++ b/backend/spec/features/admin/products/products_spec.rb @@ -80,11 +80,11 @@ def build_option_type_with_values(name, values) expect(page).to have_content("zomg shirt") expect(page).not_to have_content("apache baseball cap") check "Show Deleted" - click_icon :search + click_button 'Search' expect(page).to have_content("zomg shirt") expect(page).to have_content("apache baseball cap") uncheck "Show Deleted" - click_icon :search + click_button 'Search' expect(page).to have_content("zomg shirt") expect(page).not_to have_content("apache baseball cap") end @@ -96,13 +96,13 @@ def build_option_type_with_values(name, values) click_nav "Products" fill_in "q_name_cont", with: "ap" - click_icon :search + click_button 'Search' expect(page).to have_content("apache baseball cap") expect(page).to have_content("apache baseball cap2") expect(page).not_to have_content("zomg shirt") fill_in "q_variants_including_master_sku_cont", with: "A1" - click_icon :search + click_button "Search" expect(page).to have_content("apache baseball cap") expect(page).not_to have_content("apache baseball cap2") expect(page).not_to have_content("zomg shirt") @@ -349,7 +349,7 @@ def build_option_type_with_values(name, values) # This will show our deleted product check "Show Deleted" - click_icon :search + click_button "Search" click_link product.name expect(page).to have_field('Master Price', with: product.price.to_f) end diff --git a/backend/spec/features/admin/products/properties_spec.rb b/backend/spec/features/admin/products/properties_spec.rb index c77c5ada9d4..0008bb1d188 100644 --- a/backend/spec/features/admin/products/properties_spec.rb +++ b/backend/spec/features/admin/products/properties_spec.rb @@ -32,7 +32,7 @@ context "searching properties" do it 'should list properties matching search query', js: true do fill_in "q_name_cont", with: "size" - click_icon :search + click_button 'Search' expect(page).to have_content("shirt size") expect(page).not_to have_content("shirt fit")