From fa2f10ffc6fc506364ac09bb460f1029e8f917a4 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Thu, 26 Sep 2013 16:43:57 +0200
Subject: [PATCH] // Add row break to color element

---
 .../default/template/helpers/form/form.tpl     | 18 +++++++++++-------
 controllers/admin/AdminStatusesController.php  | 18 ++++++++++++------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 28f7d56f4..db2f7e55d 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -528,13 +528,17 @@
 								{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
 										{$asso_shop}
 								{elseif $input.type == 'color'}
-								<div class="input-group col-lg-2">
-									<input type="color"
-										data-hex="true"
-										{if isset($input.class)}class="{$input.class}"
-										{else}class="color mColorPickerInput"{/if}
-										name="{$input.name}"
-										value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
+								<div class="col-lg-2">
+									<div class="row">
+										<div class="input-group">
+											<input type="color"
+											data-hex="true"
+											{if isset($input.class)}class="{$input.class}"
+											{else}class="color mColorPickerInput"{/if}
+											name="{$input.name}"
+											value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
+										</div>
+									</div>
 								</div>
 								{elseif $input.type == 'date'}
 									<div class="row">
diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php
index a622792d6..21699773d 100644
--- a/controllers/admin/AdminStatusesController.php
+++ b/controllers/admin/AdminStatusesController.php
@@ -73,7 +73,8 @@ class AdminStatusesControllerCore extends AdminController
 		$this->fields_list = array(
 			'id_order_state' => array(
 				'title' => $this->l('ID'),
-				'align' => 'center'
+				'align' => 'center',
+				'class' => 'fixed-width-xs'
 			),
 			'name' => array(
 				'title' => $this->l('Name'),
@@ -85,7 +86,8 @@ class AdminStatusesControllerCore extends AdminController
 				'align' => 'center',
 				'image' => 'os',
 				'orderby' => false,
-				'search' => false
+				'search' => false,
+				'class' => 'fixed-width-xs'
 			),
 			'send_email' => array(
 				'title' => $this->l('Send email to customer'),
@@ -95,7 +97,8 @@ class AdminStatusesControllerCore extends AdminController
 					'0' => 'disabled.gif'
 				),
 				'type' => 'bool',
-				'orderby' => false
+				'orderby' => false,
+				'class' => 'fixed-width-sm'
 			),
 			'delivery' => array(
 				'title' => $this->l('Delivery'),
@@ -105,7 +108,8 @@ class AdminStatusesControllerCore extends AdminController
 					'0' => 'disabled.gif'
 				),
 				'type' => 'bool',
-				'orderby' => false
+				'orderby' => false,
+				'class' => 'fixed-width-sm'
 			)
 			,
 			'invoice' => array(
@@ -116,7 +120,8 @@ class AdminStatusesControllerCore extends AdminController
 					'0' => 'disabled.gif'
 				),
 				'type' => 'bool',
-				'orderby' => false
+				'orderby' => false,
+				'class' => 'fixed-width-sm'
 			),
 			'template' => array(
 				'title' => $this->l('Email template')
@@ -140,7 +145,8 @@ class AdminStatusesControllerCore extends AdminController
 		$this->fields_list = array(
 			'id_order_return_state' => array(
 				'title' => $this->l('ID'),
-				'align' => 'center'
+				'align' => 'center',
+				'class' => 'fixed-width-xs'
 			),
 			'name' => array(
 				'title' => $this->l('Name'),