solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -12,19 +12,21 @@
 <% end %>
 
 <% if @store_credits.any? %>
-  <div id='sc-current-balance'>
-    <strong><%= Spree.t("admin.store_credits.current_balance") %> </strong><%= @user.display_total_available_store_credit %>
-  </div>
+<fieldset id='sc-current-balance'>
+  <legend>
+    <%= Spree.t("admin.store_credits.current_balance") %>
+    <%= @user.display_total_available_store_credit %>
+  </legend>
 
   <table id="sc-table">
     <thead>
-      <th><%= Spree::StoreCredit.human_attribute_name(:amount_credited) %></th>
-      <th><%= Spree::StoreCredit.human_attribute_name(:amount_used) %></th>
-      <th><%= Spree::StoreCredit.human_attribute_name(:amount_authorized) %></th>
-      <th><%= Spree::StoreCredit.human_attribute_name(:category_id) %></th>
-      <th><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %></th>
-      <th><%= Spree::StoreCredit.human_attribute_name(:created_at) %></th>
-      <th><%= Spree::StoreCredit.human_attribute_name(:invalidated_at) %></th>
+      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_credited) %></th>
+      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_used) %></th>
+      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_authorized) %></th>
+      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:category_id) %></th>
+      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %></th>
+      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:created_at) %></th>
+      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:invalidated_at) %></th>
       <th data-hook="admin_store_credits_index_header_actions" class="actions"></th>
     <thead>
     <tbody>
@@ -61,9 +63,10 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::StoreCredit,
                  new_resource_url: new_object_url %>
   </div>
 <% end %>
+</fieldset>

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

@@ -12,7 +12,7 @@
 <%= form_for [:admin, @user, @store_credit] do |f| %>
   <fieldset>
     <legend align="center"><%= Spree.t("admin.store_credits.new") %></legend>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links', :locals => { :collection_url => admin_user_store_credits_path(@user) } %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: admin_user_store_credits_path(@user) } %>
   </fieldset>
 <% end %>

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

@@ -0,0 +1,51 @@
+<%= f.field_container :name do %>
+  <%= f.label :name, class: 'required' %>
+  <%= f.text_field :name, required: true, class: 'fullwidth' %>
+  <%= f.error_message_on :name %>
+<% end %>
+
+<%= f.field_container :code do %>
+  <%= f.label :code, class: 'required' %>
+  <%= f.text_field :code, required: true, class: 'fullwidth' %>
+  <%= f.error_message_on :code %>
+<% end %>
+
+<%= f.field_container :seo_title do %>
+  <%= f.label :seo_title %>
+  <%= f.text_field :seo_title, class: 'fullwidth'  %>
+  <%= f.error_message_on :seo_title %>
+<% end %>
+
+<%= f.field_container :meta_keywords do %>
+  <%= f.label :meta_keywords %>
+  <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+  <%= f.error_message_on :meta_keywords %>
+<% end %>
+
+<%= f.field_container :meta_description do %>
+  <%= f.label :meta_description %>
+  <%= f.text_field :meta_description, class: 'fullwidth'  %>
+  <%= f.error_message_on :meta_description %>
+<% end %>
+
+<%= f.field_container :url do %>
+  <%= f.label :url, class: 'required' %>
+  <%= f.text_field :url, required: true, class: 'fullwidth'  %>
+  <%= f.error_message_on :url %>
+<% end %>
+
+<%= f.field_container :mail_from_address do %>
+  <%= f.label :mail_from_address, class: 'required' %>
+  <%= f.text_field :mail_from_address, required: true, class: 'fullwidth'  %>
+  <%= f.error_message_on :mail_from_address %>
+<% end %>
+
+<%= f.field_container :cart_tax_country_iso do %>
+  <%= f.label :cart_tax_country_iso %>
+  <%= f.field_hint :cart_tax_country_iso %>
+  <%= f.select :cart_tax_country_iso,
+    Spree::Country.all.map { |c| [c.name, c.iso] },
+    { include_blank: t(".no_cart_tax_country") },
+    { class: "select2 fullwidth" } %>
+  <%= f.error_message_on :cart_tax_country_iso %>
+<% end %>

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

@@ -0,0 +1,19 @@
+<%= render 'spree/admin/shared/general_tabs' %>
+
+<% admin_breadcrumb(link_to(plural_resource_name(Spree::Store), admin_stores_path)) %>
+<% admin_breadcrumb(@store.name) %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:new_store), new_admin_store_url %>
+  </li>
+<% end %>
+
+<%= form_for [:admin, @store] do |f| %>
+  <fieldset class="no-border-top">
+    <%= render 'form', f: f %>
+    <% if can? :update, @store %>
+      <%= render 'spree/admin/shared/edit_resource_links' %>
+    <% end %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,41 @@
+<%= render 'spree/admin/shared/general_tabs' %>
+
+<% content_for :page_title do %>
+  <%= plural_resource_name(Spree::Store) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <% if can?(:create, Spree::Store) %>
+    <li>
+      <%= link_to Spree.t(:new_store), new_admin_store_url, class: 'button' %>
+    </li>
+  <% end %>
+<% end %>
+
+<table class="index">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Url</th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @stores.each do |store| %>
+      <tr>
+        <td>
+          <%= store.name %>
+          <% if store.default? %>
+            <span class="label label-default">default</span>
+          <% end %>
+        </td>
+        <td><%= store.url %></td>
+        <td class="actions">
+          <% if can?(:edit, store) %>
+            <%= link_to_edit store, no_text: true %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,15 @@
+<%= render 'spree/admin/shared/general_tabs' %>
+
+<% admin_breadcrumb(link_to(plural_resource_name(Spree::Store), admin_stores_path)) %>
+<% admin_breadcrumb(Spree.t(:new_store)) %>
+
+<% content_for :page_actions do %>
+<% end %>
+
+<%= form_for [:admin, @store] do |f| %>
+  <%= render 'form', f: f %>
+
+  <% if can? :create, @store %>
+    <%= render 'spree/admin/shared/new_resource_links' %>
+  <% end %>
+<% end %>

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

@@ -3,25 +3,27 @@
     <fieldset>
       <legend align="center">Search</legend>
       <div class="row">
-        <div class="field-block col-xs-3">
+        <div class="field-block col-3">
           <div class="field">
             <label for="q_number_cont" class="required">Text Field</label>
             <input class="required" type="text">
           </div>
         </div>
 
-        <div class="field-block col-xs-3">
+        <div class="field-block col-3">
           <div class="date-range-filter field">
             <label for="q_created_at_gt">Date Range</label>
-            <div class="date-range-fields">
-              <input class="datepicker" placeholder="Date">
-              <span class="range-divider"><i class="fa fa-arrow-right"></i></span>
-              <input class="datepicker" placeholder="Picker">
+            <div class="input-group date-range-fields">
+              <input class="form-control datepicker datepicker-from" placeholder="From">
+              <span class="range-divider input-group-addon">
+                <i class="fa fa-arrow-right"></i>
+              </span>
+              <input class="form-control datepicker datepicker-to" placeholder="To">
             </div>
           </div>
         </div>
 
-        <div class="col-xs-3">
+        <div class="col-3">
           <div class="field checkbox">
             <label>Select Box
               <select>
@@ -37,7 +39,7 @@
           </div>
         </div>
 
-        <div class="col-xs-3">
+        <div class="col-3">
           <div class="field checkbox">
             <label>
               <input type="checkbox" checked="checked">

data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb

@@ -3,6 +3,7 @@
     <thead>
       <tr>
         <th colspan="2">Item Description</th>
+        <th>Long Item Text</th>
         <th>Price</th>
         <th>Quantity</th>
         <th>Total</th>
@@ -14,27 +15,45 @@
         <td class="item-image">
           <img src="http://placehold.it/50x50">
         </td>
-        <td>
+        <td class="no-wrap">
           Ruby on Rails Bag<br>
           SKU: ROR-00012
         </td>
+        <td>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nihil illinc huc pervenit.
+          Sed quae tandem ista ratio est? Ergo ita: non posse honeste vivi, nisi honeste vivatur?
+          Scisse enim te quis coarguere possit? Duo Reges: constructio interrete.
+          Sic, et quidem diligentius saepiusque ista loquemur inter nos agemusque communiter.
+          Sed in rebus apertissimis nimium longi sumus.
+          Quod si ita se habeat, non possit beatam praestare vitam sapientia.
+          Etenim nec iustitia nec amicitia esse omnino poterunt, nisi ipsae per se expetuntur.
+        </td>
         <td class="align-center">$22.99</td>
-        <td class="align-center">1 x on hand</td>
+        <td class="align-center no-wrap">1 x on hand</td>
         <td class="align-center">$22.99</td>
       </tr>
       <tr>
-        <td colspan="4">UPS Ground (USD)</td>
+        <td colspan="5">UPS Ground (USD)</td>
         <td class="align-center">
           <span>$5.00</span>
         </td>
       </tr>
       <tr>
-        <td colspan="5">No tracking details provided.</td>
+        <td colspan="6">No tracking details provided.</td>
       </tr>
     </tbody>
   </table>
 <%- end %>
 
+<p>
+  Tables are the primary UI element in the Solidus admin.
+  By default the content of all table headers have text wrapping disabled.
+</p>
+<p>
+  For cases where also data cells need to have text wrapping disabled we provide
+  the <code>.no-wrap</code> class.
+</p>
+
 <div class="style-guide-result">
   <%= snippet %>
 </div>

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

@@ -1,29 +1,29 @@
 <div data-hook="admin_tax_category_form_fields" class="row">
-  <div class="col-xs-3">
+  <div class="col-3">
     <%= f.field_container :name do %>
       <%= f.label :name %>
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
   </div>
 
-  <div class="col-xs-2">
+  <div class="col-2">
     <%= f.field_container :tax_code do %>
       <%= f.label :tax_code %>
-      <%= f.text_field :tax_code, :class => 'fullwidth' %>
+      <%= f.text_field :tax_code, class: 'fullwidth' %>
     <% end %>
   </div>
 
-  <div class="col-xs-1">
-    <%= f.field_container :is_default, :class => ['checkbox'] do %>
+  <div class="col-1">
+    <%= f.field_container :is_default, class: ['checkbox'] do %>
       <%= f.check_box :is_default %>
       <%= f.label :is_default %>
     <% end %>
   </div>
 
-  <div class="col-xs-4">
+  <div class="col-4">
     <%= f.field_container :description do %>
       <%= f.label :description %><br>
-      <%= f.text_area :description, :class => 'fullwidth' %>
+      <%= f.text_area :description, class: 'fullwidth' %>
     <% end %>
   </div>
 </div>

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

@@ -9,11 +9,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_category } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @tax_category } %>
 
 <%= form_for [:admin, @tax_category] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -9,7 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::TaxCategory) %>
       <li>
-        <%= button_link_to Spree.t(:new_tax_category), new_object_url, :id => 'admin_new_tax_categories_link' %>
+        <%= button_link_to Spree.t(:new_tax_category), new_object_url, id: 'admin_new_tax_categories_link' %>
       </li>
     <% end %>
   </ul>
@@ -45,17 +45,17 @@
         <td class="align-center"><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions">
           <% if can?(:update, tax_category) %>
-            <%= link_to_edit tax_category, :no_text => true %>
+            <%= link_to_edit tax_category, no_text: true %>
           <% end %>
           <% if can?(:destroy, tax_category) %>
-            <%= link_to_delete tax_category, :no_text => true %>
+            <%= link_to_delete tax_category, no_text: true %>
           <% end %>
       </tr>
     <% end %>
   </tbody>
 </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::TaxCategory,
                  new_resource_url: new_object_url %>

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

@@ -10,11 +10,11 @@
 <% end %>
 
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_category } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @tax_category } %>
 
 <%= form_for [:admin, @tax_category] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -3,14 +3,14 @@
       <legend align="center"><%= Spree.t(:general_settings) %></legend>
       <div class="row">
 
-        <div class="col-xs-5">
+        <div class="col-5">
           <div data-hook="name" class="field">
             <%= f.label :name %>
-            <%= f.text_field :name, :class => 'fullwidth' %>
+            <%= f.text_field :name, class: 'fullwidth' %>
           </div>
           <div data-hook="rate" class="field">
             <%= f.label :amount %>
-            <%= f.text_field :amount, :class => 'fullwidth' %>
+            <%= f.text_field :amount, class: 'fullwidth' %>
             <br/><span class="info"><%= Spree.t(:tax_rate_amount_explanation) %></span>
           </div>
           <div data-hook="included" class="field">
@@ -19,14 +19,14 @@
           </div>
         </div>
 
-        <div class="col-xs-5">
+        <div class="col-5">
           <div data-hook="zone" class="field">
             <%= f.label :zone, Spree::Zone.model_name.human %>
-            <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {:class => 'select2 fullwidth'}) %>
+            <%= 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::TaxCategory.model_name.human %>
-            <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {:class => 'select2 fullwidth'}) %>
+            <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {class: 'select2 fullwidth'}) %>
           </div>
           <div data-hook="show_rate" class="field">
             <%= f.check_box :show_rate_in_label %>
@@ -38,5 +38,5 @@
 
   <div class="clear"></div>
 
-  <%= render 'spree/admin/shared/calculator_fields', :f => f %>
+  <%= render 'spree/admin/shared/calculator_fields', f: f %>
 </div>

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

@@ -9,12 +9,12 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_rate } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @tax_rate } %>
 
 <%= form_for [:admin, @tax_rate] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
     <div class="clear"></div>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>