spree_backend 2.4.10 → 3.0.0.rc1

data/app/views/spree/admin/products/stock.html.erb

@@ -1,91 +1,76 @@
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => 'arrow-left' %></li>
-<% end %>
-
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Stock Management' } %>
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @product } %>
 
-<div id="add_stock_form">
+<div id="add_stock_form" class="panel panel-default">
   <%= render 'add_stock_form' %>
 </div>
 
-<table class="index" id="listing_product_stock">
-  <colgroup>
-    <col style="width: 25%" />
-    <col style="width: 25%" />
-    <col style="width: 25%" />
-    <col style="width: 25%" />
-  </colgroup>
-  <thead>
-    <tr data-hook="admin_product_stock_management_index_headers">
-      <th><%= Spree.t(:variant) %></th>
-      <th colspan="4"><%= Spree.t(:stock_location_info) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @variants.each do |variant| %>
-      <% if variant.stock_items.present? %>
-        <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows" class="<%= cycle('odd', 'even') %>">
-          <td class="align-center">
-            <%= variant.sku_and_options_text %>
-            <br>
-            <% if variant.images.present? %>
-              <%= image_tag variant.images.first.attachment.url(:mini) %>
-            <% end %>
-            <br/>
-            <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
-                <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
-                                  class: 'track_inventory_checkbox' %>
-                <%= label_tag :track_inventory, Spree.t(:track_inventory) %>
+<div class="panel panel-default">
+  <table class="table table-bordered" id="listing_product_stock">
+    <thead>
+      <tr data-hook="admin_product_stock_management_index_headers">
+        <th colspan="2"><%= Spree.t(:variant) %></th>
+        <th colspan="3"><%= Spree.t(:stock_location_info) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @variants.each do |variant| %>
+        <% if variant.stock_items.present? %>
+          <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
+            <td class="image text-center">
+              <% if variant.images.present? %>
+                <%= image_tag variant.images.first.attachment.url(:mini) %>
+              <% end %>
+            </td>
+            <td>
+              <%= variant.sku_and_options_text %>
+              <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
+                <div class="checkbox">
+                  <%= label_tag :track_inventory do %>
+                    <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
+                                      class: 'track_inventory_checkbox' %>
+                    <%= Spree.t(:track_inventory) %>
+                  <% end %>
+                </div>
                 <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
                     class: 'variant_track_inventory',
                     id: "variant_track_inventory_#{variant.id}" %>
-            <% end %>
-          </td>
-          <td colspan="4" class="stock_location_info">
-            <table>
-              <colgroup>
-                <col style="width: 45%" />
-                <col style="width: 20%" />
-                <col style="width: 20%" />
-                <col style="width: 15%" />
-              </colgroup>
-              <thead>
-                <th><%= Spree.t(:stock_location) %></th>
-                <th><%= Spree.t(:count_on_hand) %></th>
-                <th><%= Spree.t(:backorderable) %></th>
-                <th class="actions"></th>
-              </thead>
-              <tbody>
-                <% variant.stock_items.each do |item| %>
-                  <% next unless @stock_locations.include?(item.stock_location) %>
+              <% end %>
+            </td>
 
-                  <tr id="stock-item-<%= item.id %>" class="<%= cycle('odd', 'even', :name => 'stock_locations')%>">
-                    <td class="align-center"><%= item.stock_location.name %></td>
-                    <td class="align-center"><%= item.count_on_hand %></td>
-                    <td class="align-center">
-                      <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                        <%= check_box_tag 'stock_item[backorderable]', true,
-                              item.backorderable?,
-                              class: 'stock_item_backorderable',
-                              id: "stock_item_backorderable_#{item.stock_location.id}" %>
-                      <% end %>
-                    </td>
-                    <td class="actions">
-                      <%= link_to(icon('delete'), [:admin, item],
-                            method: :delete, remote: true,
-                            class: 'icon_link with-tip fa fa-trash no-text',
-                            title: Spree.t(:remove), data: { action: :remove, confirm: Spree.t(:are_you_sure) }) %>
-                    </td>
-                  </tr>
-                <% end %>
-              </tbody>
-            </table>
-          </td>
-          <% reset_cycle("stock_locations") %>
-        <% end %>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+            <td colspan="3" class="stock_location_info">
+              <table class="table table-bordered no-marginb">
+                <thead>
+                  <th><%= Spree.t(:stock_location) %></th>
+                  <th class="text-center"><%= Spree.t(:count_on_hand) %></th>
+                  <th class="text-center"><%= Spree.t(:backorderable) %></th>
+                  <th class="actions text-center"></th>
+                </thead>
+                <tbody>
+                  <% variant.stock_items.each do |item| %>
+                    <% next unless @stock_locations.include?(item.stock_location) %>
+                    <tr id="stock-item-<%= item.id %>">
+                      <td><%= item.stock_location.name %></td>
+                      <td class="text-center"><%= item.count_on_hand %></td>
+                      <td class="text-center">
+                        <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
+                          <%= check_box_tag 'stock_item[backorderable]', true,
+                                item.backorderable?,
+                                class: 'stock_item_backorderable',
+                                id: "stock_item_backorderable_#{item.stock_location.id}" %>
+                        <% end %>
+                      </td>
+                      <td class="actions actions-1 text-center">
+                        <%= link_to_with_icon 'delete', Spree.t(:remove), [:admin, item], method: :delete, remote: true, class: 'icon_link btn btn-danger btn-sm', data: { action: :remove, confirm: Spree.t(:are_you_sure) }, no_text: true  %>
+                      </td>
+                    </tr>
+                  <% end %>
+                </tbody>
+              </table>
+            </td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -1,4 +1,4 @@
-$('#actions').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_action', :object => @promotion_action) ) %>');
+$('#actions').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_action', object: @promotion_action) ) %>');
 $('#actions .no-objects-found').hide();
 $(document).ready(function(){
   $(".variant_autocomplete").variantAutocomplete();
@@ -10,4 +10,3 @@ initProductActions();
 
 $('#<%= dom_id @promotion_action %>').hide();
 $('#<%= dom_id @promotion_action %>').fadeIn();
-

data/app/views/spree/admin/promotion_actions/destroy.js.erb

@@ -1 +1 @@
-$('#<%= dom_id @promotion_action %>').fadeOut().remove();
+$('#<%= dom_id @promotion_action %>').fadeOut().remove();

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

@@ -1,10 +1,10 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @promotion } %>
 
-<div class='row'>
-  <div class='alpha six columns'>
-    <%= f.field_container :name do %>
-      <%= f.label :name %>
-      <%= f.text_field :name, :class => 'fullwidth' %>
-    <% end %>
-  </div>
-</div>
+<%= f.field_container :name, class: ['form-group'] do %>
+  <%= f.label :name %>
+  <%= f.text_field :name, :class => 'form-control' %>
+<% end %>
+<%= f.field_container :code, class: ['form-group'] do %>
+  <%= f.label :code %>
+  <%= f.text_field :code, :class => 'form-control' %>
+<% end %>

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

@@ -1,11 +1,9 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_promotion_category) %>
+  <%= Spree.t(:editing_resource, resource: Spree::PromotionCategory.model_name.human) %>
 <% end %>
 
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
 <%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
   </fieldset>

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

@@ -3,31 +3,32 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, :icon => 'plus' %>
-  </li>
+  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, :icon => 'add', :class => 'btn-success' %>
 <% end %>
 
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
-<table>
-  <colgroup>
-    <col style="width: 85%">
-    <col style="width: 15%">
-  </colgroup>
-  <thead>
-    <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
-    <th class='actions'></th>
-  </thead>
-  <tbody>
-    <% @promotion_categories.each do |promotion_category| %>
-      <tr>
-        <td><%= promotion_category.name %></td>
-        <td class="actions">
-          <%= link_to_edit promotion_category, :no_text => true %>
-          <%= link_to_delete promotion_category, :no_text => true %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<% if @promotion_categories.any? %>
+  <table class="table">
+    <thead>
+      <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
+      <th><%= Spree::PromotionCategory.human_attribute_name :code %></th>
+      <th></th>
+    </thead>
+    <tbody>
+      <% @promotion_categories.each do |promotion_category| %>
+        <tr>
+          <td><%= promotion_category.name %></td>
+          <td><%= promotion_category.code %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit promotion_category, :no_text => true %>
+            <%= link_to_delete promotion_category, :no_text => true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::PromotionCategory.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
+  </div>
+<% end %>

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

@@ -2,10 +2,8 @@
   <%= Spree.t(:new_promotion_category) %>
 <% end %>
 
-<%= render 'spree/admin/shared/promotion_sub_menu' %>
-
 <%= form_for :promotion_category, :url => collection_url do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
   </fieldset>

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -1,4 +1,4 @@
-$('#rules').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
+$('#rules').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_rule', object: @promotion_rule) ) %>');
 $('#rules .no-objects-found').hide();
 
 $('.product_picker').productAutocomplete();

data/app/views/spree/admin/promotion_rules/destroy.js.erb

@@ -1,3 +1,3 @@
 $('#<%= dom_id @promotion_rule %>').fadeOut().remove();
 
-$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
+$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');

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

@@ -1,32 +1,35 @@
-<fieldset id="action_fields" class="eight columns omega no-border-top">
-
+<div class="panel-heading">
+  <h1 class="panel-title">
+    <%= Spree.t(:promotion_actions) %>
+  </h1>
+</div>
+<div id="action_fields" class="panel-body">
   <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do %>
     <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
-    <fieldset>
-      <legend align="center"><%= Spree.t(:promotion_actions) %></legend>
-      <div class="field">
-        <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
-        <%= select_tag 'action_type', options, :class => 'select2 fullwidth' %>  
-      </div>
-      <div class="filter-actions actions">
-        <%= button Spree.t(:add), 'plus' %>
-      </div>
-    </fieldset>
+
+    <div class="form-group">
+      <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
+      <%= select_tag 'action_type', options, :class => 'select2' %>
+    </div>
+    <div class="form-actions">
+      <%= button Spree.t(:add), 'plus', 'submit', class: "btn-success" %>
+    </div>
+
   <% end %>
 
   <%= form_for @promotion, :url => spree.admin_promotion_path(@promotion), :method => :put do |f| %>
-    <div id="actions" class="filter_list">
+    <div id="actions" class="filter_list margint">
       <% if @promotion.actions.any? %>
         <%= render :partial => 'promotion_action',  :collection => @promotion.actions %>
       <% else %>
-        <div class="no-objects-found">
+        <div class="alert alert-warning">
           <%= Spree.t(:no_actions_added) %>
         </div>
       <% end %>
     </div>
-    <div class="filter-actions actions promotion-update">
-      <%= button Spree.t('actions.update'), 'refresh' %>
+    <div class="actions promotion-update">
+      <%= button Spree.t('actions.update'), 'save' %>
     </div>
   <% end %>
 
-</fieldset>
+</div>

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

@@ -1,58 +1,59 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
-<div class="row">
-  <div id="general_fields" class="alpha thirteen columns">
-    <div class="alpha four columns">
-      <%= f.field_container :name do %>
-        <%= f.label :name %>
-        <%= f.text_field :name, :class => 'fullwidth' %>
-      <% end %>
-      
-      <%= f.field_container :code do %>
-        <%= f.label :code %>
-        <%= f.text_field :code, :class => 'fullwidth' %>
-      <% end %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @promotion } %>
 
-      <%= f.field_container :path do %>
-        <%= f.label :path %>
-        <%= f.text_field :path, :class => 'fullwidth' %>
-      <% end %>
+<div class="row" id="general_fields" >
+  <div class="col-md-3">
+    <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.label :name %>
+      <%= f.text_field :name, :class => 'form-control' %>
+    <% end %>
+
+    <%= f.field_container :code, class: ['form-group'] do %>
+      <%= f.label :code %>
+      <%= f.text_field :code, :class => 'form-control' %>
+    <% end %>
+
+    <%= f.field_container :path, class: ['form-group'] do %>
+      <%= f.label :path %>
+      <%= f.text_field :path, :class => 'form-control' %>
+    <% end %>
 
-      <%= f.field_container :advertise do %>
+    <%= f.field_container :advertise, class: ['checkbox'] do %>
+      <%= f.label :advertise do %>
         <%= f.check_box :advertise %>
-        <%= f.label :advertise %>
+        <%= Spree.t(:advertise) %>
       <% end %>
-    </div>
+    <% end %>
+  </div>
 
-    <div class="omega nine columns">
-      <%= f.field_container :description do %>
-        <%= f.label :description %><br />
-        <%= f.text_area :description, :rows => 7, :class => 'fullwidth' %>
-      <% end %>
+  <div class="col-md-6">
+    <%= f.field_container :description, class: ['form-group'] do %>
+      <%= f.label :description %>
+      <%= f.text_area :description, :rows => 7, :class => 'form-control' %>
+    <% end %>
 
-      <%= f.field_container :category do %>
-        <%= f.label :promotion_category %><br />
-        <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
-      <% end %>
-    </div>
+    <%= f.field_container :category, class: ['form-group'] do %>
+      <%= f.label :promotion_category %>
+      <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+    <% end %>
   </div>
 
-  <div id="expiry_fields" class="three columns omega">
+  <div id="expiry_fields" class="col-md-3">
     <%= f.field_container :usage_limit do %>
-      <%= f.label :usage_limit %><br />
-      <%= f.number_field :usage_limit, :min => 0, :class => 'fullwidth' %><br>
-      <span class="info">
+      <%= f.label :usage_limit %>
+      <%= f.number_field :usage_limit, :min => 0, :class => 'form-control' %>
+      <p class="help-block">
         <%= Spree.t(:current_promotion_usage, :count => @promotion.credits_count) %>
-      </span>
+      </p>
     <% end %>
 
-    <div id="starts_at_field" class="field">
+    <div id="starts_at_field" class="form-group">
       <%= f.label :starts_at %>
-      <%= f.text_field :starts_at, :value => datepicker_field_value(@promotion.starts_at), :class => 'datepicker datepicker-from fullwidth' %>
+      <%= f.text_field :starts_at, :value => datepicker_field_value(@promotion.starts_at), :class => 'datepicker datepicker-from form-control' %>
     </div>
 
-    <div id="expires_at_field" class="field">
+    <div id="expires_at_field" class="form-group">
       <%= f.label :expires_at %>
-      <%= f.text_field :expires_at, :value => datepicker_field_value(@promotion.expires_at), :class => 'datepicker datepicker-to fullwidth' %>
+      <%= f.text_field :expires_at, :value => datepicker_field_value(@promotion.expires_at), :class => 'datepicker datepicker-to form-control' %>
     </div>
   </div>
 </div>

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

@@ -1,12 +1,12 @@
-<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
+<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %> panel panel-default" id="<%= dom_id promotion_action %>">
   <% type_name = promotion_action.class.name.demodulize.underscore %>
-  <h6 class="promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h6>
-  <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete, :class => 'delete' %>
-  
+  <div class="panel-heading">
+    <%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete, :class => 'delete pull-right' %>
+    <h3 class="panel-title promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h3>
+  </div>
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
-  
-  <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_action } %>
+
   <%= render :partial => "spree/admin/promotions/actions/#{type_name}",
              :locals => { :promotion_action => promotion_action, :param_prefix => param_prefix } %>
 </div>

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

@@ -1,10 +1,11 @@
-<div class="promotion_rule promotion-block alpha omega eight columns" id="<%= dom_id promotion_rule %>">
+<div class="promotion_rule promotion-block panel panel-default" id="<%= dom_id promotion_rule %>">
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
-  <h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h6>
-  <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), :remote => true, :method => :delete, :class => 'delete' %>
-  
+  <div class="panel-heading">
+    <%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), :remote => true, :method => :delete, :class => 'delete pull-right' %>
+    <h3 class='panel-title promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h3>
+  </div>
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
-  <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>  
-  <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_rule } %>
+  <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
+
   <%= render :partial => "spree/admin/promotions/rules/#{type_name}", :locals => { :promotion_rule => promotion_rule, :param_prefix => param_prefix } %>
 </div>

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

@@ -1,45 +1,46 @@
-<fieldset id="rule_fields" class ="alpha eight columns no-border-bottom no-border-top">
+<div class="panel-heading">
+  <h1 class="panel-title">
+    <%= Spree.t(:rules) %>
+  </h1>
+</div>
+<div id="rule_fields" class="panel-body">
 
   <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), :remote => true, :id => 'new_product_rule_form' do %>
-    <fieldset>
-      <legend align="center"><%= Spree.t(:rules) %></legend>
+    
+    <div class="form-group">
+      <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>
+      <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2') %>
+    </div>
+    <div class="form-actions">
+      <%= button Spree.t(:add), 'plus', 'submit', class: "btn-success" %>
+    </div>
 
-      <div class="field">
-        <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>  
-        <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %>
-      </div>
-      <div class="filter-actions actions">
-        <%= button Spree.t(:add), 'plus' %>
-      </div>
-    </fieldset>
   <% end %>
 
-  
-    <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
-      <fieldset class="no-border-top">
-        <div id="promotion-pilicy-select" class="align-center row">
-          <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
-            <div class="alpha four columns">
-              <label><%= f.radio_button :match_policy, policy %> <%= Spree.t "promotion_form.match_policies.#{policy}" %></label>  
-            </div>
-          <% end %>
-        </div>
-        
-        <div id="rules" class="filter_list row">
-          <% if @promotion.rules.any? %>
-            <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
-          <% else %>
-            <div class="no-objects-found">
-              <%= Spree.t(:no_rules_added) %>
-            </div>
+  <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
+    <div id="promotion-policy-select">
+      <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
+        <div class="radio">
+          <%= f.label "match_policy_#{policy}" do %>
+            <%= f.radio_button :match_policy, policy %>
+            <%= Spree.t "promotion_form.match_policies.#{policy}" %>
           <% end %>
         </div>
+      <% end %>
+    </div>
 
-        <div class="promotion-update filter-actions actions">
-          <%= button Spree.t('actions.update'), 'refresh' %>
+    <div id="rules" class="filter_list margint">
+      <% if @promotion.rules.any? %>
+        <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
+      <% else %>
+        <div class="alert alert-warning">
+          <%= Spree.t(:no_rules_added) %>
         </div>
-      </fieldset>
-    <% end %>
-  
+      <% end %>
+    </div>
 
-</fieldset>
+    <div class="promotion-update actions">
+      <%= button Spree.t('actions.update'), 'ok' %>
+    </div>    
+  <% end %>
+</div>