spree_backend 3.0.1 → 3.0.2

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

@@ -5,19 +5,19 @@
 
 <% content_for :sidebar do %>
   <ul class="nav nav-pills nav-stacked" data-hook="admin_product_tabs">
-    <%= content_tag :li, :class => ('active' if current == 'Product Details') do %>
+    <%= content_tag :li, class: ('active' if current == :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 %>
+    <%= content_tag :li, class: ('active' if current == :images) do %>
       <%= link_to_with_icon 'picture', Spree.t(:images), spree.admin_product_images_url(@product) %>
     <% end if can?(:admin, Spree::Image) %>
-    <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
+    <%= content_tag :li, class: ('active' if current == :variants) do %>
       <%= link_to_with_icon 'th-large', Spree.t(:variants),  spree.admin_product_variants_url(@product) %>
     <% end if can?(:admin, Spree::Variant) %>
-    <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
+    <%= content_tag :li, class: ('active' if current == :properties) do %>
       <%= link_to_with_icon 'list-alt', Spree.t(:properties), spree.admin_product_product_properties_url(@product) %>
     <% end if can?(:admin, Spree::ProductProperty) %>
-    <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
+    <%= content_tag :li, class: ('active' if current == :stock) do %>
       <%= link_to_with_icon 'home', Spree.t(:stock), stock_admin_product_url(@product) %>
     <% end if can?(:stock, Spree::Product) %>
   </ul>

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

@@ -8,7 +8,7 @@
             <%= Spree.t(:filter) %>
           </button>
         </span>
-        <%= form_tag nil, id: "quick-search" do %>
+        <%= form_tag request.fullpath, id: "quick-search" do %>
           <%= text_field_tag :quick_search, nil, class: "form-control js-quick-search", placeholder: Spree.t(:quick_search) %>
         <% end %>
       </div>

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

@@ -20,7 +20,8 @@
     :find_a_taxon             => Spree.t(:find_a_taxon),
     :item_stock_placeholder   => Spree.t(:choose_location),
     :loading                  => Spree.t(:loading),
-    :month_names              => I18n.t(:month_names, :scope => :date).reject(&:blank?),
+    :month_names              => I18n.t(:month_names, :scope => :date).instance_eval {|o|
+                                     o.try(:reject, &:blank?) || o},
     :more                     => Spree.t(:more),
     :name                     => Spree.t(:name),
     :next                     => Spree.t(:next),

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

@@ -11,7 +11,7 @@
     <div data-hook="admin_shipping_method_form_display_field" class="col-md-6">
       <%= f.field_container :display_on, :class => ['form-group'] do %>
         <%= f.label :display_on, Spree.t(:display) %>
-        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2'}) %>
+        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, { :class => 'select2' }) %>
         <%= error_message_on :shipping_method, :display_on %>
       <% end %>
     </div>
@@ -21,7 +21,7 @@
     <div data-hook="admin_shipping_method_form_internal_name_field" class="col-md-4">
       <%= f.field_container :admin_name, :class => ['form-group'] do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
-        <%= f.text_field :admin_name, :class => 'form-control', :label => false  %>
+        <%= f.text_field :admin_name, :class => 'form-control', :label => false %>
         <%= error_message_on :shipping_method, :admin_name %>
       <% end %>
     </div>
@@ -29,7 +29,7 @@
     <div data-hook="admin_shipping_method_form_code" class="col-md-4">
       <%= f.field_container :code, :class => ['form-group'] do %>
         <%= f.label :code, Spree.t(:code) %>
-        <%= f.text_field :code, :class => 'form-control', :label => false  %>
+        <%= f.text_field :code, :class => 'form-control', :label => false %>
         <%= error_message_on :shipping_method, :code %>
       <% end %>
     </div>
@@ -56,10 +56,12 @@
       <div class="panel-body">
         <%= f.field_container :categories, :class => ['form-group'] do %>
           <% Spree::ShippingCategory.all.each do |category| %>
-            <%= label_tag do %>
-              <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
-              <%= category.name %>
-            <% end %>
+            <div class="checkbox">
+              <%= label_tag do %>
+                <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
+                <%= category.name %>
+              <% end %>
+            </div>
           <% end %>
           <%= error_message_on :shipping_method, :shipping_category_id %>
         <% end %>
@@ -79,13 +81,15 @@
         <%= f.field_container :zones, :class => ['form-group'] do %>
           <% shipping_method_zones = @shipping_method.zones.to_a %>
           <% Spree::Zone.all.each do |zone| %>
-            <%= label_tag do %>
-              <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
-              <%= zone.name %>
-            <% end %>
+            <div class="checkbox">
+              <%= label_tag do %>
+                <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
+                <%= zone.name %>
+              <% end %>
+            </div>
           <% end %>
           <%= error_message_on :shipping_method, :zone_id %>
-        <% end %>  
+        <% end %>
       </div>
     </div>
   </div>
@@ -106,7 +110,7 @@
 
       <div class="panel-body">
         <%= f.field_container :categories, :class => ['form-group'] do %>
-          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2" %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2" %>
           <%= error_message_on :shipping_method, :tax_category_id %>
         <% end %>
       </div>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'State Changes' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :state_changes } %>
 
 <% content_for :page_title do %>
   <%= plural_resource_name(Spree::StateChange) %>

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

@@ -14,9 +14,13 @@
       <script>
         Spree.routes.taxonomy_taxons_path = "<%= spree.api_taxonomy_taxons_path(@taxonomy) %>";
         Spree.routes.admin_taxonomy_taxons_path = "<%= spree.admin_taxonomy_taxons_path(@taxonomy) %>";
-        Spree.routes.jstree_theme_path = "<%= stylesheet_path("jquery.jstree/themes/apple/style.css") %>";
+        Spree.routes.jstree_theme_path = "<%= stylesheet_path("jquery.jstree/themes/spree/style.css") %>";
       </script>
-      <div id="taxonomy_tree" class="tree"></div>
+      <div id="taxonomy_tree" class="tree">
+        <div class="alert alert-warning">
+          <%= Spree.t(:loading_tree) %>
+        </div>
+      </div>
     </div>
 
     <div class="alert alert-info">
@@ -24,9 +28,9 @@
     </div>
 
     <div class="form-actions">
-      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, icon: 'delete' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= button Spree.t('actions.update'), 'ok', 'submit', { class: 'btn-success' } %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, icon: 'delete' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -8,9 +8,9 @@
   <%= render 'form', f: f %>
 
   <div class="form-actions" data-hook="buttons">
-    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "remove" %>
-    <%= Spree.t(:or) %>
     <%= button Spree.t('actions.update'), 'save' %>
+    <%= Spree.t(:or) %>
+    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "remove" %>
   </div>
 <% end %>
 

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

@@ -2,21 +2,21 @@
   <%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:editing_resource, resource: plural_resource_name(Spree::Address)) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :address } %>
-<%= render :partial => 'spree/admin/users/user_page_actions' %>
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :address } %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
 
 <div data-hook="admin_user_addresses" id="admin_user_edit_addresses">
   <div data-hook="admin_user_edit_form_header">
-    <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @user } %>
+    <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
   </div>
 
   <div data-hook="admin_user_address_edit_form">
     <%= form_for [:admin, @user], as: :user, url: addresses_admin_user_url(@user), method: :put do |f| %>
 
-      <%= render :partial => 'addresses_form', :locals => { :f => f } %>
+      <%= render partial: 'addresses_form', locals: { f: f } %>
 
       <div class="form-actions text-center well" data-hook="admin_user_edit_form_button">
-        <%= render :partial => 'spree/admin/shared/edit_resource_links', :locals => { :collection_url => spree.admin_users_url } %>
+        <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_users_url } %>
       </div>
     <% end %>
   </div>

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

@@ -2,8 +2,8 @@
   <%= Spree.t(:editing_user) %> <%= @user.email %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :account } %>
-<%= render :partial => 'spree/admin/users/user_page_actions' %>
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :account } %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
 
 <div data-hook="admin_user_edit_general_settings" class="panel panel-default">
   <div class="panel-heading">
@@ -14,15 +14,15 @@
 
   <div class="panel-body">
     <div data-hook="admin_user_edit_form_header">
-      <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @user } %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
     </div>
 
     <div data-hook="admin_user_edit_form">
       <%= form_for [:admin, @user], as: :user, url: spree.admin_user_url(@user), method: :put do |f| %>
-        <%= render :partial => 'form', :locals => { :f => f } %>
+        <%= render partial: 'form', locals: { f: f } %>
 
         <div data-hook="admin_user_edit_form_button">
-          <%= render :partial => 'spree/admin/shared/edit_resource_links', :locals => { :collection_url => spree.admin_users_url } %>
+          <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_users_url } %>
         </div>
       <% end %>
     </div>
@@ -32,7 +32,7 @@
 <div data-hook="admin_user_api_key" id="admin_user_edit_api_key" class="panel panel-default">
   <div class="panel-heading">
     <h1 class="panel-title">
-      <%= Spree.t('access', :scope => 'api') %>
+      <%= Spree.t('access', scope: 'api') %>
     </h1>
   </div>
 
@@ -40,29 +40,29 @@
     <% if @user.spree_api_key.present? %>
       <div class="form-group">
         <div id="current-api-key">
-          <label><%= Spree.t('key', :scope => 'api') %>: </label>
+          <label><%= Spree.t('key', scope: 'api') %>: </label>
           <strong><%= @user.spree_api_key %></strong>
         </div>
       </div>
       <div class="form-actions">
-        <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
-          <%= button Spree.t('clear_key', :scope => 'api'), 'delete', 'submit', class: "btn-danger" %>
+        <%= form_tag spree.clear_api_key_admin_user_path(@user), method: :put do %>
+          <%= button Spree.t('clear_key', scope: 'api'), 'delete', 'submit', class: "btn-danger" %>
         <% 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'), 'save' %>
+        <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
+          <%= button Spree.t('regenerate_key', scope: 'api'), 'save' %>
         <% end %>
       </div>
 
     <% else %>
 
-      <div class="alert alert-warning"><%= Spree.t('no_key', :scope => 'api') %></div>
+      <div class="alert alert-warning"><%= Spree.t('no_key', scope: 'api') %></div>
 
       <div class="form-actions">
-        <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-          <%= button Spree.t('generate_key', :scope => 'api'), 'key' %>
+        <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
+          <%= button Spree.t('generate_key', scope: 'api'), 'key' %>
         <% end %>
       </div>
     <% end %>

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

@@ -2,8 +2,8 @@
   <%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:"admin.user.items_purchased") %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :items } %>
-<%= render :partial => 'spree/admin/users/user_page_actions' %>
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :items } %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_items_purchased">
   <%= paginate @orders %>
@@ -12,13 +12,13 @@
     <%# TODO add search interface %>
     <table class="table table-condensed table-bordered stock-contents" id="listing_items" data-hook="stock-contents">
       <thead>
-        <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_completed_at_title'} %></th>
+        <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
         <th colspan=2><%= Spree.t(:description) %></th>
-        <th><%= I18n.t(:price, :scope => 'activerecord.attributes.spree/line_item') %></th>
-        <th><%= I18n.t(:quantity, :scope => 'activerecord.attributes.spree/line_item') %></th>
+        <th><%= I18n.t(:price, scope: 'activerecord.attributes.spree/line_item') %></th>
+        <th><%= I18n.t(:quantity, scope: 'activerecord.attributes.spree/line_item') %></th>
         <th><%= Spree.t(:total) %></th>
-        <th><%= sort_link @search, :state, I18n.t(:state, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_state_title'} %></th>
-        <th><%= sort_link @search, :number, Spree.t(:order_num, :scope => 'admin.user'), {}, {:title => 'orders_number_title'} %></th>
+        <th><%= sort_link @search, :state, I18n.t(:state, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_state_title'} %></th>
+        <th><%= sort_link @search, :number, Spree.t(:order_num, scope: 'admin.user'), {}, {title: 'orders_number_title'} %></th>
       </thead>
       <tbody>
         <% @orders.each do |order| %>

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

@@ -2,8 +2,8 @@
   <%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:"admin.user.order_history") %>
 <% end %>
 
-<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :orders } %>
-<%= render :partial => 'spree/admin/users/user_page_actions' %>
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :orders } %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_order_history">
   <%= paginate @orders %>
@@ -13,10 +13,10 @@
     <table class="table table-condensed table-bordered" id="listing_orders" data-hook>
       <thead>
         <tr data-hook="admin_orders_index_headers">
-          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_completed_at_title'} %></th>
-          <th><%= sort_link @search, :number,         I18n.t(:number, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_number_title'} %></th>
-          <th><%= sort_link @search, :state,          I18n.t(:state, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_state_title'} %></th>
-          <th><%= sort_link @search, :total,          I18n.t(:total, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_total_title'} %></th>
+          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
+          <th><%= sort_link @search, :number,         I18n.t(:number, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_number_title'} %></th>
+          <th><%= sort_link @search, :state,          I18n.t(:state, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_state_title'} %></th>
+          <th><%= sort_link @search, :total,          I18n.t(:total, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_total_title'} %></th>
         </tr>
       </thead>
       <tbody>

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

@@ -1,13 +1,11 @@
 <script type='text/template' id='variant_autocomplete_template'>
   <div class='variant-autocomplete-item media'>
     <figure class='variant-image media-left'>
-      <span class="thumbnail no-marginb">
-        {{#if variant.image }}
-          <img src='{{variant.image}}' />
-        {{ else }}
-          <img src='<%= image_path("noimage/mini.png") %>' />
-        {{/if}}
-      </span>
+      {{#if variant.image }}
+        <img src='{{variant.image}}' class="thumbnail no-marginb" />
+      {{ else }}
+        <img src='<%= image_path("noimage/mini.png") %>' class="thumbnail no-marginb" />
+      {{/if}}
     </figure>
 
     <div class='variant-details media-body'>

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

@@ -1,13 +1,13 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Variants' } %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :variants } %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @variant } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset>
     <div data-hook="admin_variant_edit_form">
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
     </div>
 
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Variants'} %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: {current: :variants} %>
 
 <%# Place for new variant form %>
 <div id="new_variant" data-hook></div>
@@ -25,8 +25,8 @@
         <td><%= variant.display_price.to_html %></td>
         <td><%= variant.sku %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit(variant, :no_text => true) if can?(:edit, variant) && !variant.deleted? %>
-          <%= link_to_delete(variant, :no_text => true) if can?(:destroy, variant) && !variant.deleted? %>
+          <%= link_to_edit(variant, no_text: true) if can?(:edit, variant) && !variant.deleted? %>
+          <%= link_to_delete(variant, no_text: true) if can?(:destroy, variant) && !variant.deleted? %>
         </td>
       </tr>
       <% end %>
@@ -55,7 +55,7 @@
   <% end %>
 <% else %>
   <% content_for :page_actions do %>
-    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { :remote => :true, :icon => 'add', :'data-update' => 'new_variant', :class => 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
-    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, :deleted => @deleted.blank? ? "on" : "off"), { :class => 'btn-default', :icon => 'filter' } %>
+    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { remote: :true, icon: 'add', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
+    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-default', icon: 'filter' } %>
   <% end %>
 <% end %>

data/config/routes.rb

@@ -105,7 +105,7 @@ Spree::Core::Engine.add_routes do
         resources :refunds, only: [:new, :create, :edit, :update]
       end
 
-      resources :reimbursements, only: [:create, :show, :edit, :update] do
+      resources :reimbursements, only: [:index, :create, :show, :edit, :update] do
         member do
           post :perform
         end
@@ -125,9 +125,6 @@ Spree::Core::Engine.add_routes do
       collection do
         post :update_positions
       end
-      member do
-        get :get_children
-      end
       resources :taxons
     end
 

data/lib/spree/backend/engine.rb

@@ -23,7 +23,7 @@ module Spree
           spree/backend/address_states.js
           jqPlot/excanvas.min.js
           spree/backend/images/new.js
-          jquery.jstree/themes/apple/*
+          jquery.jstree/themes/spree/*
           fontawesome-webfont*
           select2_locale*
           jquery.alerts/images/*

data/vendor/assets/stylesheets/jquery.jstree/themes/spree/style.scss

@@ -0,0 +1,216 @@
+/*
+ * jsTree Spree theme 1.0
+ */
+
+.jstree-spree {
+
+  li, li ul {
+    border-color: #ededed;
+    border-style: solid;
+  }
+
+  li {
+    margin-left: 26px;
+    border-width: 0 0 1px 0;
+
+    &:last-of-type {
+      border-bottom-width: 0;
+    }
+
+    ul {
+      border-width: 1px 0 0 0;
+    }
+  }
+
+  ins {
+    position: relative;
+    cursor: pointer;
+    width: 24px;
+    line-height: 1;
+    height: 38px;
+    vertical-align: middle;
+    font-family: 'Glyphicons Halflings';
+    color: #555;
+
+    &:before {
+      position: absolute;
+      top: 12px;
+      padding-left: 4px;
+      font-size: 12px;
+    }
+  }
+
+  .jstree-open > ins:before { content: '\e114' }
+
+  .jstree-closed > ins:before { content: '\e080' }
+
+  .jstree-leaf > ins {
+    background-position: -36px 0;
+  }
+
+  .jstree-locked a {
+    color: silver;
+    cursor: default;
+  }
+
+  a {
+    line-height: 38px;
+    height: 38px;
+    padding: 0;
+    color: #555;
+    cursor: context-menu;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+
+    &.jstree-search {
+      color: aqua;
+    }
+
+    &.jstree-loading .jstree-icon {
+      background: image-url("jquery.jstree/themes/spree/throbber.gif") center center no-repeat !important;
+
+      &:before { content: '' }
+    }
+
+    .jstree-icon {
+      vertical-align: middle;
+      font-family: 'Glyphicons Halflings';
+      line-height: 20px;
+      width: 20px;
+      height: 24px;
+      text-align: center;
+      margin-right: 8px;
+      pointer-events: none;
+
+      &:before {
+        content: "\e118";
+        top: 1px;
+        padding-left: 0;
+      }
+    }
+  }
+
+  .jstree-rename-input {
+    height: 38px !important;
+    line-height: 38px !important;
+    left: 46px !important;
+    padding: 0 5px !important;
+  }
+
+  .jstree-hovered {
+    background: #e7f4f9;
+    border: 1px solid #d8f0fa;
+    padding: 0 3px 0 1px;
+    text-shadow: 1px 1px 1px silver;
+  }
+
+  .jstree-clicked {
+    background: #beebff;
+    border: 1px solid #99defd;
+    padding: 0 3px 0 1px;
+  }
+
+  .jstree-no-dots li,
+  .jstree-no-dots .jstree-leaf > ins {
+    background: transparent;
+  }
+
+  .jstree-no-dots .jstree-open > ins {
+    background-position: -18px 0;
+  }
+
+  .jstree-no-dots .jstree-closed > ins {
+    background-position: 0 0;
+  }
+
+  .jstree-no-icons a .jstree-icon {
+    display: none;
+  }
+
+  .jstree-search {
+    font-style: italic;
+  }
+
+  .jstree-no-icons .jstree-checkbox {
+    display: inline-block;
+  }
+
+  .jstree-no-checkboxes .jstree-checkbox {
+    display: none !important;
+  }
+
+  .jstree-checked > a > .jstree-checkbox {
+    background-position: -38px -19px;
+  }
+
+  .jstree-unchecked > a > .jstree-checkbox {
+    background-position: -2px -19px;
+  }
+
+  .jstree-undetermined > a > .jstree-checkbox {
+    background-position: -20px -19px;
+  }
+
+  .jstree-checked > a > .checkbox:hover {
+    background-position: -38px -37px;
+  }
+
+  .jstree-unchecked > a > .jstree-checkbox:hover {
+    background-position: -2px -37px;
+  }
+
+  .jstree-undetermined > a > .jstree-checkbox:hover {
+    background-position: -20px -37px;
+  }
+}
+
+#vakata-dragged.jstree-spree ins {
+  background: transparent !important;
+}
+
+#vakata-contextmenu.jstree-spree-context {
+  background: #fbfbfb;
+  border: 1px solid #eee;
+  margin-top: 15px;
+  margin-left: -4px;
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  -moz-box-shadow:    0 6px 12px rgba(0, 0, 0, 0.175);
+  box-shadow:         0 6px 12px rgba(0, 0, 0, 0.175);
+
+  li {
+
+    ins { display: none }
+    a { line-height: 38px }
+  }
+
+  a { color: #555; }
+
+  a:hover,
+  .vakata-hover > a {
+    color: inherit;
+    padding: 0 5px;
+    background: #ededed;
+    border: 1px solid #ededed;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+  }
+
+  li.jstree-contextmenu-disabled a ,
+  li.jstree-contextmenu-disabled a:hover {
+    color: silver;
+    background: transparent;
+    border: 0;
+    padding: 1px 4px;
+  }
+
+  li.vakata-separator {
+    background: white;
+    border-top: 1px solid #e0e0e0;
+    margin: 0;
+  }
+
+  .icon {
+    margin: 0 10px 0 5px;
+  }
+}