From 003ac6e01bd6c75d74e8183e59cdac040a04870a Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Wed, 30 Nov 2011 16:32:51 +0000
Subject: [PATCH] // fix small bugs

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10813 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/attributes/form.tpl | 20 ++++++++++++++++++-
 .../themes/template/logs/list_header.tpl      |  2 +-
 classes/AdminController.php                   |  8 ++++----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/template/attributes/form.tpl b/admin-dev/themes/template/attributes/form.tpl
index 2ee73b654..9de6e6359 100644
--- a/admin-dev/themes/template/attributes/form.tpl
+++ b/admin-dev/themes/template/attributes/form.tpl
@@ -23,9 +23,27 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+
 {extends file="helper/form/form.tpl"}
 
-{block name=script}
+{block name="label"}
+	{if $input.type == 'color'}
+		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
+	{/if}
+	{if isset($input.label)}
+		<label>{$input.label} </label>
+	{/if}
+{/block}
+
+
+{block name="end_field_block"}
+		{if $input.type == 'text' && $input.name == 'texture'}
+			</div>
+		{/if}
+	</div>
+{/block}
+
+{block name="script"}
 	var attributesGroups = {ldelim}{$strAttributesGroups}{rdelim};
 	$('#id_attribute_group').change(function() {
 		var val = $(this).val();
diff --git a/admin-dev/themes/template/logs/list_header.tpl b/admin-dev/themes/template/logs/list_header.tpl
index c3cbacae6..1e0b13806 100644
--- a/admin-dev/themes/template/logs/list_header.tpl
+++ b/admin-dev/themes/template/logs/list_header.tpl
@@ -31,7 +31,7 @@
 	<fieldset>
 		<legend>{l s='Severity levels'}</legend>
 		<p>{l s='Meaning of severity levels:'}</p>
-		<ol>
+		<ol style="margin-left: 30px; list-style-type: decimal;">
 			<li style="color: green;">{l s='Informative only'}</li>
 			<li style="color: orange;">{l s='Warning'}</li>
 			<li style="color: orange;">{l s='Error'}</li>
diff --git a/classes/AdminController.php b/classes/AdminController.php
index ef525a413..edd2a1651 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1555,13 +1555,13 @@ class AdminControllerCore extends Controller
 		// retrocomp :
 		// if value is not set, try with "AdminTab" as prefix.
 		// @todo : change AdminTab to Helper
-		if ( isset($_LANGADM[$class.$key]))
+		if (isset($_LANGADM[$class.$key]))
 			$str = $_LANGADM[$class.$key];
-		else if ( isset($_LANGADM['admincontroller'.$key]))
+		else if (isset($_LANGADM['admincontroller'.$key]))
 			$str = $_LANGADM['admincontroller'.$key];
-		else if ( isset($_LANGADM['helper'.$key]))
+		else if (isset($_LANGADM['helper'.$key]))
 			$str = $_LANGADM['helper'.$key];
-		else if ( isset($_LANGADM['admintab'.$key]))
+		else if (isset($_LANGADM['admintab'.$key]))
 			$str = $_LANGADM['admintab'.$key];
 		else
 			// note in 1.5, some translations has moved from AdminXX to helper/*.tpl