spree_backend 2.2.1 → 2.2.2

data/app/views/spree/admin/stock_locations/edit.html.erb

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_stock_location) %> <i class="icon-arrow-right"></i>
+  <%= Spree.t(:editing_stock_location) %> <i class="fa fa-arrow-right"></i>
   <%= @stock_location.name %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_location } %>

data/app/views/spree/admin/stock_locations/index.html.erb

@@ -7,10 +7,10 @@
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <li>
-      <%= button_link_to Spree.t(:new_stock_location), new_object_url, { :icon => 'icon-plus', :id => 'admin_new_stock_location' } %>
+      <%= button_link_to Spree.t(:new_stock_location), new_object_url, { :icon => 'plus', :id => 'admin_new_stock_location' } %>
     </li>
     <li>
-      <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'icon-forward' } %>
+      <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'forward' } %>
     </li>
   </ul>
 <% end %>

data/app/views/spree/admin/stock_locations/new.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_locations } %>

data/app/views/spree/admin/stock_movements/edit.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_stock_movements_list), admin_stock_location_stock_movements_path(stock_location), :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_movements_list), admin_stock_location_stock_movements_path(stock_location), :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_movement } %>

data/app/views/spree/admin/stock_movements/index.html.erb

@@ -6,10 +6,10 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location),  icon: '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),  icon: 'plus', id: 'admin_new_stock_movement_link' %>
   </li>
   <li>
-    <%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %>
+    <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %>
   </li>
 <% end %>
 
@@ -42,7 +42,7 @@
 <% else %>
   <div class="alpha twelve columns no-objects-found">
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_movement')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_stock_movement_path %>!
+    <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_stock_movement_path(@stock_location) %>!
   </div>
 <% end %>
 

data/app/views/spree/admin/stock_movements/new.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_stock_movements_list), admin_stock_location_stock_movements_path(stock_location), :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_movements_list), admin_stock_location_stock_movements_path(stock_location), :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_movement } %>

data/app/views/spree/admin/stock_transfers/index.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'icon-forward' } %>
+    <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'forward' } %>
   </li>
 <% end %>
 
@@ -44,7 +44,7 @@
 
       <div class="actions filter-actions">
         <div data-hook="admin_stock_transfers_index_search_buttons">
-          <%= button Spree.t(:filter_results), 'icon-search' %>
+          <%= button Spree.t(:filter_results), 'search' %>
         </div>
       </div>
     <% end %>
@@ -78,7 +78,7 @@
           <td class="align-center"><%= stock_transfer.destination_location.try(:name) %></td>
           <td class='actions'>
             <%= link_to '', admin_stock_transfer_path(stock_transfer),
-            title: 'view', class: 'view icon_link with-tip icon-eye-open no-text',
+            title: 'view', class: 'view icon_link with-tip fa fa-eye-open no-text',
             data: {action: 'view'} %>
           </td>
         </tr>

data/app/views/spree/admin/stock_transfers/new.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 
@@ -16,7 +16,7 @@
       <td>{{name}}</td>
       <td class='align-center'>{{quantity}}</td>
       <td class='actions'>
-        <button class='icon_link icon-trash no-text transfer_remove_variant'
+        <button class='icon_link fa fa-trash no-text transfer_remove_variant'
                 data-variant-id='{{id}}' data-action='remove'></button>
       </td>
       <input type='hidden' id='variant[]' name='variant[]' value='{{id}}'>
@@ -75,7 +75,7 @@
       </div>
       <div class="two columns omega">
         <div class="field" style="padding: 25px 0 0 0 !important">
-          <%= button Spree.t(:add), 'icon-plus button transfer_add_variant' %>
+          <%= button Spree.t(:add), 'plus button transfer_add_variant' %>
         </div>
       </div>
 
@@ -105,7 +105,7 @@
     </div>
 
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:transfer_stock), 'icon-plus transfer_transfer' %>
+      <%= button Spree.t(:transfer_stock), 'plus transfer_transfer' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -6,10 +6,10 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %>
   </li>
   <li>
-    <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'icon-forward' } %>
+    <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'forward' } %>
   </li>
 <% end %>
 
@@ -33,7 +33,7 @@
   <% if @stock_transfer.source_movements.present? %>
     <fieldset class="no-border-bottom">
       <legend id="stock-location-source">
-        <%= Spree.t(:source) %> <i class="icon-arrow-right"></i> <%= @stock_transfer.source_location.name %>
+        <%= Spree.t(:source) %> <i class="fa fa-arrow-right"></i> <%= @stock_transfer.source_location.name %>
       </legend>
       <%= render :partial => 'stock_movements', :object => @stock_transfer.source_movements %>
     </fieldset>
@@ -42,7 +42,7 @@
   <% if @stock_transfer.destination_movements.present? %>
     <fieldset class="no-border-bottom">
       <legend id="stock-location-destination">
-        <%= Spree.t(:destination) %> <i class="icon-arrow-right"></i> <%= @stock_transfer.destination_location.name %>
+        <%= Spree.t(:destination) %> <i class="fa fa-arrow-right"></i> <%= @stock_transfer.destination_location.name %>
       </legend>
       <%= render :partial => 'stock_movements', :object => @stock_transfer.destination_movements %>
     </fieldset>

data/app/views/spree/admin/tax_categories/edit.html.erb

@@ -5,7 +5,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_category } %>

data/app/views/spree/admin/tax_categories/index.html.erb

@@ -7,7 +7,7 @@
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <li>
-      <%= button_link_to Spree.t(:new_tax_category), new_object_url, :icon => 'icon-plus', :id => 'admin_new_tax_categories_link' %>
+      <%= button_link_to Spree.t(:new_tax_category), new_object_url, :icon => 'plus', :id => 'admin_new_tax_categories_link' %>
     </li>
   </ul>
 <% end %>

data/app/views/spree/admin/tax_categories/new.html.erb

@@ -5,7 +5,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
 <% end %>
 
 

data/app/views/spree/admin/tax_rates/edit.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/tax_rates/index.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_tax_rate), new_object_url, :icon => 'icon-plus' %>
+    <%= button_link_to Spree.t(:new_tax_rate), new_object_url, :icon => 'plus' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/tax_rates/new.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/tax_settings/edit.html.erb

@@ -13,6 +13,6 @@
   </div>
 
   <div class="form-buttons" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'icon-refresh' %>
+    <%= button Spree.t('actions.update'), 'refresh' %>
   </div>
 <% end %>

data/app/views/spree/admin/taxonomies/edit.erb

@@ -8,7 +8,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 
@@ -35,9 +35,9 @@
     <br>
 
     <div class="filter-actions actions">
-      <%= button Spree.t('actions.update'), 'icon-refresh' %>
+      <%= button Spree.t('actions.update'), 'refresh' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, :icon => 'icon-remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, :icon => 'remove' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/taxonomies/index.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :icon => 'icon-plus', :id => 'admin_new_taxonomy_link' %>
+    <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :icon => 'plus', :id => 'admin_new_taxonomy_link' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/taxonomies/new.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 
@@ -16,7 +16,7 @@
   <fieldset class="no-border-top">
     <br>
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:create), 'icon-ok' %>
+      <%= button Spree.t(:create), 'ok' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/taxons/edit.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 
@@ -16,9 +16,9 @@
   <%= render 'form', :f => f %>
 
   <div class="form-buttons" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'icon-refresh' %>
+    <%= button Spree.t('actions.update'), 'refresh' %>
     <%= Spree.t(:or) %>
-    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), :icon => "icon-remove" %>
+    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), :icon => "remove" %>
   </div>
 <% end %>
 

data/app/views/spree/admin/trackers/edit.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_trackers_list), spree.admin_trackers_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_trackers_list), spree.admin_trackers_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/trackers/index.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_tracker), new_object_url, :icon => 'icon-plus', :id => 'admin_new_tracker_link' %>
+    <%= button_link_to Spree.t(:new_tracker), new_object_url, :icon => 'plus', :id => 'admin_new_tracker_link' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/trackers/new.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_trackers_list), spree.admin_trackers_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_trackers_list), spree.admin_trackers_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/users/_sidebar.html.erb

@@ -6,16 +6,16 @@
   <nav class="menu">
     <ul data-hook="admin_user_tab_options">
       <li<%== ' class="active"' if current == :account %>>
-        <%= link_to_with_icon 'icon-user', Spree.t(:"admin.user.account"), edit_admin_user_path(@user) %>
+        <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), edit_admin_user_path(@user) %>
       </li>
       <li<%== ' class="active"' if current == :address %>>
-        <%= link_to_with_icon 'icon-user', Spree.t(:"admin.user.addresses"), addresses_admin_user_path(@user) %>
+        <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), addresses_admin_user_path(@user) %>
       </li>
       <li<%== ' class="active"' if current == :orders %>>
-        <%= link_to_with_icon 'icon-shopping-cart', Spree.t(:"admin.user.orders"), orders_admin_user_path(@user) %>
+        <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.orders"), orders_admin_user_path(@user) %>
       </li>
       <li<%== ' class="active"' if current == :items %>>
-        <%= link_to_with_icon 'icon-edit', Spree.t(:"admin.user.items"), items_admin_user_path(@user) %>
+        <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), items_admin_user_path(@user) %>
       </li>
     </ul>
 

data/app/views/spree/admin/users/_user_page_actions.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'arrow-left' %>
   </li>
 <% end %>

data/app/views/spree/admin/users/edit.html.erb

@@ -32,13 +32,13 @@
     </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'), 'icon-trash' %>
+        <%= button Spree.t('clear_key', :scope => 'api'), 'trash' %>
       <% end %>
 
       <span class="or"><%= Spree.t(:or)%></span>
 
       <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-        <%= button Spree.t('regenerate_key', :scope => 'api'), 'icon-refresh' %>
+        <%= button Spree.t('regenerate_key', :scope => 'api'), 'refresh' %>
       <% end %>
     </div>
 
@@ -48,7 +48,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'), 'icon-key' %>
+        <%= button Spree.t('generate_key', :scope => 'api'), 'key' %>
       <% end %>
     </div>
   <% end %>

data/app/views/spree/admin/users/index.html.erb

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_user), new_admin_user_url, :icon => 'icon-plus', :id => 'admin_new_user_link' %>
+    <%= button_link_to Spree.t(:new_user), new_admin_user_url, :icon => 'plus', :id => 'admin_new_user_link' %>
   </li>
 <% end %>
 
@@ -46,7 +46,7 @@
         <%= f.text_field :email_cont, :class => 'fullwidth' %>
       </div>
       <div data-hook="admin_users_index_search_buttons">
-        <%= button Spree.t(:search), 'icon-search' %>
+        <%= button Spree.t(:search), 'search' %>
       </div>
     <% end %>
   </div>

data/app/views/spree/admin/users/new.html.erb

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -27,7 +27,7 @@
                   <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
                 </td>
                 <td class="actions">
-                  <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
+                  <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
                 </td>
               {{else}}
                 {{#if this.available}}
@@ -39,7 +39,7 @@
                     <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
                   </td>
                   <td class="actions">
-                    <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
+                    <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
                   </td>
                 {{else}}
                   <td><%= Spree.t(:out_of_stock) %></td>