spree_backend 4.1.15 → 4.2.0.beta

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

@@ -9,11 +9,11 @@
 
 <fieldset>
   <legend><%= Spree.t(:stock_transfer_name) %></legend>
-
+<div class="table-responsive">
   <table class="table table-bordered">
     <tr>
       <td width="30%"><strong><%= Spree.t(:created_at) %></strong></td>
-      <td><%= @stock_transfer.created_at %></td>
+      <td><%= pretty_time(@stock_transfer.created_at) %></td>
     </tr>
     <% if @stock_transfer.reference.present? %>
       <tr>
@@ -22,7 +22,7 @@
       </tr>
     <% end %>
   </table>
-
+</div>
   <% if @stock_transfer.source_movements.present? %>
     <fieldset>
       <legend id="stock-location-source">

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_store_credit_category_link' %>
+  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_store_credit_category_link' %>
 <% end if can? :create, Spree::StoreCreditCategory %>
 
 <% if @store_credit_categories.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr data-hook="admin_store_credit_categories_index_headers">
@@ -26,6 +27,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-warning">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCreditCategory)) %>,

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

@@ -10,10 +10,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add' if can?(:create, Spree::StoreCredit) %>
+  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::StoreCredit) %>
 <% end %>
 
 <% if @store_credits.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <th><%= Spree.t(:credited) %></th>
@@ -41,6 +42,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCredit)) %>

data/app/views/spree/admin/stores/_form.html.erb

@@ -1,92 +1,128 @@
 <div data-hook="admin_store_form_fields">
 
-  <div class="card">
-    <div class="card-header">
-      <h1 class="card-title mb-0 h5">
-        Basic Information
-      </h1>
-    </div>
-    <div class="card-body">
-      <%= f.field_container :name, class: ['form-group'] do %>
-        <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-        <%= f.text_field :name, class: 'form-control', required: true %>
-        <%= f.error_message_on :name %>
+<div class="card mb-4">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
+      <%= Spree.t(:basic_information) %>
+    </h1>
+  </div>
+  <div class="card-body">
+    <%= f.field_container :logo, class: ['form-group'] do %>
+      <% if @store.logo.attached? && @store.logo.variable? %>
+        <%= image_tag main_app.url_for(@store.logo.variant(resize: '244x104>')) %>
+      <% elsif @store.logo.attached? && @store.logo.image? %>
+        <%= image_tag main_app.url_for(@store.logo) %>
       <% end %>
-      <%= f.field_container :url, class: ['form-group'] do %>
-        <%= f.label :url, Spree.t(:url)  %>
-        <%= f.text_field :url, class: 'form-control', required: true %>
-        <%= f.error_message_on :url %>
+      <%= f.field_container :logo, class: ['form-group'] do %>
+        <%= f.label :logo, Spree.t(:logo) %><br />
+        <%= f.file_field :logo %>
+        <%= f.error_message_on :logo %>
       <% end %>
-    </div>
+    <% end %>
+    <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+      <%= f.text_field :name, class: 'form-control', required: true %>
+      <%= f.error_message_on :name %>
+    <% end %>
+    <%= f.field_container :code, class: ['form-group'] do %>
+      <%= f.label :code, raw(Spree.t(:code) + required_span_tag) %>
+      <%= f.text_field :code, class: 'form-control', required: true %>
+      <%= f.error_message_on :code %>
+    <% end %>
+    <%= f.field_container :url, class: ['form-group'] do %>
+      <%= f.label :url, raw(Spree.t(:url) + required_span_tag)  %>
+      <%= f.text_field :url, class: 'form-control', required: true %>
+      <%= f.error_message_on :url %>
+    <% end %>
   </div>
+</div>
 
-  <br />
+<div class="card mb-4">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
+      <%= Spree.t(:seo) %>
+    </h1>
+  </div>
+  <div class="card-body">
+    <%= f.field_container :seo_title, class: ['form-group'] do %>
+      <%= f.label :seo_title, Spree.t(:seo_title) %>
+      <%= f.text_field :seo_title, class: 'form-control' %>
+      <%= f.error_message_on :seo_title %>
+    <% end %>
+    <%= f.field_container :meta_description, class: ['form-group'] do %>
+      <%= f.label :meta_description, Spree.t(:meta_description)  %>
+      <%= f.text_area :meta_description, class: 'form-control' %>
+      <%= f.error_message_on :meta_description %>
+    <% end %>
+    <%= f.field_container :meta_keywords, class: ['form-group'] do %>
+      <%= f.label :meta_keywords, Spree.t(:meta_keywords)  %>
+      <%= f.text_field :meta_keywords, class: 'form-control' %>
+      <%= f.error_message_on :meta_keywords %>
+    <% end %>
+  </div>
+</div>
 
-  <div class="card">
-    <div class="card-header">
-      <h1 class="card-title mb-0 h5">
-        SEO
-      </h1>
-    </div>
-    <div class="card-body">
-      <%= f.field_container :seo_title, class: ['form-group'] do %>
-        <%= f.label :seo_title, Spree.t(:seo_title)  %>
-        <%= f.text_field :seo_title, class: 'form-control' %>
-        <%= f.error_message_on :seo_title %>
-      <% end %>
-      <%= f.field_container :meta_description, class: ['form-group'] do %>
-        <%= f.label :meta_description, Spree.t(:meta_description)  %>
-        <%= f.text_area :meta_description, class: 'form-control' %>
-        <%= f.error_message_on :meta_description %>
-      <% end %>
-      <%= f.field_container :meta_keywords, class: ['form-group'] do %>
-        <%= f.label :meta_keywords, Spree.t(:meta_keywords)  %>
-        <%= f.text_field :meta_keywords, class: 'form-control' %>
-        <%= f.error_message_on :meta_keywords %>
-      <% end %>
-    </div>
+<div class="card mb-4">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
+      <%= Spree.t(:email).pluralize %>
+    </h1>
   </div>
+  <div class="card-body">
+    <%= f.field_container :mail_from_address, class: ['form-group'] do %>
+      <%= f.label :mail_from_address, raw(Spree.t(:mail_from_address)  + required_span_tag) %>
+      <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
+      <%= f.error_message_on :mail_from_address %>
+    <% end %>
 
-  <br />
+    <%= f.field_container :customer_support_email, class: ['form-group'] do %>
+      <%= f.label :customer_support_email, Spree.t(:customer_support_email) %>
+      <%= f.text_field :customer_support_email, class: 'form-control' %>
+      <%= f.error_message_on :customer_support_email %>
+    <% end %>
 
-  <div class="card">
-    <div class="card-header">
-      <h1 class="card-title mb-0 h5">
-        Emails
-      </h1>
-    </div>
-    <div class="card-body">
-      <%= f.field_container :mail_from_address, class: ['form-group'] do %>
-        <%= f.label :mail_from_address, Spree.t(:mail_from_address)  %>
-        <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
-        <%= f.error_message_on :mail_from_address %>
-      <% end %>
-    </div>
+    <%= f.field_container :new_order_notifications_email, class: ['form-group'] do %>
+      <%= f.label :new_order_notifications_email, Spree.t(:new_order_notifications_email) %>
+      <%= f.text_field :new_order_notifications_email, class: 'form-control' %>
+      <%= f.error_message_on :new_order_notifications_email %>
+    <% end %>
   </div>
+</div>
 
-  <br />
-
-<div class="card">
+<div class="card mb-4">
   <div class="card-header">
     <h1 class="card-title mb-0 h5">
-      Internationalization
+      <%= Spree.t(:internationalization) %>
     </h1>
   </div>
   <div class="card-body">
     <%= f.field_container :default_currency, class: ['form-group'] do %>
       <%= f.label :default_currency, Spree.t(:currency) %>
-      <%= f.select :default_currency, currency_options(@store.default_currency) %>
+      <%= f.select :default_currency, currency_options(@store.default_currency), {}, { class: 'select2' } %>
       <%= f.error_message_on :default_currency %>
     <% end %>
+    <%= f.field_container :supported_currencies, class: ['form-group'] do %>
+      <%= f.label :supported_currencies, Spree.t(:supported_currencies) %>
+      <%= f.select :supported_currencies, currency_options(@store.supported_currencies&.split(',')), { prompt: false }, { multiple: true, class: 'select2' } %>
+      <%= f.error_message_on :supported_currencies %>
+    <% end %>
+    <%= f.field_container :default_locale, class: ['form-group'] do %>
+      <%= f.label :default_locale, Spree.t('i18n.language') %>
+      <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale), {}, { class: 'select2' } %>
+      <%= f.error_message_on :default_locale %>
+    <% end %>
+    <%= f.field_container :default_country_id, class: ['form-group'] do %>
+      <%= f.label :default_country_id, Spree.t('i18n.country') %>
+      <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id), {}, { class: 'select2' } %>
+      <%= f.error_message_on :default_country_id %>
+    <% end %>
   </div>
 </div>
 
-  <br />
-
-<div class="card">
+<div class="card mb-4">
   <div class="card-header">
     <h1 class="card-title mb-0 h5">
-      Social
+      <%= Spree.t(:social) %>
     </h1>
   </div>
   <div class="card-body">
@@ -108,8 +144,32 @@
   </div>
 </div>
 
-<br />
-
-<script>
-  $('#store_default_currency').select2();
-</script>
+<div class="card mb-4">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
+      <%= Spree.t(:footer_info) %>
+    </h1>
+  </div>
+  <div class="card-body">
+    <%= f.field_container :description, class: ['form-group'] do %>
+      <%= f.label :description, Spree.t(:description)  %>
+      <%= f.text_area :description, class: 'form-control' %>
+      <%= f.error_message_on :description %>
+    <% end %>
+    <%= f.field_container :address, class: ['form-group'] do %>
+      <%= f.label :address, Spree.t(:address)  %>
+      <%= f.text_area :address, class: 'form-control' %>
+      <%= f.error_message_on :address %>
+    <% end %>
+    <%= f.field_container :contact_email, class: ['form-group'] do %>
+      <%= f.label :contact_email, Spree.t(:contact_email)  %>
+      <%= f.text_field :contact_email, class: 'form-control' %>
+      <%= f.error_message_on :contact_email %>
+    <% end %>
+    <%= f.field_container :contact_phone, class: ['form-group'] do %>
+      <%= f.label :contact_phone, Spree.t(:contact_phone)  %>
+      <%= f.text_field :contact_phone, class: 'form-control' %>
+      <%= f.error_message_on :contact_phone %>
+    <% end %>
+  </div>
+</div>

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

@@ -8,6 +8,6 @@
 <%= form_for [:admin, @store] do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>
-    <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_stores_path(@store) } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_stores_path } %>
   </fieldset>
 <% end %>

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_store), spree.new_admin_store_path(@user), class: "btn-success", icon: 'add' if can?(:create, Spree::Store) %>
+  <%= button_link_to Spree.t(:add_store), spree.new_admin_store_path(@user), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::Store) %>
 <% end %>
 
 <% if @stores.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <th><%= Spree.t(:name) %></th>
@@ -24,7 +25,7 @@
           <td><%= store.default ? "<strong>#{Spree.t(:say_yes)}</strong>".html_safe : Spree.t(:say_no) %>
           <td class="actions actions-2 text-right" data-hook="admin_stores_index_row_actions">
             <% if can?(:edit, store) && !store.default %>
-              <%= link_to_with_icon('ok', Spree.t(:store_set_default_button), spree.set_default_admin_store_path(store), no_text: true, method: :put, class: 'btn btn-warning btn-sm with-tip') %>
+              <%= link_to_with_icon('save.svg', Spree.t(:store_set_default_button), spree.set_default_admin_store_path(store), no_text: true, method: :put, class: 'btn btn-warning btn-sm with-tip') %>
             <% end %>
             <%= link_to_edit_url spree.edit_admin_store_path(store), no_text: true if can?(:edit, store) %>
             <%= link_to_delete store, no_text: true, url: spree.admin_store_path(store) if can?(:destroy, store) %>
@@ -33,6 +34,7 @@
       <% end %>
     </tbody>
   </table>
+</div>  
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCredit)) %>

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

@@ -3,37 +3,39 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_tax_categories_link' %>
+  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_tax_categories_link' %>
 <% end if can? :create, Spree::TaxCategory %>
 
 <% if @tax_categories.any? %>
-<table class="table" id='listing_tax_categories' data-hook>
-  <thead>
-    <tr data-hook="tax_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:tax_code) %></th>
-      <th><%= Spree.t(:description) %></th>
-      <th><%= Spree.t(:default) %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @tax_categories.each do |tax_category|
-         @edit_url = edit_admin_tax_category_path(tax_category)
-         @delete_url = admin_tax_category_path(tax_category)
-    %>
-      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
-        <td><%= tax_category.name %></td>
-        <td><%= tax_category.tax_code %></td>
-        <td><%= tax_category.description %></td>
-        <td><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(tax_category, no_text: true) if can? :edit, tax_category %>
-          <%= link_to_delete(tax_category, no_text: true) if can? :delete, tax_category %>
+<div class="table-responsive">
+  <table class="table" id='listing_tax_categories' data-hook>
+    <thead>
+      <tr data-hook="tax_header">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:tax_code) %></th>
+        <th><%= Spree.t(:description) %></th>
+        <th><%= Spree.t(:default) %></th>
+        <th></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @tax_categories.each do |tax_category|
+           @edit_url = edit_admin_tax_category_path(tax_category)
+           @delete_url = admin_tax_category_path(tax_category)
+      %>
+        <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
+          <td><%= tax_category.name %></td>
+          <td><%= tax_category.tax_code %></td>
+          <td><%= tax_category.description %></td>
+          <td><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit(tax_category, no_text: true) if can? :edit, tax_category %>
+            <%= link_to_delete(tax_category, no_text: true) if can? :delete, tax_category %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::TaxCategory)) %>,

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-success", icon: 'add' %>
+  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-success", icon: 'add.svg' %>
 <% end if can? :create, Spree::TaxRate %>
 
 <% if @tax_rates.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr data-hook="rate_header">
@@ -38,6 +39,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::TaxRate)) %>,

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

@@ -1,23 +1,25 @@
-<table class="table sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
-  <thead>
-    <tr data-hook="taxonomies_header">
-      <th class="no-border"></th>
-      <th><%= Spree.t(:name) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @taxonomies.each do |taxonomy| %>
-      <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
-        <td class="move-handle">
-          <span class="icon icon-sort handle"></span>
-        </td>
-        <td><%= taxonomy.name %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit taxonomy.id, no_text: true if can?(:edit, taxonomy) %>
-          <%= link_to_delete taxonomy, no_text: true if can?(:delete, taxonomy) %>
-        </td>
+<div class="table-responsive">
+  <table class="table sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
+    <thead>
+      <tr data-hook="taxonomies_header">
+        <th class="no-border handel-head"></th>
+        <th><%= Spree.t(:name) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody id="sortVert">
+      <% @taxonomies.each do |taxonomy| %>
+        <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row" >
+          <td class="move-handle">
+            <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+          </td>
+          <td><%= taxonomy.name %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit taxonomy.id, no_text: true if can?(:edit, taxonomy) %>
+            <%= link_to_delete taxonomy, no_text: true if can?(:delete, taxonomy) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -29,9 +29,9 @@
     </div>
 
     <div class="form-actions">
-      <%= button Spree.t('actions.update'), 'ok', 'submit', { class: 'btn-success' } %>
+      <%= button Spree.t('actions.update'), 'save.svg', 'submit', { class: 'btn-success' } %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, icon: 'cancel.svg' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_taxonomy_link' %>
+  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_taxonomy_link' %>
 <% end if can?(:create, Spree::Taxonomy) %>
 
 <% if @taxonomies.any? %>

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

@@ -25,8 +25,8 @@
       <% end %>
 
       <%= f.field_container :icon, class: ['form-group'] do %>
-        <%= f.label :icon, Spree.t(:icon) %>
-        <%= image_tag main_app.url_for(@taxon.icon.try(:attachment)) if @taxon.icon %>
+        <%= f.label :icon, Spree.t(:header_banner) %>
+        <%= image_tag(main_app.url_for(@taxon.icon.try(:attachment)), class: 'w-100') if @taxon.icon %>
         <%= f.file_field :icon %>
       <% end %>
     </div>
@@ -46,7 +46,7 @@
 
   <%= f.field_container :meta_description, class: ['form-group'] do %>
     <%= f.label :meta_description, Spree.t(:meta_description) %>
-    <%= f.text_field :meta_description, class: 'form-control', rows: 6 %>
+    <%= f.text_area :meta_description, class: 'form-control', rows: 6 %>
   <% end %>
 
   <%= f.field_container :meta_keywords, class: ['form-group'] do %>

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

@@ -1,23 +1,25 @@
-<table class="table table-condensed table-bordered">
-  <thead>
-    <tr data-hook="taxons_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:path) %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% taxons.each do |taxon| %>
-      <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row">
-        <td><%= taxon.name %></td>
-        <td><%= taxon_path taxon %></td>
-        <td class="actions">
-          <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete') + ' ' + Spree.t(:remove) %>
-        </td>
+<div class="table-responsive">
+  <table class="table table-condensed table-bordered">
+    <thead>
+      <tr data-hook="taxons_header">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:path) %></th>
+        <th></th>
       </tr>
-    <% end %>
-    <% if taxons.empty? %>
-      <tr data-hook="taxons_none"><td colspan="3"><%= Spree.t(:none) %>.</td></tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% taxons.each do |taxon| %>
+        <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row">
+          <td><%= taxon.name %></td>
+          <td><%= taxon_path taxon %></td>
+          <td class="actions">
+            <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete.svg) + ' ' + Spree.t(:remove) %>
+          </td>
+        </tr>
+      <% end %>
+      <% if taxons.empty? %>
+        <tr data-hook="taxons_none"><td colspan="3"><%= Spree.t(:none) %>.</td></tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -4,6 +4,10 @@
   <%= @taxon.name %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= taxon_preview_link(@taxon) %>
+<% end %>
+
 <%# Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
 
@@ -13,8 +17,8 @@
   <%= render 'form', f: f %>
 
   <div class="form-actions" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'save' %>
+    <%= button Spree.t('actions.update'), 'save.svg' %>
     <span class="or"><%= Spree.t(:or) %></span>
-    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "remove" %>
+    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "cancel.svg" %>
   </div>
 <% end %>

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

@@ -7,7 +7,7 @@
     <%= text_field_tag :taxon_id %>
   </div>
 
-  <ul id="taxon_products" class="taxon"></ul>
+  <ul id="taxon_products" class="taxon row"></ul>
 
   <%= render partial: "spree/admin/products/autocomplete", formats: :js %>
 </div>