From 488cf0919aaa9b3ee731d5e361c67dce6ddeb2f6 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Thu, 25 Jul 2013 15:51:41 +0200
Subject: [PATCH] // BO attributes

---
 .../attributes/helpers/form/form.tpl            |  6 +++---
 .../default/template/helpers/form/form.tpl      | 17 +++++++++++++++--
 .../admin/AdminAttributesGroupsController.php   | 11 +++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
index 365736bbd..1bb90cd1d 100644
--- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
@@ -27,18 +27,18 @@
 
 {block name="label"}
 	{if $input.type == 'color'}
-		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if};">
+		<div id="colorAttributeProperties" "{if !$colorAttributeProperties}style="display:none"{/if};">
 	{/if}
 	{$smarty.block.parent}
 {/block}
 
 {block name="field"}
 	{if $input.name == 'current_texture'}
-		<div class="margin-form">
+		<div class="col-lg-9">
 			{if isset($imageTextureExists) && $imageTextureExists}
 				<img src="{$imageTexture}" alt="{l s='Texture'}" />
 			{else}
-				{l s='None'}
+				<p>{l s='None'}</p>
 			{/if}
 		</div>
 	{else}
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 97d337cd4..5fed98dcb 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -59,7 +59,19 @@
 									<label for="" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
 										{if isset($input.hint)}
 										<span class="label-tooltip" data-toggle="tooltip"
-											title="{$input.hint}">
+											title="
+												{if is_array($input.hint)}
+													{foreach $input.hint as $hint}
+														{if is_array($hint)}
+															{$hint.text}
+														{else}
+															{$hint}
+														{/if}
+													{/foreach}
+												{else}
+													{$input.hint}
+												{/if}
+											">
 										{/if}
 											{$input.label}
 										{if isset($input.hint)}
@@ -213,7 +225,6 @@
 												{/foreach}
 											{/if}
 										</select>
-										{if !empty($input.hint)}<div class="alert alert-info" name="help_box">{$input.hint}</div>{/if}
 									{/if}
 								{elseif $input.type == 'radio'}
 									{foreach $input.values as $value}
@@ -373,6 +384,7 @@
 								{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
 										{$asso_shop}
 								{elseif $input.type == 'color'}
+
 									<input type="color"
 										data-hex="true"
 										{if isset($input.class)}class="{$input.class}"
@@ -380,6 +392,7 @@
 										name="{$input.name}"
 										class="{if isset($input.class)}{$input.class}{/if}"
 										value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
+
 								{elseif $input.type == 'date'}
 									<input type="text"
 										data-hex="true"
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index ec003d985..98c704d8b 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -201,8 +201,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 					'name' => 'public_name',
 					'lang' => true,
 					'required' => true,
-					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'desc' => $this->l('Group name displayed to the customer')
+					'hint' => $this->l('Group name displayed to the customer').'&nbsp;'.$this->l('Invalid characters:').' <>;=#{}'
 				),
 				array(
 					'type' => 'select',
@@ -214,7 +213,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 						'id' => 'id',
 						'name' => 'name'
 					),
-					'desc' => $this->l('Choose the type of the attribute')
+					'hint' => $this->l('Choose the type of the attribute')
 				)
 			)
 		);
@@ -262,7 +261,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 						'id' => 'id_attribute_group',
 						'name' => 'name'
 					),
-					'desc' => $this->l('Choose the type of the attribute')
+					'hint' => $this->l('Choose the type of the attribute')
 				),
 				array(
 					'type' => 'text',
@@ -300,14 +299,14 @@ class AdminAttributesGroupsControllerCore extends AdminController
 			'type' => 'color',
 			'label' => $this->l('Color:'),
 			'name' => 'color',
-			'desc' => $this->l('Choose a color with the color picker, or enter an HTML color (e.g. "lightblue", "#CC6600")')
+			'hint' => $this->l('Choose a color with the color picker, or enter an HTML color (e.g. "lightblue", "#CC6600")')
 		);
 
 		$this->fields_form['input'][] = array(
 			'type' => 'file',
 			'label' => $this->l('Texture:'),
 			'name' => 'texture',
-			'desc' => array(
+			'hint' => array(
 				$this->l('Upload color texture from your computer'),
 				$this->l('This will override the HTML color!')
 			)