spree_backend 4.3.0 → 4.5.0

data/app/views/spree/admin/shared/_order_tabs.html.erb

@@ -1,93 +1,91 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:orders), spree.admin_orders_path %> /
-  <%= link_to @order.number, spree.edit_admin_order_path(@order) %>
+  <%= page_header_back_button spree.admin_orders_path %>
+  <%= @order.number %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <ul class="nav flex-column nav-pills" data-hook="admin_order_tabs">
-    <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
-      <li data-hook='admin_order_tabs_cart_details'>
-        <%= link_to_with_icon 'cart.svg',
-          Spree.t(:cart),
-          cart_admin_order_url(@order),
-          class: "#{'active' if current == :cart} nav-link" %>
-      </li>
-    <% end %>
-
-    <% if can? :update, @order %>
-      <li data-hook='admin_order_tabs_channel_details'>
-        <%= link_to_with_icon 'split.svg',
-          Spree.t(:channel),
-          channel_admin_order_url(@order),
-          class: "#{'active' if current == :channel} nav-link" %>
-      </li>
-    <% end %>
+<% content_for :page_tabs do %>
+  <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
+    <li class="nav-item" data-hook='admin_order_tabs_cart_details'>
+      <%= link_to_with_icon 'cart-check.svg',
+        Spree.t(:cart),
+        cart_admin_order_url(@order),
+        class: "#{'active' if current == :cart} nav-link" %>
+    </li>
+  <% end %>
 
-    <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
-      <li data-hook='admin_order_tabs_customer_details'>
-        <%= link_to_with_icon 'user.svg',
-          Spree.t(:customer),
-          spree.admin_order_customer_url(@order),
-          class: "#{'active' if current == :customer_details} nav-link" %>
-      </li>
-    <% end %>
+  <% if can? :update, @order %>
+    <li class="nav-item" data-hook='admin_order_tabs_channel_details'>
+      <%= link_to_with_icon 'funnel.svg',
+        Spree.t(:channel),
+        channel_admin_order_url(@order),
+        class: "#{'active' if current == :channel} nav-link" %>
+    </li>
+  <% end %>
 
-    <% if can? :update, @order %>
-      <li data-hook='admin_order_tabs_shipment_details'>
-        <%= link_to_with_icon 'shipping.svg',
-          Spree.t(:shipments),
-          edit_admin_order_url(@order),
-          class: "#{'active' if current == :shipments} nav-link" %>
-      </li>
-    <% end %>
+  <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
+    <li class="nav-item" data-hook='admin_order_tabs_customer_details'>
+      <%= link_to_with_icon 'person-lines-fill.svg',
+        Spree.t(:customer),
+        spree.admin_order_customer_url(@order),
+        class: "#{'active' if current == :customer_details} nav-link" %>
+    </li>
+  <% end %>
 
-    <% if can? :index, Spree::Adjustment %>
-      <li data-hook='admin_order_tabs_adjustments'>
-        <%= link_to_with_icon 'adjust.svg',
-          Spree.t(:adjustments),
-          spree.admin_order_adjustments_url(@order),
-          class: "#{'active' if current == :adjustments} nav-link" %>
-      </li>
-    <% end %>
+  <% if can? :update, @order %>
+    <li class="nav-item" data-hook='admin_order_tabs_shipment_details'>
+      <%= link_to_with_icon 'truck.svg',
+        Spree.t(:shipments),
+        edit_admin_order_url(@order),
+        class: "#{'active' if current == :shipments} nav-link" %>
+    </li>
+  <% end %>
 
-    <% if can?(:index, Spree::Payment) %>
-      <li data-hook='admin_order_tabs_payments'>
-        <%= link_to_with_icon 'payments.svg',
-          Spree.t(:payments),
-          spree.admin_order_payments_url(@order),
-          class: "#{'active' if current == :payments} nav-link" %>
-      </li>
-    <% end %>
+  <% if can? :index, Spree::Adjustment %>
+    <li class="nav-item" data-hook='admin_order_tabs_adjustments'>
+      <%= link_to_with_icon 'adjust.svg',
+        Spree.t(:adjustments),
+        spree.admin_order_adjustments_url(@order),
+        class: "#{'active' if current == :adjustments} nav-link" %>
+    </li>
+  <% end %>
 
-    <% if can? :index, Spree::ReturnAuthorization %>
-      <% if @order.completed? %>
-        <li data-hook='admin_order_tabs_return_authorizations'>
-          <%= link_to_with_icon 'enter.svg',
-            Spree.t(:return_authorizations),
-            spree.admin_order_return_authorizations_url(@order),
-            class: "#{'active' if current == :return_authorizations} nav-link" %>
-        </li>
-      <% end %>
-    <% end %>
+  <% if can?(:index, Spree::Payment) %>
+    <li class="nav-item" data-hook='admin_order_tabs_payments'>
+      <%= link_to_with_icon 'credit-card.svg',
+        Spree.t(:payments),
+        spree.admin_order_payments_url(@order),
+        class: "#{'active' if current == :payments} nav-link" %>
+    </li>
+  <% end %>
 
-    <% if can? :index, Spree::CustomerReturn %>
-      <% if @order.completed? %>
-        <li>
-          <%= link_to_with_icon 'returns.svg',
-            Spree.t(:customer_returns),
-            spree.admin_order_customer_returns_url(@order),
-            class: "#{'active' if current == :customer_returns} nav-link" %>
-        </li>
-      <% end %>
+  <% if can? :index, Spree::ReturnAuthorization %>
+    <% if @order.completed? %>
+      <li class="nav-item" data-hook='admin_order_tabs_return_authorizations'>
+        <%= link_to_with_icon 'enter.svg',
+          Spree.t(:return_authorizations),
+          spree.admin_order_return_authorizations_url(@order),
+          class: "#{'active' if current == :return_authorizations} nav-link" %>
+      </li>
     <% end %>
+  <% end %>
 
-    <% if can? :update, @order %>
-      <li data-hook='admin_order_tabs_state_changes'>
-        <%= link_to_with_icon 'save.svg',
-          Spree::StateChange.human_attribute_name(:state_changes),
-          spree.admin_order_state_changes_url(@order),
-          class: "#{'active' if current == :state_changes} nav-link" %>
+  <% if can? :index, Spree::CustomerReturn %>
+    <% if @order.completed? %>
+      <li class="nav-item">
+        <%= link_to_with_icon 'returns.svg',
+          Spree.t(:customer_returns),
+          spree.admin_order_customer_returns_url(@order),
+          class: "#{'active' if current == :customer_returns} nav-link" %>
       </li>
     <% end %>
-  </ul>
+  <% end %>
+
+  <% if can? :update, @order %>
+    <li class="nav-item" data-hook='admin_order_tabs_state_changes'>
+      <%= link_to_with_icon 'calendar3.svg',
+        Spree::StateChange.human_attribute_name(:state_changes),
+        spree.admin_order_state_changes_url(@order),
+        class: "#{'active' if current == :state_changes} nav-link" %>
+    </li>
+  <% end %>
 <% end %>

data/app/views/spree/admin/shared/_product_tabs.html.erb

@@ -1,56 +1,62 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:products), admin_products_path %> /
+  <%= page_header_back_button spree.admin_products_path %>
   <%= @product.name %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <ul class="nav flex-column nav-pills" data-hook="admin_product_tabs">
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'edit.svg',
-        Spree.t(:details),
-        edit_admin_product_url(@product),
-        class: "nav-link #{'active' if current == :details}" %>
+<% content_for(:page_tabs) do %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'edit.svg',
+      Spree.t(:details),
+      edit_admin_product_url(@product),
+      class: "nav-link #{'active' if current == :details}" %>
 
-    <% end if can?(:admin, Spree::Product) %>
+  <% end if can?(:admin, Spree::Product) %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'images.svg',
-        Spree.t(:images),
-        spree.admin_product_images_url(@product),
-        class: "nav-link #{'active' if current == :images}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'images.svg',
+      Spree.t(:images),
+      spree.admin_product_images_url(@product),
+      class: "nav-link #{'active' if current == :images}" %>
 
-    <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'adjust.svg',
-        Spree.t(:variants),
-        spree.admin_product_variants_url(@product),
-        class: "nav-link #{'active' if current == :variants}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'adjust.svg',
+      Spree.t(:variants),
+      spree.admin_product_variants_url(@product),
+      class: "nav-link #{'active' if current == :variants}" %>
 
-    <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'list.svg',
-        Spree.t(:properties),
-        spree.admin_product_product_properties_url(@product),
-        class: "nav-link #{'active' if current == :properties}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'list.svg',
+      Spree.t(:properties),
+      spree.admin_product_product_properties_url(@product),
+      class: "nav-link #{'active' if current == :properties}" %>
 
-    <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'items.svg',
-        Spree.t(:stock),
-        stock_admin_product_url(@product),
-        class: "nav-link #{'active' if current == :stock}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'box-seam.svg',
+      Spree.t(:stock),
+      stock_admin_product_url(@product),
+      class: "nav-link #{'active' if current == :stock}" %>
 
-    <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'money.svg',
-        Spree.t(:prices),
-        admin_product_prices_path(@product),
-        class: "nav-link #{'active' if current == :prices}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'currency-exchange.svg',
+      Spree.t(:prices),
+      admin_product_prices_path(@product),
+      class: "nav-link #{'active' if current == :prices}" %>
 
-    <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
-  </ul>
+  <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
+
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'download.svg',
+      Spree.t('admin.digitals.digital_assets'),
+      admin_product_digitals_path(@product),
+      class: "nav-link #{'active' if current == :digitals} #{current}" %>
+
+  <% end if can?(:admin, Spree::Digital) && !@product.deleted? %>
 <% end %>

data/app/views/spree/admin/shared/_refunds.html.erb

@@ -1,6 +1,6 @@
-<div class="table-responsive">
-  <table class="table table-condensed table-bordered" id='refunds' data-order-id='<%= @order.number %>'>
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="table table-condensed border rounded" id='refunds' data-order-id='<%= @order.number %>'>
+    <thead class="text-muted">
       <tr data-hook="refunds_header">
         <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
         <th><%= Spree.t(:payment_identifier) %></th>
@@ -25,7 +25,7 @@
           <% if show_actions %>
             <td class="actions">
               <span class="d-flex justify-content-end">
-                <%= link_to_with_icon('edit.svg', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:edit, refund) %>
+                <%= link_to_with_icon('edit.svg', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, class: "btn btn-light btn-sm") if can?(:edit, refund) %>
               </span>
             </td>
           <% end %>

data/app/views/spree/admin/shared/_report_order_criteria.html.erb

@@ -8,7 +8,7 @@
              data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
              data-max-date="<%= params[:q][:completed_at_lt] %>">
           <%= s.text_field :completed_at_gt,
-                           class: 'form-control shadow-none',
+                           class: 'form-control',
                            placeholder: Spree.t(:starting_from),
                            value: datepicker_field_value(params[:q][:completed_at_gt]),
                            'data-input':'' %>
@@ -24,7 +24,7 @@
              data-min-date="<%= params[:q][:completed_at_gt] %>">
 
           <%= s.text_field :completed_at_lt,
-                           class: 'form-control shadow-none',
+                           class: 'form-control',
                            placeholder: Spree.t(:ending_at),
                            value: datepicker_field_value(params[:q][:completed_at_lt]),
                            'data-input':'' %>

data/app/views/spree/admin/shared/_store_switcher.html.erb

@@ -8,15 +8,15 @@
      <span class="d-none d-sm-inline"><%= current_store.name %></span> (<%= current_store.code %>) <%= svg_icon name: "chevron-down.svg", width: '12', height: '12', classes: 'ml-1 mb-0' %>
     </a>
 
-    <div class="dropdown-menu dropdown-menu-left overflow-hidden ml-lg-2 mt-2 py-0" aria-labelledby="storeSelectorDropdown">
+    <div class="dropdown-menu dropdown-menu-left overflow-hidden ml-2" aria-labelledby="storeSelectorDropdown">
       <% @stores.each do |store| %>
         <%= store_switcher_link(store) %>
       <% end %>
 
       <% if can?(:create, Spree::Store) %>
         <div class="dropdown-divider m-0"></div>
-        <%= link_to spree.new_admin_store_path, class: 'text-dark p-3 dropdown-item', id: 'addNewStoreLink' do %>
-          <%= svg_icon name: "add.svg", width: '18', height: '18' %> <%= Spree.t(:add_new_store) %>
+        <%= link_to spree.new_admin_store_path, class: 'py-2 px-4 mt-1 mb-0 dropdown-item', id: 'addNewStoreLink' do %>
+          <%= svg_icon name: "plus-circle", width: '18', height: '18' %> <%= Spree.t(:add_new_store) %>
         <% end %>
       <% end %>
     </div>

data/app/views/spree/admin/shared/_table_filter.html.erb

@@ -1,19 +1,18 @@
 <% if content_for?(:table_filter) %>
-  <div class="filter-wrap pb-1">
+  <div class="filter-wrap mb-4">
     <div class="col-12 px-0">
       <div class="input-group index-filter-button flex-nowrap">
-        <span class="input-group-btn">
-          <button class="btn js-show-index-filters m-0" type="button">
-            <%= svg_icon name: "chevron-right.svg", width: '12', height: '12' %>
-            <span class="d-none d-sm-inline"><%= Spree.t(:filter) %></span>
-          </button>
-        </span>
-        <%= form_tag request.fullpath, id: "quick-search", class: 'flex-grow-1' do %>
+        <%= form_tag request.fullpath, id: "quick-search", class: 'flex-grow-1 mr-3' do %>
           <%= text_field_tag :quick_search, nil, class: "form-control js-quick-search", placeholder: Spree.t(:search_by) %>
         <% end %>
+
+        <button class="btn btn-light js-show-index-filters m-0 rounded-sm" type="button">
+          <%= svg_icon name: "filter.svg", width: '16', height: '16' %>
+          <span class="d-none d-sm-inline"><%= Spree.t('admin.filters') %></span>
+        </button>
       </div>
       <% unless defined?(simple) %>
-        <div id="table-filter" data-hook class="card bg-light filter-well">
+        <div id="table-filter" data-hook class="card filter-well mt-4">
           <div class="card-body">
             <%= yield :table_filter %>
           </div>

data/app/views/spree/admin/shared/_update_order_state.js.erb

@@ -1,11 +1,11 @@
-$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_state) %>');
-$('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
+$('#order_tab_summary #order_status').html('<%= j Spree.t(@order.state, scope: :order_state) %>');
+$('#order_tab_summary #order_total').html('<%= j @order.display_total.to_html %>');
 
 <% if @order.completed? %>
   <% if @order.payment_state.present? %>
-    $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
+    $('#order_tab_summary #payment_status').html('<%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
   <% end %>
   <% if @order.shipment_state.present? %>
-    $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
+    $('#order_tab_summary #shipment_status').html('<%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
   <% end %>
 <% end %>

data/app/views/spree/admin/shared/_version.html.erb

@@ -1,7 +1,9 @@
-<% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
-  <small
-    class="spree-version font-weight-bold ml-3 my-3 text-muted"
+<% if can?(:admin, current_store) && Spree::Backend::Config[:admin_show_version] %>
+  <p
+    class="spree-version ml-3 my-3"
     aria-label="Spree Commerce version">
+    <span class="badge badge-pill badge-info">
     <%= Spree.version %>
-  </small>
+    </span>
+  </p>
 <% end %>

data/app/views/spree/admin/shared/cms/_spree_product.html.erb

@@ -1,8 +1,8 @@
-<%= f.field_container save_to, class: ['form-group'] do %>
+<%= f.field_container save_to do %>
   <%= f.label save_to, Spree.t('admin.cms.link_to_product') %>
   <%= f.select save_to, options_from_collection_for_select([resource], save_to, save_to, resource.send(save_to) || nil), { include_blank: true },
                           id: "cms_section_#{save_to}",
-                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_product'),
+                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_product'),
                                   autocomplete_clear_value: true,
                                   autocomplete_url_value: 'products_api_v2',
                                   autocomplete_return_attr_value: 'name',

data/app/views/spree/admin/shared/cms/_spree_taxon.html.erb

@@ -1,8 +1,8 @@
-<%= f.field_container save_to, class: ['form-group'] do %>
+<%= f.field_container save_to do %>
   <%= f.label save_to, Spree.t('admin.cms.link_to_taxon') %>
   <%= f.select save_to, options_from_collection_for_select([resource], save_to, save_to, resource.send(save_to) || nil), { include_blank: true },
                           id: "cms_section_#{save_to}",
-                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_taxon'),
+                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_taxon'),
                                   autocomplete_clear_value: true,
                                   autocomplete_url_value: 'taxons_api_v2',
                                   autocomplete_return_attr_value: 'pretty_name',

data/app/views/spree/admin/shared/linkables/_spree_cms_page.erb

@@ -4,14 +4,14 @@
    <% name_holder = :title %>
    <% active_id_holder = resource.linked_resource.id %>
  <% end %>
- <%= f.field_container :linked_resource_id, class: ['form-group'] do %>
+ <%= f.field_container :linked_resource_id do %>
     <%= f.label :linked_resource_id, Spree.t('page') %>
     <%= f.select :linked_resource_id,
          options_from_collection_for_select(resorce_holder || [],
                                             id_holder, name_holder, active_id_holder || nil),
          { include_blank: true },
          class: 'select2autocomplete',
-         data: { autocomplete_placeholder_value: Spree.t('admin.linkable.seach_for_a_page'),
+         data: { autocomplete_placeholder_value: Spree.t('admin.linkable.search_for_a_page'),
                  autocomplete_clear_value: true,
                  autocomplete_url_value: 'pages_api_v2',
                  autocomplete_return_attr_value: 'title',

data/app/views/spree/admin/shared/linkables/_spree_linkable_uri.html.erb

@@ -0,0 +1,16 @@
+<%= f.field_container :destination do %>
+  <%= f.label :destination, Spree.t(:url) %>
+  <%= f.text_field :destination, class: 'form-control' %>
+  <%= f.error_message_on :destination %>
+  <small class="form-text text-muted">
+    <%= raw Spree.t('admin.navigation.url_info') %>
+  </small>
+<% end %>
+
+<%= f.field_container :new_window do %>
+  <div class="custom-control custom-checkbox">
+    <%= f.check_box :new_window, class: 'custom-control-input' %>
+    <%= f.label :new_window, Spree.t('admin.navigation.open_link_in_new_window'), class: 'custom-control-label' %>
+    <%= f.error_message_on :new_window %>
+  </div>
+<% end %>

data/app/views/spree/admin/shared/linkables/_spree_product.html.erb

@@ -4,14 +4,14 @@
    <% name_holder = :name %>
    <% active_id_holder = resource.linked_resource.id %>
  <% end %>
- <%= f.field_container :linked_resource_id, class: ['form-group'] do %>
+ <%= f.field_container :linked_resource_id do %>
     <%= f.label :linked_resource_id, Spree.t('product') %>
     <%= f.select :linked_resource_id,
          options_from_collection_for_select(resorce_holder || [],
                                             id_holder, name_holder, active_id_holder || nil),
          { include_blank: true },
          class: 'select2autocomplete',
-         data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_product'),
+         data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_product'),
                  autocomplete_clear_value: true,
                  autocomplete_url_value: 'products_api_v2' } %>
 

data/app/views/spree/admin/shared/linkables/_spree_taxon.html.erb

@@ -5,14 +5,14 @@
    <% active_id_holder = resource.linked_resource.id %>
  <% end %>
 
- <%= f.field_container :linked_resource_field, class: ['form-group'] do %>
+ <%= f.field_container :linked_resource_field do %>
    <%= f.label :linked_resource_id, Spree.t('taxon') %>
    <%= f.select :linked_resource_id,
         options_from_collection_for_select(resource_holder || [],
                                            id_holder, name_holder, active_id_holder || nil),
         { include_blank: true },
         class: 'select2autocomplete',
-        data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_taxon'),
+        data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_taxon'),
                 autocomplete_clear_value: true,
                 autocomplete_url_value: 'taxons_api_v2',
                 autocomplete_return_attr_value: 'pretty_name' } %>

data/app/views/spree/admin/shared/linkables/_url.html.erb

@@ -1,4 +1,6 @@
-<%= f.field_container :destination, class: ['form-group'] do %>
+<!-- When using rails 7 compatible version of Spree this view is replaced by _spree_linkable_uri.html.erb -->
+
+<%= f.field_container :destination do %>
   <%= f.label :destination, Spree.t(:url) %>
   <%= f.text_field :destination, class: 'form-control' %>
   <%= f.error_message_on :destination %>

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -1,6 +1,6 @@
 <div data-hook="admin_named_type_form_fields">
-  <%= f.field_container :name, class: ['form-group'] do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+  <%= f.field_container :name do %>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -7,9 +7,9 @@
 <% end if can? :create, resource %>
 
 <% if @collection.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_named_types' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="named_types_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:status) %></th>
@@ -39,7 +39,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: resource_name) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, resource %>!
   </div>

data/app/views/spree/admin/{menus/nested_menu_items/_item_bar.html.erb → shared/sortable_tree/_menu.html.erb}

@@ -1,26 +1,29 @@
-<div class="container-item-row d-flex flex-nowrap">
+<% menu = parent_resource %>
+<% item = child_resource %>
+
+<div class="sortable-tree-item-row d-flex flex-nowrap">
   <div class="move-handle d-flex align-items-center p-3">
-    <%= svg_icon(name: 'sort.svg', width: '20', height: '20') %>
+    <%= svg_icon(name: 'grip-vertical.svg', width: '20', height: '20') %>
   </div>
 
   <div class="d-flex align-items-center overflow-hidden w-100">
     <div class="overflow-hidden">
       <%= item.name %>
       <% if item.link.present? %>
-        <span class="badge badge-light badge-light-muted-text">-> <%= item.link %></span>
+        <span class="badge badge-pill badge-light badge-light-muted-text">-> <%= item.link %></span>
       <% end %>
       <small class="form-text text-muted mt-0">
         <%= "#{Spree.t('admin.navigation.type')}: #{item.item_type}" %>
         <%= "| #{Spree.t('admin.navigation.code')}: #{item.code}" if item.code.present? %>
       </small>
     </div>
-      <% if item.icon.present? %>
-        <div class="ml-2">
-          <div class="menu_items_image_holder">
-            <%= image_tag main_app.url_for(item.icon.attachment) %>
-          </div>
+    <% if item.icon.present? %>
+      <div class="ml-2">
+        <div class="item_image_holder">
+          <%= image_tag main_app.cdn_image_url(item.icon.attachment) %>
         </div>
-      <% end %>
+      </div>
+    <% end %>
   </div>
 
   <div class="d-flex align-items-center space-buttons px-2">

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -0,0 +1,34 @@
+<% taxonomy = parent_resource %>
+<% taxon = child_resource %>
+
+<div class="sortable-tree-item-row d-flex flex-nowrap">
+  <div class="move-handle d-flex align-items-center p-3">
+    <%= svg_icon(name: 'grip-vertical.svg', width: '20', height: '20') %>
+  </div>
+
+  <div class="d-flex align-items-center overflow-hidden w-100">
+    <div class="overflow-hidden">
+      <%= taxon.name %>
+      <!-- TODO: Taxon Paths do not update in view, fix with Turbo Frames.
+        <h6 class="form-text text-muted mt-0 mb-1">
+          <span class="badge badge-pill badge-light badge-light-muted-text"><%#= svg_icon(name: 'link.svg', width: '16', height: '16') %> <%= taxon.permalink %></span>
+        </h6>
+      -->
+      <small class="form-text text-muted mt-0 mb-1">
+        <%= Spree.t('admin.taxonomies.submenu') %>: <%= active_badge(!taxon.hide_from_nav) %>
+      </small>
+    </div>
+    <% if taxon.icon.present? %>
+      <div class="ml-2">
+        <div class="item_image_holder">
+          <%= image_tag main_app.cdn_image_url(taxon.icon.attachment) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="d-flex align-items-center space-buttons px-2">
+    <%= link_to_edit(taxon, no_text: true, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id)) %>
+    <%= link_to_delete(taxon, no_text: true, url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id)) if can?(:destroy, taxon) %>
+  </div>
+</div>

data/app/views/spree/admin/shared/sub_menu/_apps.html.erb

@@ -0,0 +1,3 @@
+<ul id="sidebar-apps" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_apps">
+  <%= tab :oauth_applications, match_path: '/oauth_applications', label: 'oAuth Applications', do_not_titleize: true %>
+</ul>