From 534421fb6bc5b30a52f75b2cac2d46ca2a773c3d Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Thu, 31 Oct 2013 12:20:29 +0100
Subject: [PATCH] // UI fixs

---
 .../controllers/countries/helpers/list/list_footer.tpl |  1 +
 .../specific_price_rule/helpers/form/form.tpl          | 10 +++++-----
 .../controllers/states/helpers/list/list_footer.tpl    |  1 +
 controllers/admin/AdminCartRulesController.php         |  2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
index 41e4eb114..d3c7eea3e 100644
--- a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
@@ -138,6 +138,7 @@
 </table>
 <input type="hidden" name="token" value="{$token}" />
 </div>
+</div>
 </form>
 <script type="text/javascript">
 	var confirmation = new Array();
diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
index 82308a6fe..5d81c9149 100755
--- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
@@ -36,7 +36,7 @@
 <div class="panel">
 	<h3><i class="icon-tasks"></i> {l s='Conditions'}</h3>
 	<form class="form-horizontal">
-		<div class="row">
+		<div class="form-group">
 			<label for="id_category" class="control-label col-lg-3">{l s='Category'}</label>
 			<div class="col-lg-9">
 				<div class="col-lg-8">
@@ -53,7 +53,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label for="id_manufacturer" class="control-label col-lg-3">{l s='Manufacturer'}</label>
 			<div class="col-lg-9">
 				<div class="col-lg-8">
@@ -70,7 +70,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label for="id_supplier" class="control-label col-lg-3">{l s='Supplier'}</label>
 			<div class="col-lg-9">
 				<div class="col-lg-8">
@@ -87,7 +87,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label for="id_attribute" class="control-label col-lg-3">{l s='Attributes'}</label>
 			<div class="col-lg-9">
 				<div class="col-lg-4">
@@ -114,7 +114,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label for="id_attribute" class="control-label col-lg-3">{l s='Features'}</label>
 			<div class="col-lg-9">
 				<div class="col-lg-4">
diff --git a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
index fb605cff1..b8518c14f 100644
--- a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
@@ -137,6 +137,7 @@
 		</td>
 	</tr>
 </table>
+</div>
 <input type="hidden" name="token" value="{$token}" />
 </form>
 
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index 932877f0c..cef27a879 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -44,7 +44,7 @@ class AdminCartRulesControllerCore extends AdminController
 			'code' => array('title' => $this->l('Code'), 'class' => 'fixed-width-sm'),
 			'quantity' => array('title' => $this->l('Quantity'), 'align' => 'center', 'class' => 'fixed-width-xs'),
 			'date_to' => array('title' => $this->l('Until'), 'class' => 'fixed-width-lg'),
-			'active' => array('title' => $this->l('Status'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false),
+			'active' => array('title' => $this->l('Status'), 'active' => 'status', 'type' => 'bool', 'orderby' => false),
 		);
 
 		parent::__construct();