solidus_backend 1.2.3 → 1.3.0.beta1

data/app/views/spree/admin/style_guide/topics/components/_tabs.html.erb

@@ -0,0 +1,17 @@
+<%- snippet = capture do %>
+  <ul class="tabs">
+    <li class="active"><a href="#">Product Details</a></li>
+    <li><a href="#">Images</a></li>
+    <li><a href="#">Variants</a></li>
+    <li><a href="#">Product Properties</a></li>
+    <li><a href="#">Stock Management</a></li>
+  </ul>
+<%- end %>
+
+<div class="style-guide-result">
+  <%= snippet %>
+</div>
+
+<div class="style-guide-code">
+  <pre><code class="language-html"><%= escape_once snippet %></code></pre>
+</div>

data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb

@@ -4,8 +4,8 @@
       <legend align="center">Search</legend>
       <div class="field-block alpha four columns">
         <div class="field">
-          <label for="q_number_cont">Text Field</label>
-          <input type="text">
+          <label for="q_number_cont" class="required">Text Field</label>
+          <input class="required" type="text">
         </div>
       </div>
 

data/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb

@@ -3,7 +3,7 @@
 <%- end %>
 
 <p>
-  We are using <a href="http://stevenbenner.github.io/jquery-powertip/">jQuery PowerTip</a>
+  We are using bootstrap's tooltip library
   with the class <code>.with-tip</code> as a trigger.
 </p>
 

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

@@ -1,30 +1,28 @@
 <div data-hook="admin_tax_category_form_fields" class="row">
   <div class="alpha four columns">
     <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %>
+      <%= f.label :name %>
       <%= f.text_field :name, :class => 'fullwidth' %>
     <% end %>
   </div>
 
   <div class="two columns">
     <%= f.field_container :tax_code do %>
-      <%= f.label :tax_code, Spree.t(:tax_code) %>
+      <%= f.label :tax_code %>
       <%= f.text_field :tax_code, :class => 'fullwidth' %>
     <% end %>
   </div>
 
   <div class="two columns omega">
     <%= f.field_container :is_default, :class => ['checkbox'] do %>
-      <label>
-        <%= f.check_box :is_default %>
-        <%= Spree.t(:default) %>
-      </label>
+      <%= f.check_box :is_default %>
+      <%= f.label :is_default %>
     <% end %>
   </div>
 
   <div class="alpha six columns">
     <%= f.field_container :description do %>
-      <%= f.label :description, Spree.t(:description) %><br>
+      <%= f.label :description %><br>
       <%= f.text_area :description, :class => 'fullwidth' %>
     <% end %>
   </div>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/taxes_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editing_tax_category) %>

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

@@ -1,4 +1,4 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/taxes_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:listing_tax_categories) %>
@@ -25,10 +25,10 @@
   </colgroup>
   <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><%= Spree::TaxCategory.human_attribute_name(:name) %></th>
+      <th><%= Spree::TaxCategory.human_attribute_name(:tax_code) %></th>
+      <th><%= Spree::TaxCategory.human_attribute_name(:description) %></th>
+      <th><%= Spree::TaxCategory.human_attribute_name(:is_default) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
@@ -55,9 +55,8 @@
 </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/tax_category')) %>
-    <% if can?(:create, Spree::TaxCategory) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_tax_category_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::TaxCategory,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/taxes_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_tax_category) %>

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

@@ -1 +1 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/taxes_tabs' %>

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

@@ -5,11 +5,11 @@
 
       <div class="alpha six columns">
         <div data-hook="name" class="field">
-          <%= f.label :name, Spree.t(:name) %>
+          <%= f.label :name %>
           <%= f.text_field :name, :class => 'fullwidth' %>
         </div>
         <div data-hook="rate" class="field">
-          <%= f.label :amount, Spree.t(:rate) %>
+          <%= f.label :amount %>
           <%= f.text_field :amount, :class => 'fullwidth' %>
           <br/><span class="info"><%= Spree.t(:tax_rate_amount_explanation) %></span>
         </div>
@@ -21,11 +21,11 @@
 
       <div class="omega six columns">
         <div data-hook="zone" class="field">
-          <%= f.label :zone, Spree.t(:zone) %>
+          <%= f.label :zone, Spree::Zone.model_name.human %>
           <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {:class => 'select2 fullwidth'}) %>
         </div>
         <div data-hook="category" class="field">
-          <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+          <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
           <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {:class => 'select2 fullwidth'}) %>
         </div>
         <div data-hook="show_rate" class="field">

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/taxes_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editing_tax_rate) %>

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

@@ -1,7 +1,7 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/taxes_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:tax_rates) %>
+  <%= Spree::TaxRate.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -26,13 +26,13 @@
     </colgroup>
     <thead>
       <tr data-hook="rate_header">
-        <th><%= Spree.t(:zone) %></th>
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:category) %></th>
-        <th><%= Spree.t(:amount) %></th>
-        <th><%= Spree.t(:included_in_price) %></th>
-        <th><%= Spree.t(:show_rate_in_label) %></th>
-        <th><%= Spree.t(:calculator) %></th>
+        <th><%= Spree::TaxRate.human_attribute_name(:zone) %></th>
+        <th><%= Spree::TaxRate.human_attribute_name(:name) %></th>
+        <th><%= Spree::TaxRate.human_attribute_name(:tax_category_id) %></th>
+        <th><%= Spree::TaxRate.human_attribute_name(:amount) %></th>
+        <th><%= Spree::TaxRate.human_attribute_name(:included_in_price) %></th>
+        <th><%= Spree::TaxRate.human_attribute_name(:show_rate_in_label) %></th>
+        <th><%= Spree::Calculator.model_name.human %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -60,9 +60,8 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/tax_rate')) %>
-    <% if can?(:create, Spree::TaxRate) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_tax_rate_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::TaxRate,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/taxes_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_tax_rate) %>
@@ -14,7 +14,7 @@
 
 <%= form_for [:admin, @tax_rate] do |f| %>
   <fieldset class="no-border-top">
-    
+
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div class="clear"></div>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_inside_taxonomy_form" class="field align-center">
   <%= f.field_container :name do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+    <%= f.label :name, class: 'required' %><br />
     <%= error_message_on :taxonomy, :name, :class => 'fullwidth title' %>
     <%= text_field :taxonomy, :name %>
   <% end %>

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

@@ -7,7 +7,7 @@
   <thead>
     <tr data-hook="taxonomies_header">
       <th class="no-border"></th>
-      <th><%= Spree.t(:name) %></th>
+      <th><%= Spree::Taxonomy.human_attribute_name(:name) %></th>
       <th class="actions"></th>
     </tr>
   </thead>

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

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:taxonomy_edit) %>
 <% end %>
@@ -18,7 +16,6 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
     <div class="filter-actions actions">
       <%= button Spree.t('actions.update'), 'refresh' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, :icon => 'remove' %>
     </div>
   </fieldset>

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

@@ -1,7 +1,5 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:taxonomies) %>
+  <%= Spree::Taxonomy.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -18,9 +16,8 @@
 </div>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/taxonomy')) %>
-    <% if can?(:create, Spree::Taxonomy) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_taxonomy_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::Taxonomy,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

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

@@ -1,5 +1,3 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_taxonomy) %>
 <% end %>
@@ -16,7 +14,7 @@
   <fieldset class="no-border-top">
     <br>
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:create), 'ok' %>
+      <%= button Spree.t('actions.create'), 'ok' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_inside_taxon_form" class="row">
   <div class="alpha five columns">
     <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+      <%= f.label :name, class: 'required' %><br />
       <%= text_field :taxon, :name, :class => 'fullwidth' %>
       <%= error_message_on :taxon, :name, :class => 'fullwidth title' %>
     <% end %>
 
     <%= f.field_container :permalink_part do %>
-      <%= f.label :permalink_part, Spree.t(:permalink) %> <span class="required">*</span><br />
+      <%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br />
       <%= text_field_tag :permalink_part, @permalink_part, :class => 'fullwidth' %><br />
       <span class="info" id="permalink_part_display">
         <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
@@ -15,31 +15,32 @@
     <% end %>
 
     <%= f.field_container :icon do %>
-      <%= f.label :icon, Spree.t(:icon) %><br />
+      <%= f.label :icon %><br />
       <%= f.file_field :icon %>
+      <%= image_tag f.object.icon(:mini) if f.object.icon.present? %>
     <% end %>
   </div>
 
   <div class="omega seven columns">
     <%= f.field_container :description do %>
-      <%= f.label :description, Spree.t(:description) %><br />
+      <%= f.label :description %><br />
       <%= f.text_area :description, :class => 'fullwidth', :rows => 6 %>
     <% end %>
   </div>
 
   <div class="twelve columns alpha omega">
     <%= f.field_container :meta_title do %>
-      <%= f.label :meta_title, Spree.t(:meta_title) %><br />
+      <%= f.label :meta_title %><br />
       <%= f.text_field :meta_title, :class => 'fullwidth', :rows => 6 %>
     <% end %>
 
     <%= f.field_container :meta_description do %>
-      <%= f.label :meta_description, Spree.t(:meta_description) %><br />
+      <%= f.label :meta_description %><br />
       <%= f.text_field :meta_description, :class => 'fullwidth', :rows => 6 %>
     <% end %>
 
     <%= f.field_container :meta_keywords do %>
-      <%= f.label :meta_keywords, Spree.t(:meta_keywords) %><br />
+      <%= f.label :meta_keywords %><br />
       <%= f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6 %>
     <% end %>
   </div>

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

@@ -12,7 +12,7 @@
         <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) %>
+          <%= link_to_delete taxon, :url => remove_admin_product_taxon_url(@product, taxon), :name => icon('delete') + ' ' + Spree.t('actions.remove') %>
         </td>
       </tr>
     <% end %>

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

@@ -1,5 +1,3 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:taxon_edit) %>
 <% end %>
@@ -15,9 +13,8 @@
 <%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
   <%= render 'form', :f => f %>
 
-  <div class="form-buttons" data-hook="buttons">
+  <div class="form-buttons filter-actions" data-hook="buttons">
     <%= button Spree.t('actions.update'), 'refresh' %>
-    <%= Spree.t(:or) %>
     <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), :icon => "remove" %>
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:taxons) %>
+  <%= Spree::Taxon.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :table_filter_title do %>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_tracker_form_fields" class="row">
   <div class="alpha four columns">
     <div data-hook="analytics_id" class="field">
-      <%= label_tag :tracker_analytics_id, Spree.t(:google_analytics_id) %>
-      <%= text_field :tracker, :analytics_id, :class => 'fullwidth' %>
+      <%= f.label :analytics_id %>
+      <%= f.text_field :analytics_id, :class => 'fullwidth' %>
     </div>
   </div>
   <div class="omega four columns">
     <div data-hook="active" class="field">
-      <%= label_tag nil, Spree.t(:active) %>
+      <%= f.label :active %>
       <ul>
         <li>
           <%= radio_button(:tracker, :active, true) %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/general_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editing_tracker) %>

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

@@ -1,7 +1,7 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/general_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:analytics_trackers) %>
+  <%= Spree::Tracker.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -22,8 +22,8 @@
     </colgroup>
     <thead>
       <tr data-hook="admin_trackers_index_headers">
-        <th><%= Spree.t(:google_analytics_id) %></th>
-        <th><%= Spree.t(:active) %></th>
+        <th><%= Spree::Tracker.human_attribute_name(:analytics_id) %></th>
+        <th><%= Spree::Tracker.human_attribute_name(:active) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -47,9 +47,8 @@
   </table>
 <% else %>
   <div class="no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/tracker')) %>
-    <% if can?(:create, Spree::Tracker) %>
-      <%= link_to Spree.t(:add_one), new_object_url %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::Tracker,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>