spree_backend 2.4.10 → 3.0.0.rc1

data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb

@@ -1,28 +1,30 @@
-<div class="calculator-fields row">
-
-  <div class="field alpha four columns">
-    <% field_name = "#{param_prefix}[calculator_type]" %>
-    <%= label_tag field_name, Spree.t(:calculator) %>
-    <%= select_tag field_name,
-                   options_from_collection_for_select(@calculators, :to_s, :description, promotion_action.calculator.type),
-                   :class => 'type-select select2 fullwidth' %>
-    <% if promotion_action.calculator.respond_to?(:preferences) %>
-      <span class="warning info"><%= Spree.t(:calculator_settings_warning) %></span>
+<div class="panel-body calculator-fields">
+  <div class="row no-marginb">
+    <div class="form-group col-md-6 no-marginb">
+      <% field_name = "#{param_prefix}[calculator_type]" %>
+      <%= label_tag field_name, Spree.t(:calculator) %>
+      <%= select_tag field_name,
+                     options_from_collection_for_select(@calculators, :to_s, :description, promotion_action.calculator.type),
+                     :class => 'type-select select2' %>
+    </div>
+    <% unless promotion_action.new_record? %>
+      <div class="form-group col-md-6 no-marginb settings">
+        <% type_name = promotion_action.calculator.type.demodulize.underscore %>
+        <% if lookup_context.exists?("fields",
+            ["spree/admin/promotions/calculators/#{type_name}"], true) %>
+          <%= render "spree/admin/promotions/calculators/#{type_name}/fields",
+            calculator: promotion_action.calculator, prefix: param_prefix %>
+        <% else %>
+          <%= render "spree/admin/promotions/calculators/default_fields",
+            calculator: promotion_action.calculator, prefix: param_prefix %>
+        <% end %>
+        <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
+      </div>
     <% end %>
   </div>
-
-  <% unless promotion_action.new_record? %>
-    <div class="settings field omega four columns">
-      <% type_name = promotion_action.calculator.type.demodulize.underscore %>
-      <% if lookup_context.exists?("fields",
-          ["spree/admin/promotions/calculators/#{type_name}"], true) %>
-        <%= render "spree/admin/promotions/calculators/#{type_name}/fields",
-          calculator: promotion_action.calculator, prefix: param_prefix %>
-      <% else %>
-        <%= render "spree/admin/promotions/calculators/default_fields",
-          calculator: promotion_action.calculator, prefix: param_prefix %>
-      <% end %>
-      <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
+  <% if promotion_action.calculator.respond_to?(:preferences) %>
+    <div class="alert alert-info js-warning margint no-marginb">
+      <%= Spree.t(:calculator_settings_warning) %>
     </div>
   <% end %>
 </div>

data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb

@@ -1,26 +1,28 @@
-<div class="calculator-fields row">
-
-  <div class="field alpha four columns">
-    <% field_name = "#{param_prefix}[calculator_type]" %>
-    <%= label_tag field_name, Spree.t(:calculator) %>
-    <%= select_tag field_name,
-                   options_from_collection_for_select(Spree::Promotion::Actions::CreateItemAdjustments.calculators, :to_s, :description, promotion_action.calculator.type),
-                   :class => 'type-select select2 fullwidth' %>
-    <% if promotion_action.calculator.respond_to?(:preferences) %>
-      <span class="warning info"><%= Spree.t(:calculator_settings_warning) %></span>
+<div class="panel-body calculator-fields">
+  <div class="row no-marginb">
+    <div class="form-group col-md-6 no-marginb">
+      <% field_name = "#{param_prefix}[calculator_type]" %>
+      <%= label_tag field_name, Spree.t(:calculator) %>
+      <%= select_tag field_name,
+                    options_from_collection_for_select(Spree::Promotion::Actions::CreateItemAdjustments.calculators, :to_s, :description, promotion_action.calculator.type),
+                    :class => 'type-select select2' %>
+    </div>
+    <% unless promotion_action.new_record? %>
+      <div class="form-group col-md-6 no-marginb settings">
+        <% promotion_action.calculator.preferences.keys.map do |key| %>
+          <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
+          <%= label_tag field_name, Spree.t(key.to_s) %>
+          <%= preference_field_tag(field_name,
+                                   promotion_action.calculator.get_preference(key),
+                                   :type => promotion_action.calculator.preference_type(key)) %>
+        <% end %>
+        <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
+      </div>
     <% end %>
   </div>
-
-  <% unless promotion_action.new_record? %>
-    <div class="settings field omega four columns">
-      <% promotion_action.calculator.preferences.keys.map do |key| %>
-        <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
-        <%= label_tag field_name, Spree.t(key.to_s) %>
-        <%= preference_field_tag(field_name,
-                                 promotion_action.calculator.get_preference(key),
-                                 :type => promotion_action.calculator.preference_type(key)) %>
-      <% end %>
-      <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
+  <% if promotion_action.calculator.respond_to?(:preferences) %>
+    <div class="alert alert-info js-warning margint no-marginb">
+      <%= Spree.t(:calculator_settings_warning) %>
     </div>
   <% end %>
 </div>

data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb

@@ -1,25 +1,25 @@
-<% promotion_action.promotion_action_line_items.each do |item| %>
-  <strong><%= item.quantity %> x <%= item.variant.product.name %></strong>
-  <%= item.variant.options_text %>
-<% end %>
+<div class="panel-body calculator-fields">
+  <% promotion_action.promotion_action_line_items.each do |item| %>
+    <strong><%= item.quantity %> x <%= item.variant.product.name %></strong>
+    <%= item.variant.options_text %>
+  <% end %>
 
-<% if promotion_action.promotion_action_line_items.empty? %>
-  <% line_items = promotion_action.promotion_action_line_items %>
-  <% line_items.build %>
+  <% if promotion_action.promotion_action_line_items.empty? %>
+    <% line_items = promotion_action.promotion_action_line_items %>
+    <% line_items.build %>
 
-  <% line_items.each_with_index do |line_item, index| %>
-    <div class="add-line-item">
-      <div class="row">
+    <% line_items.each_with_index do |line_item, index| %>
+      <div class="add-line-item">
         <% line_item_prefix = "#{param_prefix}[promotion_action_line_items_attributes][#{index}]" %>
-        <div class="field alpha six columns">
+        <div class="form-group">
           <%= label_tag "#{line_item_prefix}_variant_id", Spree.t(:variant) %>
-          <%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: "variant_autocomplete fullwidth" %>
+          <%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: "variant_autocomplete" %>
         </div>
-        <div class="field omega two columns">
+        <div class="form-group no-marginb">
           <%= label_tag "#{line_item_prefix}_quantity", Spree.t(:quantity) %>
-          <%= number_field_tag "#{line_item_prefix}[quantity]", line_item.quantity, min: 1, class: 'fullwidth' %>
+          <%= number_field_tag "#{line_item_prefix}[quantity]", line_item.quantity, min: 1, class: 'form-control' %>
         </div>
       </div>
-    </div>
+    <% end %>
   <% end %>
-<% end %>
+</div>

data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb

@@ -1,8 +1,10 @@
 <% calculator.preferences.keys.map do |key| %>
-  <% field_name = "#{prefix}[calculator_attributes][preferred_#{key}]" %>
-  <%= label_tag field_name, Spree.t(key.to_s) %>
-  <%= preference_field_tag(
-    field_name,
-    calculator.get_preference(key),
-    type: calculator.preference_type(key)) %>
+  <div class="form-group">
+    <% field_name = "#{prefix}[calculator_attributes][preferred_#{key}]" %>
+    <%= label_tag field_name, Spree.t(key.to_s) %>
+    <%= preference_field_tag(
+      field_name,
+      calculator.get_preference(key),
+      type: calculator.preference_type(key)) %>
+  </div>
 <% end %>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -1,37 +1,42 @@
-<%= label_tag "#{prefix}[calculator_attributes][preferred_base_amount]",
-  Spree.t(:base_amount) %>
-<%= preference_field_tag(
-  "#{prefix}[calculator_attributes][preferred_base_amount]",
-  calculator.preferred_base_amount,
-  type: calculator.preference_type(:base_amount)) %>
+<div class="form-group">
+  <%= label_tag "#{prefix}[calculator_attributes][preferred_base_amount]",
+    Spree.t(:base_amount) %>
+  <%= preference_field_tag(
+    "#{prefix}[calculator_attributes][preferred_base_amount]",
+    calculator.preferred_base_amount,
+    type: calculator.preference_type(:base_amount)) %>
+</div>
+
+<div class="form-group no-marginb">
+  <%= label_tag nil, Spree.t(:tiers) %>
+  <%= content_tag :div, nil, class: "hidden js-original-tiers",
+    data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
+</div>
 
-<%= label_tag nil, Spree.t(:tiers) %>
-<%= content_tag :div, nil, class: "hidden js-original-tiers",
-  data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
 <div class="js-tiers"></div>
-<button class="fa fa-plus button js-add-tier"><%= Spree.t(:add) %></button>
+<button class="btn btn-success js-add-tier"><%= Spree.t(:add) %></button>
 
 <script type="text/x-handlebars-template" id="tier-input-name">
   <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]
 </script>
 
 <script type="text/x-handlebars-template" id="tier-fields-template">
-  <div class="fullwidth tier">
-    <a class="fa fa-trash remove js-remove-tier"></a>
-    <div class="two columns alpha omega">
-      <div class="input-group">
-        <span class="input-group-addon">$</span>
-        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+  <div class="tier panel panel-default">
+    <div class="panel-body">
+      <div class="form-group">
+        <div class="input-group">
+          <span class="input-group-addon">$</span>
+          <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+        </div>
       </div>
-    </div>
-    <div class="two columns alpha omega right">
-      <div class="input-group">
-        <span class="input-group-addon">$</span>
-        <input class="js-value-input form-control"
-          name="{{valueField.name}}" type="text" value={{valueField.value}}>
+      <div class="form-group">
+        <div class="input-group">
+          <span class="input-group-addon">$</span>
+          <input class="js-value-input form-control"
+            name="{{valueField.name}}" type="text" value={{valueField.value}}>
+        </div>
       </div>
+      <a class="js-remove-tier btn btn-default btn-sm"><span class="icon icon-delete"></span></a>
     </div>
-    <div class="clear"></div>
   </div>
 </script>
-

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -1,36 +1,42 @@
-<%= label_tag "#{prefix}[calculator_attributes][preferred_base_percent]",
-  Spree.t(:base_percent) %>
-<%= preference_field_tag(
-  "#{prefix}[calculator_attributes][preferred_base_percent]",
-  calculator.preferred_base_percent,
-  type: calculator.preference_type(:base_percent)) %>
+<div class="form-group">
+  <%= label_tag "#{prefix}[calculator_attributes][preferred_base_percent]",
+    Spree.t(:base_percent) %>
+  <%= preference_field_tag(
+    "#{prefix}[calculator_attributes][preferred_base_percent]",
+    calculator.preferred_base_percent,
+    type: calculator.preference_type(:base_percent)) %>
+</div>
+
+<div class="form-group no-marginb">
+  <%= label_tag nil, Spree.t(:tiers) %>
+  <%= content_tag :div, nil, class: "hidden js-original-tiers",
+    data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
+</div>
 
-<%= label_tag nil, Spree.t(:tiers) %>
-<%= content_tag :div, nil, class: "hidden js-original-tiers",
-  data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
 <div class="js-tiers"></div>
-<button class="fa fa-plus button js-add-tier"><%= Spree.t(:add) %></button>
+<button class="btn btn-success js-add-tier"><%= Spree.t(:add) %></button>
 
 <script type="text/x-handlebars-template" id="tier-input-name">
   <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]
 </script>
 
 <script type="text/x-handlebars-template" id="tier-fields-template">
-  <div class="fullwidth tier">
-    <a class="fa fa-trash remove js-remove-tier"></a>
-    <div class="two columns alpha omega">
-      <div class="input-group">
-        <span class="input-group-addon">$</span>
-        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+  <div class="tier panel panel-default">
+    <div class="panel-body">
+      <div class="form-group">
+        <div class="input-group">
+          <span class="input-group-addon">$</span>
+          <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+        </div>
       </div>
-    </div>
-    <div class="two columns alpha omega right">
-      <div class="input-group">
-        <input class="js-value-input form-control right-align"
-          name="{{valueField.name}}" type="text" value={{valueField.value}}>
-        <span class="input-group-addon">%</span>
+      <div class="form-group">
+        <div class="input-group">
+          <span class="input-group-addon">%</span>
+          <input class="js-value-input form-control"
+            name="{{valueField.name}}" type="text" value={{valueField.value}}>
+        </div>
       </div>
+      <a class="js-remove-tier btn btn-default btn-sm"><span class="icon icon-delete"></span></a>
     </div>
-    <div class="clear"></div>
   </div>
 </script>

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

@@ -1,23 +1,28 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_promotion) %>
+  <%= Spree.t(:editing_resource, resource: Spree::Promotion.model_name.human) %>
 <% end %>
 
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
 <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
+  <div class="row">
+    <div class="col-md-12">
+      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>  
+    </div>    
+  </div>
+  
 <% end %>
 
 <div id="promotion-filters" class="row">
-  <div id="rules_container" class="alpha eight columns">
-    <%= render :partial => 'rules' %>
+  <div id="rules_container" class="col-md-6">
+    <div class="panel panel-default">
+      <%= render :partial => 'rules' %>
+    </div>
   </div>
 
-  <div id="actions_container" class="omega eight columns">
-    <%= render :partial => 'actions' %>
+  <div id="actions_container" class="col-md-6">
+    <div class="panel panel-default">
+      <%= render :partial => 'actions' %>
+    </div>
   </div>
 </div>
 

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

@@ -1,75 +1,51 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:promotions) %>
+  <%= Spree::Promotion.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_promotion), spree.new_admin_promotion_path, :icon => 'plus' %>
-  </li>
-<% end %>
-
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= button_link_to Spree.t(:new_promotion), new_object_url, :class => "btn-success", :icon => 'add' %>
 <% end %>
 
 <% content_for :table_filter do %>
   <div data-hook="admin_promotions_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
-      <div class="four columns alpha">
-        <div class="field">
-          <%= label_tag :q_name_cont, Spree.t(:name) %>
-          <%= f.text_field :name_cont, tabindex: 1 %>
-        </div>
-      </div>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= label_tag :q_name_cont, Spree.t(:name) %>
+            <%= f.text_field :name_cont, tabindex: 1, class: "form-control js-quick-search-target" %>
+          </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= label_tag :q_code_cont, Spree.t(:code) %>
-          <%= f.text_field :code_cont, tabindex: 1 %>
+          <div class="form-group">
+            <%= label_tag :q_code_cont, Spree.t(:code) %>
+            <%= f.text_field :code_cont, tabindex: 1, class: "form-control" %>
+          </div>
         </div>
-      </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= label_tag :q_path_cont, Spree.t(:path) %>
-          <%= f.text_field :path_cont, tabindex: 1 %>
-        </div>
-      </div>
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= label_tag :q_path_cont, Spree.t(:path) %>
+            <%= f.text_field :path_cont, tabindex: 1, class: "form-control" %>
+          </div>
 
-      <div class="four columns omega">
-        <div class="field">
-          <%= label_tag :q_promotion_category_id_eq, 'promotion category' %><br>
-          <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.all') }, { :class => 'select2 fullwidth' }) %>
+          <div class="form-group">
+            <%= label_tag :q_promotion_category_id_eq, Spree.t(:promotion_category) %>
+            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.all') }, { :class => 'select2' }) %>
+          </div>
         </div>
       </div>
 
-      <div class="clearfix"></div>
-
-      <div class="actions filter-actions">
-        <div data-hook="admin_promotions_index_search_buttons">
-          <%= button Spree.t(:filter_results), 'search' %>
-        </div>
+      <div data-hook="admin_promotions_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:filter_results), 'search' %>
       </div>
     <% end %>
   </div>
 <% end %>
 
-
 <%= paginate @promotions %>
 
 <% if @promotions.any? %>
-  <table class="index">
-    <colgroup>
-      <col style="width: 20%">
-      <col style="width: 10%">
-      <col style="width: 30%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-    </colgroup>
+  <table class="table">
     <thead>
       <tr>
         <th><%= Spree.t(:name) %></th>
@@ -83,14 +59,14 @@
     </thead>
     <tbody>
       <% @promotions.each do |promotion| %>
-        <tr id="<%= spree_dom_id promotion %>" class="<%= cycle('odd', 'even')%>">
-          <td><%= promotion.name %></td>
-          <td class="align-center"><%= promotion.code %></td>
+        <tr id="<%= spree_dom_id promotion %>">
+          <td><%= link_to promotion.name, edit_admin_promotion_path(promotion) %></td>
+          <td><%= promotion.code %></td>
           <td><%= promotion.description %></td>
-          <td class="align-center"><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
-          <td class="align-center"><%= Spree.t(:current_promotion_usage, :count => promotion.credits_count) %></td>
-          <td class="align-center"><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
-          <td class="actions">
+          <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
+          <td><%= Spree.t(:current_promotion_usage, :count => promotion.credits_count) %></td>
+          <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
+          <td class="actions actions-2">
             <%= link_to_edit promotion, :no_text => true %>
             <%= link_to_delete promotion, :no_text => true %>
           </td>
@@ -99,8 +75,8 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/promotion')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_promotion_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::Promotion.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -2,11 +2,9 @@
   <%= Spree.t(:new_promotion) %>
 <% end %>
 
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
 <%= form_for :promotion, :url => collection_url do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-  </fieldset>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <div class="text-center">
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>  
+  </div>
 <% end %>

data/app/views/spree/admin/promotions/rules/_item_total.html.erb

@@ -1,8 +1,12 @@
-<div class="field alpha four columns">
-  <%= select_tag "#{param_prefix}[preferred_operator_min]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_min), { class: 'select2 select_item_total fullwidth' } %>
-  <%= select_tag "#{param_prefix}[preferred_operator_max]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_max), { class: 'select2 select_item_total fullwidth' } %>
-</div>
-<div class="field omega four columns">
-  <%= text_field_tag "#{param_prefix}[preferred_amount_min]", promotion_rule.preferred_amount_min, class: 'fullwidth' %>
-  <%= text_field_tag "#{param_prefix}[preferred_amount_max]", promotion_rule.preferred_amount_max, class: 'fullwidth' %>
+<div class="panel-body">
+  <div class="row no-marginb">
+    <div class="form-group col-md-6 no-marginb">
+      <%= select_tag "#{param_prefix}[preferred_operator_min]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_min), { class: 'select2 select_item_total marginb' } %>
+      <%= select_tag "#{param_prefix}[preferred_operator_max]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_max), { class: 'select2 select_item_total' } %>
+    </div>
+    <div class="form-group col-md-6 no-marginb">
+      <%= text_field_tag "#{param_prefix}[preferred_amount_min]", promotion_rule.preferred_amount_min, class: 'form-control marginb' %>
+      <%= text_field_tag "#{param_prefix}[preferred_amount_max]", promotion_rule.preferred_amount_max, class: 'form-control' %>
+    </div>
+  </div>
 </div>

data/app/views/spree/admin/promotions/rules/_landing_page.html.erb

@@ -1,5 +1,9 @@
-<div class="field alpha omega eight columns">
-  <label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree.t('promotion_rule_types.landing_page.description') %>:</label>  
-  <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, :class => 'fullwidth' %>  
-  <span class="info"><%= Spree.t('landing_page_rule.must_have_visited_path') %></span>
-</div>
+<div class="panel-body">
+  <div class="form-group">
+    <label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree.t('promotion_rule_types.landing_page.description') %>:</label>
+    <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, :class => 'form-control' %>
+    <p class="help-block">
+      <%= Spree.t('landing_page_rule.must_have_visited_path') %>
+    </p>
+  </div>
+</div>

data/app/views/spree/admin/promotions/rules/_option_value.html.erb

@@ -0,0 +1,42 @@
+<div class="panel-body">
+  <div class="promo-rule-option-values">
+    <div class="js-promo-rule-option-values"></div>
+
+    <button class="btn btn-primary btn-success js-add-promo-rule-option-value">
+      <span class="icon icon-add"></span>
+      <%= Spree.t(:add) %>
+    </button>
+  </div>
+</div>
+
+<%= content_tag :div, nil, class: "hidden js-original-promo-rule-option-values",
+  data: { :'original-option-values' => promotion_rule.preferred_eligible_values } %>
+
+<script type="text/x-handlebars-template" id="promo-rule-option-value-option-values-select-name-template">
+  <%= param_prefix %>[preferred_eligible_values][{{productId}}]
+</script>
+
+<script type="text/x-handlebars-template" id="promo-rule-option-value-template">
+  <div class="promo-rule-option-value panel panel-default">
+    <div class="panel-heading">
+      <a class="js-remove-promo-rule-option-value delete pull-right">
+        <span class="icon icon-delete"></span>
+      </a>
+      <div class="col-md-6">
+        <label><%= Spree.t(:product) %></label>
+      </div>
+      <div class="col-md-5">
+        <label><%= Spree.t(:option_values) %></label>
+      </div>
+      <div class="clearfix"></div>
+    </div>
+    <div class="panel-body row">
+      <div class="col-md-6">
+        <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
+      </div>
+      <div class="col-md-6">
+        <input class="js-promo-rule-option-value-option-values-select fullwidth" name="<%= param_prefix %>[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
+      </div>
+    </div>
+  </div>
+</script>

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -1,9 +1,10 @@
-<div class="field alpha omega eight columns products_rule_products">
-  <%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
-  <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), :class => "product_picker fullwidth" %>
-</div>
-<div class="field alpha omega eight columns">
-  <label>
-    <%= Spree.t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_product select2'})).html_safe %>
-  </label>
+<div class="panel-body">
+  <div class="form-group products_rule_products">
+    <%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
+    <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), :class => "product_picker" %>
+  </div>
+  <div class="form-group no-marginb">
+    <%= label_tag Spree.t('product_rule.label') %>
+    <%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_product form-control'}) %>
+  </div>
 </div>

data/app/views/spree/admin/promotions/rules/_taxon.html.erb

@@ -1,9 +1,10 @@
-<div class="field alpha omega eight columns taxons_rule_taxons">
-  <%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>
-  <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), :class => "taxon_picker fullwidth", id: 'product_taxon_ids' %>
-</div>
-<div class="field alpha omega eight columns">
-  <label>
-    <%= Spree.t('taxon_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_taxon select2'})).html_safe %>
-  </label>
+<div class="panel-body">
+  <div class="form-group taxons_rule_taxons">
+    <%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>
+    <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), :class => "taxon_picker", id: 'product_taxon_ids' %>
+  </div>
+  <div class="form-group no-marginb">
+    <%= label_tag Spree.t('taxon_rule.label') %>
+    <%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_taxon form-control'}) %>
+  </div>
 </div>