solidus_backend 2.0.3 → 2.1.0.beta1

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_store_credit_form_fields" class="row">
-  <div class="alpha twelve columns">
+  <div class="col-xs-12">
     <%= f.field_container :amount do %>
       <%= f.label :amount, class: 'required' %><br />
       <%= f.number_field :amount, min: 0.00, step: :any %>
       <%= f.error_message_on :amount %>
     <% end %>
   </div>
-  <div class="alpha twelve columns">
+  <div class="col-xs-12">
     <%= f.field_container :category do %>
       <%= f.label :category_id, class: 'required' %><br />
       <%= f.select :category_id, options_from_collection_for_select(@credit_categories, :id, :name, f.object.category.try(:id)),
@@ -14,7 +14,7 @@
       <%= f.error_message_on :category %>
     <% end %>
   </div>
-  <div data-hook="admin_store_credit_memo_field" class="alpha twelve columns">
+  <div data-hook="admin_store_credit_memo_field" class="col-xs-12">
     <%= f.field_container :memo do %>
       <%= f.label :memo %>
       <%= f.text_area :memo, class: "fullwidth" %>

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

@@ -1,4 +1,4 @@
-<div class="alpha twelve columns">
+<div class="col-xs-12">
   <%= f.field_container :reason do %>
     <%= f.label :reason, Spree.t(:reason), class: 'required' %><br />
     <%= select_tag :update_reason_id, options_from_collection_for_select(@update_reasons, :id, :name),

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

@@ -14,7 +14,7 @@
   <fieldset>
     <legend align="center"><%= Spree.t("admin.store_credits.edit_amount") %></legend>
     <div data-hook="admin_store_credit_form_fields" class="row">
-      <div class="alpha twelve columns">
+      <div class="col-xs-9">
         <%= f.field_container :amount do %>
           <%= f.label :amount, class: 'required' %><br />
           <%= f.number_field :amount, min: 0.00, step: :any %>

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

@@ -16,7 +16,7 @@
     <strong><%= Spree.t("admin.store_credits.current_balance") %> </strong><%= @user.display_total_available_store_credit %>
   </div>
 
-  <table>
+  <table id="sc-table">
     <thead>
       <th><%= Spree::StoreCredit.human_attribute_name(:amount_credited) %></th>
       <th><%= Spree::StoreCredit.human_attribute_name(:amount_used) %></th>
@@ -61,7 +61,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::StoreCredit,
                  new_resource_url: new_object_url %>

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

@@ -1,62 +1,64 @@
 <%- snippet = capture do %>
-  <form id="table-filter" class="sixteen columns">
+  <form id="table-filter">
     <fieldset>
       <legend align="center">Search</legend>
-      <div class="field-block alpha four columns">
-        <div class="field">
-          <label for="q_number_cont" class="required">Text Field</label>
-          <input class="required" type="text">
+      <div class="row">
+        <div class="field-block col-xs-3">
+          <div class="field">
+            <label for="q_number_cont" class="required">Text Field</label>
+            <input class="required" type="text">
+          </div>
         </div>
-      </div>
 
-      <div class="field-block four columns">
-        <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="field-block col-xs-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>
           </div>
         </div>
-      </div>
 
-      <div class="four columns">
-        <div class="field checkbox">
-          <label>Select Box
-            <select>
-              <option>Option</option>
-            </select>
-          </label>
-        </div>
+        <div class="col-xs-3">
+          <div class="field checkbox">
+            <label>Select Box
+              <select>
+                <option>Option</option>
+              </select>
+            </label>
+          </div>
 
-        <div class="field">
-          <select class="select2">
-            <option>Select 2</option>
-          </select>
+          <div class="field">
+            <select class="select2">
+              <option>Select 2</option>
+            </select>
+          </div>
         </div>
-      </div>
 
-      <div class="omega four columns">
-        <div class="field checkbox">
-          <label>
-            <input type="checkbox" checked="checked">
-            Checkbox
-          </label>
-        </div>
+        <div class="col-xs-3">
+          <div class="field checkbox">
+            <label>
+              <input type="checkbox" checked="checked">
+              Checkbox
+            </label>
+          </div>
 
-        <div class='field'>
-          <label>
-            <input name='radio' type='radio'>
-            Option 1
-          </label>
-          <label>
-            <input name='radio' type='radio'>
-            Option 2
-          </label>
-          <label>
-            <input name='radio' type='radio'>
-            Option 3
-          </label>
+          <div class='field'>
+            <label>
+              <input name='radio' type='radio'>
+              Option 1
+            </label>
+            <label>
+              <input name='radio' type='radio'>
+              Option 2
+            </label>
+            <label>
+              <input name='radio' type='radio'>
+              Option 3
+            </label>
+          </div>
         </div>
       </div>
     </fieldset>

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

@@ -14,7 +14,17 @@
 <button id="loading-test-button">Toggle Loading</button>
 
 <script>
-  $('#loading-test-button').on('click', function(){
+  function closeProgress() {
     $("#progress").toggle()
+    $(document).off('mousedown', 'body', closeProgress)
+  }
+
+  $('#loading-test-button').on('click', function(){
+    $("#progress").toggle({
+      duration: 0,
+      complete: function(){
+        $(document).on('mousedown', 'body', closeProgress)
+      }
+    })
   });
 </script>

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

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

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

@@ -55,7 +55,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-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_rates/_form.html.erb

@@ -1,40 +1,40 @@
 <div data-hook="admin_tax_rate_form_fields">
-  <div class="alpha twelve columns">
     <fieldset data-hook="tax_rates" class=" no-border-bottom">
       <legend align="center"><%= Spree.t(:general_settings) %></legend>
+      <div class="row">
 
-      <div class="alpha six columns">
-        <div data-hook="name" class="field">
-          <%= f.label :name %>
-          <%= f.text_field :name, :class => 'fullwidth' %>
+        <div class="col-xs-5">
+          <div data-hook="name" class="field">
+            <%= f.label :name %>
+            <%= f.text_field :name, :class => 'fullwidth' %>
+          </div>
+          <div data-hook="rate" class="field">
+            <%= f.label :amount %>
+            <%= f.text_field :amount, :class => 'fullwidth' %>
+            <br/><span class="info"><%= Spree.t(:tax_rate_amount_explanation) %></span>
+          </div>
+          <div data-hook="included" class="field">
+            <%= f.check_box :included_in_price %>
+            <%= f.label :included_in_price, Spree.t(:included_in_price) %>
+          </div>
         </div>
-        <div data-hook="rate" class="field">
-          <%= f.label :amount %>
-          <%= f.text_field :amount, :class => 'fullwidth' %>
-          <br/><span class="info"><%= Spree.t(:tax_rate_amount_explanation) %></span>
-        </div>
-        <div data-hook="included" class="field">
-          <%= f.check_box :included_in_price %>
-          <%= f.label :included_in_price, Spree.t(:included_in_price) %>
-        </div>
-      </div>
 
-      <div class="omega six columns">
-        <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'}) %>
-        </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'}) %>
-        </div>
-        <div data-hook="show_rate" class="field">
-          <%= f.check_box :show_rate_in_label %>
-          <%= f.label :show_rate_in_label, Spree.t(:show_rate_in_label) %>
+        <div class="col-xs-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'}) %>
+          </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'}) %>
+          </div>
+          <div data-hook="show_rate" class="field">
+            <%= f.check_box :show_rate_in_label %>
+            <%= f.label :show_rate_in_label, Spree.t(:show_rate_in_label) %>
+          </div>
         </div>
       </div>
     </fieldset>
-  </div>
 
   <div class="clear"></div>
 

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

@@ -60,7 +60,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::TaxRate,
                  new_resource_url: new_object_url %>

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

@@ -15,7 +15,7 @@
   <%= render 'list' %>
 </div>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Taxonomy,
                  new_resource_url: new_object_url %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_inside_taxon_form" class="row">
-  <div class="alpha five columns">
+  <div class="col-xs-5">
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
       <%= text_field :taxon, :name, :class => 'fullwidth' %>
@@ -21,27 +21,27 @@
     <% end %>
   </div>
 
-  <div class="omega seven columns">
+  <div class="col-xs-5">
     <%= f.field_container :description do %>
       <%= f.label :description %><br />
       <%= f.text_area :description, :class => 'fullwidth', :rows => 6 %>
     <% end %>
   </div>
 
-  <div class="twelve columns alpha omega">
+  <div class="col-xs-10">
     <%= f.field_container :meta_title do %>
       <%= f.label :meta_title %><br />
-      <%= f.text_field :meta_title, :class => 'fullwidth', :rows => 6 %>
+      <%= f.text_field :meta_title, :class => 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_description do %>
       <%= f.label :meta_description %><br />
-      <%= f.text_field :meta_description, :class => 'fullwidth', :rows => 6 %>
+      <%= f.text_field :meta_description, :class => 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_keywords do %>
       <%= f.label :meta_keywords %><br />
-      <%= f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6 %>
+      <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
     <% end %>
   </div>
 </div>

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

@@ -6,11 +6,11 @@
 <% end %>
 
 <% content_for :table_filter do %>
-  <div data-hook="admin_orders_index_search" class="columns six">
+  <div data-hook="admin_orders_index_search" class="col-xs-4">
     <input type='text' id='taxon_id' />
   </div>
 <% end %>
 
-<div class='sixteen columns'>
+<div class='col-xs-10'>
   <div id='taxon_products' class='list-group'></div>
 </div>

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

@@ -1,17 +1,21 @@
-<div data-hook="bill_address_wrapper" class="alpha six columns">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:billing_address) %></legend>
-    <%= f.fields_for :bill_address, @user.bill_address || Spree::Address.build_default do |ba_form| %>
-      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
-    <% end %>
-  </fieldset>
-</div>
+<div class="row">
+    
+  <div data-hook="bill_address_wrapper" class="col-xs-6">
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= Spree.t(:billing_address) %></legend>
+      <%= f.fields_for :bill_address, @user.bill_address || Spree::Address.build_default do |ba_form| %>
+        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
+      <% end %>
+    </fieldset>
+  </div>
+
+  <div data-hook="ship_address_wrapper" class="col-xs-6">
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+      <%= f.fields_for :ship_address, @user.ship_address || Spree::Address.build_default do |sa_form| %>
+        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => "shipping" } %>
+      <% end %>
+    </fieldset>
+  </div>
 
-<div data-hook="ship_address_wrapper" class="alpha six columns">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:shipping_address) %></legend>
-    <%= f.fields_for :ship_address, @user.ship_address || Spree::Address.build_default do |sa_form| %>
-      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => "shipping" } %>
-    <% end %>
-  </fieldset>
 </div>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_user_form_fields" class="row">
-  <div class="alpha six columns">
+  <div class="col-xs-6">
     <%= f.field_container :email do %>
       <%= f.label :email %>
       <% if can?(:update_email, @user) %>
@@ -53,17 +53,20 @@
 
   </div>
 
-  <div data-hook="admin_user_form_password_fields" class="omega six columns">
+  <div data-hook="admin_user_form_password_fields" class="col-xs-6">
     <%= f.field_container :password do %>
       <%= f.label :password %>
       <%= f.password_field :password, :class => 'fullwidth' %>
       <%= f.error_message_on :password %>
     <% end %>
 
-    <%= f.field_container :password do %>
-      <%= f.label :password_confirmation %>
-      <%= f.password_field :password_confirmation, :class => 'fullwidth' %>
-      <%= f.error_message_on :password_confirmation %>
+
+    <% if f.object.respond_to?(:password_confirmation) %>
+      <%= f.field_container :password do %>
+        <%= f.label :password_confirmation %>
+        <%= f.password_field :password_confirmation, :class => 'fullwidth' %>
+        <%= f.error_message_on :password_confirmation %>
+      <% end %>
     <% end %>
   </div>
 </div>

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

@@ -1,7 +1,7 @@
 <% content_for :page_actions do %>
   <% if can?([:admin, :create], Spree::Order) %>
     <li>
-      <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id) %>
+      <%= button_link_to t(".create_order"), spree.new_admin_order_path(user_id: @user.id) %>
     </li>
   <% end %>
 <% end %>

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

@@ -7,7 +7,7 @@
 <%= render 'spree/admin/users/tabs', current: :address %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_addresses" id="admin_user_edit_addresses" class="alpha twelve columns">
+<fieldset data-hook="admin_user_addresses" id="admin_user_edit_addresses" class="col-xs-12">
   <legend><%= plural_resource_name(Spree::Address) %></legend>
 
   <div data-hook="admin_user_edit_form_header">

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

@@ -6,7 +6,7 @@
 <%= render 'spree/admin/users/tabs', current: :account %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_edit_general_settings" class="alpha twelve columns">
+<fieldset data-hook="admin_user_edit_general_settings" class="col-xs-9">
   <legend><%= Spree.t(:general_settings) %></legend>
 
   <div data-hook="admin_user_edit_form_header">
@@ -27,7 +27,7 @@
 </fieldset>
 
 <% if can?(:update, @user) %>
-  <fieldset data-hook="admin_user_api_key" id="admin_user_edit_api_key" class="alpha twelve columns">
+  <fieldset data-hook="admin_user_api_key" id="admin_user_edit_api_key" class="col-xs-9">
     <legend><%= Spree.t('access', :scope => 'api') %></legend>
 
     <% if @user.spree_api_key.present? %>

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

@@ -7,7 +7,7 @@
 <%= render 'spree/admin/users/tabs', current: :items %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_items_purchased" class="alpha twelve columns">
+<fieldset data-hook="admin_user_items_purchased" class="col-xs-9">
   <legend><%= Spree.t(:"admin.user.items_purchased") %></legend>
 
   <%= paginate @orders, theme: "solidus_admin" %>
@@ -73,7 +73,7 @@
         <% end %>
     </table>
   <% else %>
-    <div class="alpha twelve columns no-objects-found">
+    <div class="col-xs-9 no-objects-found">
       <%= render 'spree/admin/shared/no_objects_found',
                    resource: Spree::Order,
                    new_resource_url: spree.new_admin_order_path %>

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

@@ -7,7 +7,7 @@
 <%= render 'spree/admin/users/tabs', current: :orders %>
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_order_history" class="alpha twelve columns">
+<fieldset data-hook="admin_user_order_history" class="col-xs-9">
   <legend><%= Spree.t(:"admin.user.order_history") %></legend>
 
   <%= paginate @orders, theme: "solidus_admin" %>
@@ -55,7 +55,7 @@
       </tbody>
     </table>
   <% else %>
-    <div class="alpha twelve columns no-objects-found">
+    <div class="col-xs-9 no-objects-found">
       <%= render 'spree/admin/shared/no_objects_found',
                    resource: Spree::Order,
                    new_resource_url: spree.new_admin_order_path %>