From 4334364b3688019cba9dccd0fa8b0e84a3f00b68 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Thu, 31 Oct 2013 11:34:47 +0100
Subject: [PATCH] // cart rules > conditions > product rules

---
 .../controllers/cart_rules/product_rule.tpl   | 13 +++----
 .../cart_rules/product_rule_group.tpl         | 34 ++++++++-----------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
index f6267166a..5d12784e8 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
@@ -1,18 +1,10 @@
 <tr id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_tr">
-	<td>
-		<a class="btn btn-default" href="javascript:removeProductRule({$product_rule_group_id|intval}, {$product_rule_id|intval});">
-			<i class="icon-remove"></i>
-		</a>
-	</td>
 	<td>
 		<input type="hidden" name="product_rule_{$product_rule_group_id|intval}[]" value="{$product_rule_id}" />
 		<input type="hidden" name="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_type" value="{$product_rule_type|escape}" />
 		{* Everything is on a single line in order to avoid a empty space between the [ ] and the word *}
 		[{if $product_rule_type == 'products'}{l s='Products:'}{elseif $product_rule_type == 'categories'}{l s='Categories:'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers:'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
 	</td>
-	<td>
-		{l s='The product(s) are matching on of these'}
-	</td>
 	<td>
 		<input type="text" id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_match" value="" disabled="disabled" />
 	</td>
@@ -27,6 +19,11 @@
 			</div>
 		</div>
 	</td>
+	<td>
+		<a class="btn btn-default" href="javascript:removeProductRule({$product_rule_group_id|intval}, {$product_rule_id|intval});">
+			<i class="icon-remove"></i>
+		</a>
+	</td>
 </tr>
 
 <script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
index 17f59b9dd..919e10d8f 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
@@ -8,14 +8,13 @@
 
 
 		<div class="form-group">
-			<label class="control-label col-lg-3">{l s='The cart must contain at least'}</label>
-			<div class="col-lg-9">
-				<input class="form-control" type="hidden" name="product_rule_group[]" value="{$product_rule_group_id|intval}" />
-
-				{l s='Product(s) matching the following rules:'}
-
-
-				<input class="form-control fixed-width-xs" type="text" name="product_rule_group_{$product_rule_group_id|intval}_quantity" value="{$product_rule_group_quantity|intval}" />
+			<label class="control-label col-lg-4">{l s='The cart must contain at least'}</label>
+			<div class="col-lg-1">
+				<input type="hidden" name="product_rule_group[]" value="{$product_rule_group_id|intval}" />
+				<input class="form-control" type="text" name="product_rule_group_{$product_rule_group_id|intval}_quantity" value="{$product_rule_group_quantity|intval}" />
+			</div>
+			<div class="col-lg-7">
+				<p class="form-control-static">{l s='Product(s) matching the following rules:'}</p>
 			</div>
 		</div>
 
@@ -23,9 +22,9 @@
 
 		<div class="form-group">
 
-			<label class="control-label col-lg-3">{l s='Add a rule concerning'}</label>
-			<div class="col-lg-9">
-				<select class="form-control fixed-width-lg" id="product_rule_type_{$product_rule_group_id|intval}">
+			<label class="control-label col-lg-4">{l s='Add a rule concerning'}</label>
+			<div class="col-lg-4">
+				<select class="form-control" id="product_rule_type_{$product_rule_group_id|intval}">
 					<option value="">{l s='-- Choose --'}</option>
 					<option value="products">{l s='Products:'}</option>
 					<option value="attributes">{l s='Attributes'}</option>
@@ -33,21 +32,18 @@
 					<option value="manufacturers">{l s='Manufacturers:'}</option>
 					<option value="suppliers">{l s='Suppliers'}</option>
 				</select>
+			</div>
+			<div class="col-lg-4">
 				<a class="btn btn-default" href="javascript:addProductRule({$product_rule_group_id|intval});">
-					<i class="icon-ok"></i>
+					<i class="icon-plus-sign"></i>
 					{l s="Add"}
 				</a>
 			</div>
 
 		</div>
 
-
-		
-
-		
-
-
-		<table id="product_rule_table_{$product_rule_group_id|intval}" class="table">
+		{l s='The product(s) are matching on of these'}
+		<table id="product_rule_table_{$product_rule_group_id|intval}" class="table table-bordered">
 			{if isset($product_rules) && $product_rules|@count}
 				{foreach from=$product_rules item='product_rule'}
 					{$product_rule}