spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -1,30 +1,24 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_product) %> &ldquo;<%= @product.name %>&rdquo;
-<% end %>
-
-<% content_for :sidebar_title do %>
-  <span class="sku"><%= @product.sku %></span>
+  <%= link_to Spree.t(:products), admin_products_path %> /
+  <%= @product.name %>
 <% end %>
 
 <% content_for :sidebar do %>
-  <nav class="menu">
-    <ul data-hook="admin_product_tabs">
-      <%= content_tag :li, :class => ('active' if current == 'Product Details') do %>
-        <%= link_to_with_icon 'edit', Spree.t(:product_details), 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), 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', Spree.t(:variants),  admin_product_variants_url(@product) %>
-      <% end if can?(:admin, Spree::Variant) %>
-      <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
-        <%= link_to_with_icon 'tasks', Spree.t(:product_properties), 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 'tasks', Spree.t(:stock_management), stock_admin_product_url(@product) %>
-      <% end if can?(:stock, Spree::Product) %>
-    </ul>
-  </nav>
-
+  <ul class="nav nav-pills nav-stacked" data-hook="admin_product_tabs">
+    <%= content_tag :li, :class => ('active' if current == 'Product Details') do %>
+      <%= link_to_with_icon 'edit', Spree.t(:details), 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', Spree.t(:images), 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', Spree.t(:variants),  admin_product_variants_url(@product) %>
+    <% end if can?(:admin, Spree::Variant) %>
+    <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
+      <%= link_to_with_icon 'list-alt', Spree.t(:properties), 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 'home', Spree.t(:stock), stock_admin_product_url(@product) %>
+    <% end if can?(:stock, Spree::Product) %>
+  </ul>
 <% end %>

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

@@ -1,4 +1,4 @@
-<table class="index" id='payments' data-order-id='<%= @order.number %>'>
+<table class="table table-condensed table-bordered" id='refunds' data-order-id='<%= @order.number %>'>
   <thead>
     <tr data-hook="refunds_header">
       <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
@@ -8,7 +8,7 @@
       <th><%= Spree.t(:transaction_id) %></th>
       <th><%= Spree.t(:reason) %></th>
       <% if show_actions %>
-        <th class="actions"></th>
+        <th></th>
       <% end %>
     </tr>
   </thead>
@@ -16,14 +16,14 @@
     <% refunds.each do |refund| %>
       <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
         <td><%= pretty_time(refund.created_at) %></td>
-        <td class="align-center"><%= refund.payment.identifier %></td>
-        <td class="align-center amount"><%= refund.display_amount %></td>
-        <td class="align-center"><%= payment_method_name(refund.payment) %></td>
-        <td class="align-center"><%= refund.transaction_id %></td>
-        <td class="align-center"><%= truncate(refund.reason.name, length: 100) %></td>
+        <td><%= refund.payment.identifier %></td>
+        <td class="amount"><%= refund.display_amount %></td>
+        <td><%= payment_method_name(refund.payment) %></td>
+        <td><%= refund.transaction_id %></td>
+        <td><%= truncate(refund.reason.name, length: 100) %></td>
         <% if show_actions %>
-          <td class="actions">
-            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true %>
+          <td class="actions actions-1">
+            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, :class => "btn btn-default btn-sm" %>
           </td>
         <% end %>
       </tr>

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

@@ -1,17 +1,17 @@
 <%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
-    <div class="date-range-filter field align-center">
+    <div class="date-range-filter field ">
         <%= 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>
 
         <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:created_at_lt]) %>
         <%= label_tag nil, Spree.t(:end), :class => 'inline' %>
     </div>
 
-    <div class="actions filter-actions">
+    <div class="form-actions">
       <%= button Spree.t(:search), 'search'  %>
     </div>
 <% end %>

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

@@ -1,17 +1,17 @@
 <%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
-  <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>
-
-    <%= s.text_field :completed_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:completed_at_lt]) %>
-    <%= label_tag :q_completed_at_lt, Spree.t(:end), :class => 'inline' %>
+  <div class="form-group date-range-filter">
+    <%= label_tag nil, Spree.t(:date_range) %>
+    <div class="date-range-filter row">
+      <div class="col-md-6">
+        <%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from form-control', :value => datepicker_field_value(params[:q][:completed_at_gt]) %>
+      </div>
+      <div class="col-md-6">
+        <%= s.text_field :completed_at_lt, :class => 'datepicker datepicker-to form-control', :value => datepicker_field_value(params[:q][:completed_at_lt]) %>
+    </div>
+    </div>
   </div>
 
-  <div class="actions filter-actions">
-    <%= button Spree.t(:search), 'search'  %>
+  <div class="form-actions">
+    <%= button Spree.t(:search), 'search' %>
   </div>
 <% end %>

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

@@ -1,10 +1,5 @@
 <% if content_for?(:sidebar) %>
-  <aside id="sidebar" data-hook class="four columns">
-
-    <% if content_for?(:sidebar_title) %>
-      <h5 class="sidebar-title"><span><%= yield :sidebar_title %></span></h5>
-    <% end %>
-
+  <aside id="sidebar" class="main-right-sidebar" data-hook>
     <%= yield :sidebar %>
   </aside>
 <% end %>

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

@@ -1,8 +1,24 @@
 <% if content_for?(:table_filter) %>
-  <div id="table-filter" data-hook class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
-    <fieldset>
-      <legend align="center"><%= yield :table_filter_title %></legend>
-      <%= yield :table_filter %>
-    </fieldset>
+  <div class="filter-wrap row">
+    <div class="col-sm-12">
+      <div class="input-group index-filter-button">
+        <span class="input-group-btn">
+          <button class="btn btn-default js-show-index-filters" type="button">
+            <span class="icon icon-chevron-right"></span>
+            <%= Spree.t(:filter) %>
+          </button>
+        </span>
+        <%= form_tag nil, id: "quick-search" do %>
+          <%= text_field_tag :quick_search, nil, class: "form-control js-quick-search", placeholder: Spree.t(:quick_search) %>
+        <% end %>
+      </div>
+      <% unless defined?(simple) %>
+        <div id="table-filter" data-hook class="well filter-well" style="display: none">
+          <%= yield :table_filter %>
+        </div>
+      <% end %>
+    </div>
   </div>
+
+  <div class="table-active-filters js-filters"></div>
 <% end %>

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

@@ -1,17 +1,16 @@
 <% content_for :page_title do %>
-  <%= page_title %> <i class="fa fa-arrow-right"></i>
-  <%= @object.name %>
+  <%= page_title %> / <%= @object.name %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', back_button_text, collection_url, :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', back_button_text, collection_url, class: 'btn btn-default' %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
 
 <%= form_for [:admin, @object] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'spree/admin/shared/named_types/form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  <fieldset>
+    <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -1,16 +1,12 @@
-<div data-hook="admin_named_type_form_fields" class="row">
-  <div class="row">
-    <div class="alpha four columns">
-      <%= f.field_container :name do %>
-        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-        <%= f.text_field :name, :class => 'fullwidth' %>
-      <% end %>
-      <div class="checkbox">
-        <label>
-          <%= f.check_box :active %>
-          <%= Spree.t(:active) %>
-        </label>
-      </div>
-    </div>
+<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.text_field :name, class: 'form-control' %>
+  <% end %>
+  <div class="checkbox">
+    <%= label_tag :active do %>
+      <%= f.check_box :active %>
+      <%= Spree.t(:active) %>
+    <% end %>
   </div>
 </div>

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

@@ -1,41 +1,30 @@
-<%= render partial: 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= page_title %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <ul class="actions inline-menu">
-    <li>
-      <%= button_link_to new_button_text, new_object_url, { icon: 'plus', id: 'admin_new_named_type' } %>
-    </li>
-  </ul>
+  <%= button_link_to new_button_text, new_object_url, { icon: 'add', id: 'admin_new_named_type', :class => "btn-success" } %>
 <% end %>
 
 <% if @collection.any? %>
-  <table class="index" id='listing_named_types' data-hook>
-    <colgroup>
-      <col style="width: 65%" />
-      <col style="width: 20%" />
-      <col style="width: 15%" />
-    </colgroup>
+  <table class="table" id='listing_named_types' data-hook>
     <thead>
       <tr data-hook="named_types_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:state) %></th>
-        <th class="actions"></th>
+        <th></th>
       </tr>
     </thead>
     <tbody>
       <% @collection.each do |named_type| %>
-        <tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row">
           <td class="align-center">
             <%= named_type.name %>
           </td>
           <td class="align-center">
             <%= Spree.t(named_type.active? ? :active : :inactive) %>
           </td>
-          <td class="actions">
+          <td class="actions actions-1 text-right">
             <% if named_type.mutable? %>
               <%= link_to_edit named_type, no_text: true %>
             <% end %>
@@ -45,7 +34,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: resource_name) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>

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

@@ -3,14 +3,14 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', back_button_text, collection_url, :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', back_button_text, collection_url, class: 'btn btn-default' %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
 
 <%= form_for [:admin, @object] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'spree/admin/shared/named_types/form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  <fieldset>
+    <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -0,0 +1,21 @@
+<ul data-hook="admin_configurations_sidebar_menu" class="collapse nav nav-pills nav-stacked" id="sidebar-configuration">
+  <%= configurations_sidebar_menu_item Spree.t(:general_settings), edit_admin_general_settings_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:tax_categories), admin_tax_categories_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:zones), admin_zones_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:countries), admin_countries_path %>
+
+  <% if country = Spree::Country.find_by_id(Spree::Config[:default_country_id]) || Spree::Country.first %>
+    <%= configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(country) %>
+  <% end %>
+
+  <%= configurations_sidebar_menu_item Spree.t(:payment_methods), admin_payment_methods_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:shipping_methods), admin_shipping_methods_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:shipping_categories), admin_shipping_categories_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:stock_transfers), admin_stock_transfers_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:stock_locations), spree.admin_stock_locations_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:analytics_trackers), admin_trackers_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:refund_reasons), admin_refund_reasons_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:reimbursement_types), admin_reimbursement_types_path %>
+  <%= configurations_sidebar_menu_item Spree.t(:return_authorization_reasons), admin_return_authorization_reasons_path %>  
+</ul>

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

@@ -0,0 +1,8 @@
+<ul id="sidebar-product" class="collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
+  <%= tab *Spree::BackendConfiguration::PRODUCT_TABS %>
+  <%= tab :option_types, :match_path => '/option_types' %>
+  <%= tab :properties %>
+  <%= tab :prototypes %>
+  <%= tab :taxonomies %>
+  <%= tab :taxons %>
+</ul>

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

@@ -0,0 +1,4 @@
+<ul id="sidebar-promotions" class="collapse nav nav-pills nav-stacked" data-hook="admin_promotion_sub_tabs">
+  <%= tab :promotions %>
+  <%= tab :promotion_categories %>
+</ul>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_shipping_category_form_fields">
-  <div data-hook="name" class="field align-center">
+  <div data-hook="name" class="form-group">
     <%= label_tag :shipping_category_name, Spree.t(:name) %><br>
-    <%= f.text_field :name %>    
+    <%= f.text_field :name, class: 'form-control' %>
   </div>
 </div>

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

@@ -1,20 +1,10 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_shipping_category) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_shipping_categories), spree.admin_shipping_categories_path, :icon => 'arrow-left' %>
-  </li>
+  <%= Spree.t(:editing_resource, resource: Spree::ShippingCategory.model_name.human) %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_category } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>
 
 <%= form_for [:admin, @shipping_category] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -1,42 +1,34 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:shipping_categories) %>
+  <%= Spree::ShippingCategory.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_shipping_category), new_object_url, :icon => 'plus' %>
-  </li>
+  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, :class => "btn-success", :icon => 'add' %>
 <% end %>
 
 <% if @shipping_categories.any? %>
-<table class="index">
-  <colgroup>
-    <col style="width: 85%">
-    <col style="width: 15%">
-  </colgroup>
-  <thead>
-    <tr data-hook="categories_header">
-      <th><%= Spree.t(:name) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @shipping_categories.each do |shipping_category|%>
-    <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row" class="<%= cycle('odd', 'even')%>">
-      <td class="align-center" style="width:350px;"><%= shipping_category.name %></td>
-      <td class="actions">
-        <%= link_to_edit shipping_category, :no_text => true %>
-        <%= link_to_delete shipping_category, :no_text => true %>
-      </td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
+  <table class="table">
+    <thead>
+      <tr data-hook="categories_header">
+        <th><%= Spree.t(:name) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @shipping_categories.each do |shipping_category|%>
+      <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
+        <td><%= shipping_category.name %></td>
+        <td class="actions actions-2 text-right">
+          <%= link_to_edit shipping_category, :no_text => true %>
+          <%= link_to_delete shipping_category, :no_text => true %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/shipping_category')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_shipping_category_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::ShippingCategory.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -1,19 +1,11 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_shipping_category) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_shipping_categories_list), spree.admin_shipping_categories_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_category } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>
 
 <%= form_for [:admin, @shipping_category] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
   </fieldset>