From a4103265e52a21e20f6090eeb4af56786a4428b8 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Mon, 16 Sep 2013 18:17:29 +0200
Subject: [PATCH] // Color picker

---
 admin-dev/themes/default/template/helpers/form/form.tpl     | 4 ++--
 .../themes/default/template/helpers/options/options.tpl     | 6 ++++--
 js/jquery/plugins/jquery.colorpicker.js                     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 100ab3a7c..eeb85b74c 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -464,14 +464,14 @@
 								{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>
 								{elseif $input.type == 'date'}
 									<div class="row">
 										<div class="input-group col-lg-4">
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index ca7c2554a..d3831560c 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -173,8 +173,10 @@
 											<input type="file" name="{$key}" />
 										</div>
 						            {elseif $field['type'] == 'color'}
-										<div class="col-lg-9">
-							              <input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+										<div class="col-lg-2">
+											<div class="input-group">
+								              <input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+								            </div>
 							            </div>
 									{elseif $field['type'] == 'price'}
 										<div class="input-group col-lg-9">
diff --git a/js/jquery/plugins/jquery.colorpicker.js b/js/jquery/plugins/jquery.colorpicker.js
index b2f0c8469..592d7c773 100755
--- a/js/jquery/plugins/jquery.colorpicker.js
+++ b/js/jquery/plugins/jquery.colorpicker.js
@@ -154,7 +154,7 @@
       }).css({
         'color': $.fn.mColorPicker.textColor($('#' + id).css('background-color'))
       }).after(
-        '<span style="cursor:pointer;" id="icp_' + id + '" class="mColorPickerTrigger"><img src="' + $o.imageFolder + 'color.png" style="border:0;margin:0 0 0 3px" align="absmiddle"></span>'
+        '<span style="cursor:pointer;" id="icp_' + id + '" class="mColorPickerTrigger input-group-addon"><img src="' + $o.imageFolder + 'color.png" style="border:0;margin:0 0 0 3px" align="absmiddle"></span>'
       ).addClass('mColorPickerInput');
     }