From d6b38635f9e88096d0b0f5b349cb7599d1d489ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Nadaud?= <jnadaud@jnadaud>
Date: Thu, 25 Jul 2013 14:02:36 +0200
Subject: [PATCH] [+] BO : Product "For"

---
 .../controllers/products/informations.tpl     | 22 +++++++++----------
 .../template/controllers/products/prices.tpl  |  6 ++---
 .../template/controllers/products/seo.tpl     |  8 +++----
 controllers/admin/AdminProductsController.php |  1 +
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index b29963145..ab9cb90d2 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -120,7 +120,7 @@
 <hr/>
 
 <div class="row">
-	<label class="control-label col-lg-3 required">
+	<label class="control-label col-lg-3 required" for="name_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Invalid characters:'} &lt;&gt;;=#{}">
 			{l s='Name:'}
@@ -139,38 +139,38 @@
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="reference">
 		<span class="label-tooltip" data-toggle="tooltip"
 		title="{l s='Special characters allowed:'} .-_#\">
 			{$bullet_common_field} {l s='Reference:'}
 		</span>
 	</label>
 	<div class="col-lg-5">
-		<input type="text" name="reference" value="{$product->reference|htmlentitiesUTF8}" />
+		<input type="text" id="reference" name="reference" value="{$product->reference|htmlentitiesUTF8}" />
 	</div>
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="ean13">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='(Europe, Japan)'}">
 			{$bullet_common_field} {l s='EAN13 or JAN:'}
 		</span>
 	</label>
 	<div class="col-lg-3">
-		<input maxlength="13" type="text" name="ean13" value="{$product->ean13|htmlentitiesUTF8}" />
+		<input maxlength="13" type="text" id="ean13" name="ean13" value="{$product->ean13|htmlentitiesUTF8}" />
 	</div>
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="upc">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='(US, Canada)'}">
 			{$bullet_common_field} {l s='UPC:'}
 		</span>
 	</label>
 	<div class="col-lg-3">
-		<input maxlength="12" type="text" name="upc" value="{$product->upc|escape:html:'UTF-8'}" />
+		<input maxlength="12" type="text" id="upc" name="upc" value="{$product->upc|escape:html:'UTF-8'}" />
 	</div>
 </div>
 
@@ -298,7 +298,7 @@
 
 <div class="row">
 	{include file="controllers/products/multishop/checkbox.tpl" field="description_short" type="tinymce" multilang="true"}
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="description_short_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Appears in the product list(s), and on the top of the product page.'}">
 			{l s='Short description:'}
@@ -316,7 +316,7 @@
 
 <div class="row">
 	{include file="controllers/products/multishop/checkbox.tpl" field="description" type="tinymce" multilang="true"}
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="description_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Appears in the body of the product page'}">
 			{l s='Description:'}
@@ -383,7 +383,7 @@
 		</div>
 	</div>
 	<div class="row">
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="resultImage">
 			<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='The tag to copy/paste into the description.'}">
 				{l s='Image tag to insert:'}
@@ -398,7 +398,7 @@
 {/if}
 
 <div class="row">
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="tags_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Tags separated by commas (e.g. dvd, dvd player, hifi)'} - {l s='Forbidden characters:'} !&lt;;&gt;;?=+#&quot;&deg;{}_$%">
 			{l s='Tags:'}
diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl
index d023f8342..e85f59ef3 100644
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -114,7 +114,7 @@ $(document).ready(function () {
 
 {include file="controllers/products/multishop/checkbox.tpl" field="wholesale_price" type="default"}
 <div class="row">
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="wholesale_price">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Wholesale price'}">
 			{l s='Pre-tax wholesale price:'}
@@ -129,7 +129,7 @@ $(document).ready(function () {
 
 <div class="row">
 	{include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="priceTE">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='The pre-tax retail price to sell this product'}">
 			{l s='Pre-tax retail price:'}
@@ -216,7 +216,7 @@ $(document).ready(function () {
 
 <div class="row">
 	{include file="controllers/products/multishop/checkbox.tpl" field="unit_price" type="unit_price"}
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="unit_price">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='e.g. per lb.'}">
 			{l s='Unit price:'}
diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl
index d1c24aabd..06988f2da 100644
--- a/admin-dev/themes/default/template/controllers/products/seo.tpl
+++ b/admin-dev/themes/default/template/controllers/products/seo.tpl
@@ -29,7 +29,7 @@
 
 <div class="row">
 	{include file="controllers/products/multishop/checkbox.tpl" field="meta_title" type="default" multilang="true"}
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="meta_title_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Product page title: Leave blank to use the product name'}">
 			{l s='Meta title:'}
@@ -47,7 +47,7 @@
 
 <div class="row">
 	{include file="controllers/products/multishop/checkbox.tpl" field="meta_description" type="default" multilang="true"}
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="meta_description_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='A single sentence for the HTML header is needed. '}">
 			{l s='Meta description:'}
@@ -66,7 +66,7 @@
 
 <div class="row">
 	{include file="controllers/products/multishop/checkbox.tpl" field="meta_keywords" type="default" multilang="true"}
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="meta_keywords_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Keywords for HTML header, separated by commas.'}">
 			{l s='Meta keywords:'}
@@ -83,7 +83,7 @@
 
 <div class="row">
 	{include file="controllers/products/multishop/checkbox.tpl" field="link_rewrite" type="default" multilang="true"}
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="link_rewrite_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='friendly URL from the product name.'}">
 			{l s='Friendly URL:'}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index b26fcd80b..9af8ed58f 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3021,6 +3021,7 @@ class AdminProductsControllerCore extends AdminController
 		$data->assign(array(
 			'product' => $product,
 			'languages' => $this->_languages,
+			'id_lang' => $this->context->language->id,
 			'ps_ssl_enabled' => Configuration::get('PS_SSL_ENABLED'),
 			'curent_shop_url' => $this->context->shop->getBaseURL()
 		));