From 455904a59b44f81526cb9b3c16cc560d355657d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Nadaud?= <jerome.nadaud@prestashop.com>
Date: Tue, 17 Sep 2013 10:13:00 +0200
Subject: [PATCH] // Some input fix

---
 .../controllers/products/attachments.tpl      |  4 +-
 .../controllers/products/input_text_lang.tpl  | 47 +++++----
 .../template/controllers/products/seo.tpl     |  6 +-
 .../controllers/products/textarea_lang.tpl    |  8 +-
 .../default/template/helpers/form/form.tpl    | 98 +++++++++++--------
 .../template/helpers/options/options.tpl      | 29 +++---
 6 files changed, 104 insertions(+), 88 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl
index ce41ff831..50d8ae4bd 100644
--- a/admin-dev/themes/default/template/controllers/products/attachments.tpl
+++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl
@@ -35,7 +35,7 @@
 			{l s='Filename:'}
 			</span>
 		</label>
-		<div class="col-lg-7">
+		<div class="col-lg-9">
 			{include file="controllers/products/input_text_lang.tpl"
 				languages=$languages
 				input_value=$attachment_name
@@ -43,7 +43,7 @@
 			}
 		</div>
 	</div>
-		
+
 	<div class="form-group">
 		<label class="control-label col-lg-3" for="attachment_description_{$id_lang}">{l s='Description:'} </label>
 		<div class="col-lg-9">
diff --git a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
index 3ff9ebfe0..766cf612c 100644
--- a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
+++ b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
@@ -24,10 +24,11 @@
 *}
 
 {foreach from=$languages item=language}
-	<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}">
-
-			{if isset($maxlength)}
-			<span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon"><span class="text-count-down">{$maxlength}</span></span>
+	<div class="translatable-field lang-{$language.id_lang}">
+		<div class="col-lg-9">
+			{if isset($maxchar)}
+			<div class="input-group">
+			<span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon"><span class="text-count-down">{$maxchar}</span></span>
 			{/if}
 			<input type="text"
 			id="{$input_name}_{$language.id_lang}"
@@ -36,28 +37,32 @@
 			value="{$input_value[$language.id_lang]|htmlentitiesUTF8|default:''}"
 			onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
 			onblur="updateLinkRewrite();"
-			{if isset($maxlength)}maxlength="{$maxlength}"{/if}>
-			<div class="input-group-btn">
-				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-					<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
-					{$language.iso_code}
-					<span class="caret"></span>
-				</button>
-				<ul class="dropdown-menu">
-					{foreach from=$languages item=language}
-					<li>
-						<a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}</a>
-					</li>
-					{/foreach}
-				</ul>
+			{if isset($maxchar)} data-maxchar="{$maxchar}"{/if}
+			{if isset($maxlength)} maxlength="{$maxlength}"{/if}>
+			{if isset($maxchar)}
 			</div>
-
+			{/if}
+		</div>
+		<div class="col-lg-2">
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1">
+				<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
+				{$language.iso_code}
+				<span class="caret"></span>
+			</button>
+			<ul class="dropdown-menu">
+				{foreach from=$languages item=language}
+				<li>
+					<a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="" tabindex="-1"> {$language.name}</a>
+				</li>
+				{/foreach}
+			</ul>
+		</div>
 	</div>
 {/foreach}
-{if isset($maxlength)}
+{if isset($maxchar)}
 <script type="text/javascript">
 function countDown($source, $target) {
-	var max = $source.attr("maxlength");
+	var max = $source.attr("data-maxchar");
 	$target.html(max-$source.val().length);
 
 	$source.keyup(function(){
diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl
index b54fd9a2a..688ed4952 100644
--- a/admin-dev/themes/default/template/controllers/products/seo.tpl
+++ b/admin-dev/themes/default/template/controllers/products/seo.tpl
@@ -42,7 +42,7 @@
 					languages=$languages
 					input_name='meta_title'
 					input_value=$product->meta_title
-					maxlength=70
+					maxchar=70
 				}
 			</div>
 		</div>
@@ -62,7 +62,7 @@
 				languages=$languages
 				input_name='meta_description'
 				input_value=$product->meta_description
-				maxlength=160
+				maxchar=160
 			}
 			</div>
 		</div>
@@ -92,7 +92,7 @@
 				title="{l s='friendly URL from the product name.'}">
 				{l s='Friendly URL:'}
 			</span>
-			
+
 		</label>
 		<div class="col-lg-9">
 			<div class="row">
diff --git a/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl b/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl
index 8925c30f7..c3ecebe3f 100644
--- a/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl
+++ b/admin-dev/themes/default/template/controllers/products/textarea_lang.tpl
@@ -25,13 +25,11 @@
 
 {foreach from=$languages item=language}
 <div class="translatable-field lang-{$language.id_lang}">
-	<div class="col-lg-10">
+	<div class="col-lg-9">
 		<textarea
-			id="{$input_name}_{$language.id_lang}" 
+			id="{$input_name}_{$language.id_lang}"
 			name="{$input_name}_{$language.id_lang}"
-			class="{if isset($autosize_js)}textarea-autosize{else}autoload_rte{/if}">
-			{if isset($input_value[$language.id_lang])}{$input_value[$language.id_lang]|htmlentitiesUTF8}{/if}
-		</textarea>
+			class="{if isset($autosize_js)}textarea-autosize{else}autoload_rte{/if}">{if isset($input_value[$language.id_lang])}{$input_value[$language.id_lang]|htmlentitiesUTF8}{/if}</textarea>
 	</div>
 	<div class="col-lg-2">
 		<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index eeb85b74c..f8b006af6 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -90,35 +90,42 @@
 									<div class="row">
 									{foreach $languages as $language}
 										{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
-										<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
-											{if $input.type == 'tags'}
-												{literal}
-													<script type="text/javascript">
-														$().ready(function () {
-															var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
-															$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
-															$({/literal}'#{$table}{literal}_form').submit( function() {
-																$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
+										<div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
+											<div class="col-lg-9">
+												{if $input.type == 'tags'}
+													{literal}
+														<script type="text/javascript">
+															$().ready(function () {
+																var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
+																$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
+																$({/literal}'#{$table}{literal}_form').submit( function() {
+																	$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
+																});
 															});
-														});
-													</script>
-												{/literal}
-											{/if}
-											{if isset($input.maxlength)}
-											<span id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}_counter" class="input-group-addon"><span class="text-count-down">{$input.maxlength}</span></span>
-											{/if}
-											<input type="text"
-												id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
-												name="{$input.name}_{$language.id_lang}"
-												class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
-												value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
-												onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
-												{if isset($input.size)}size="{$input.size}"{/if}
-												{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-												{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-												{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
-												{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
-											<div class="input-group-btn">
+														</script>
+													{/literal}
+												{/if}
+												{if isset($input.maxchar)}
+												<div class="input-group">
+												<span id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}_counter" class="input-group-addon"><span class="text-count-down">{$input.maxchar}</span></span>
+												{/if}
+												<input type="text"
+													id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
+													name="{$input.name}_{$language.id_lang}"
+													class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
+													value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
+													onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
+													{if isset($input.size)} size="{$input.size}"{/if}
+													{if isset($input.maxchar)} data-maxchar="{$input.maxchar}"{/if}
+													{if isset($input.maxlength)} maxlength="{$input.maxlength}"{/if}
+													{if isset($input.readonly) && $input.readonly} readonly="readonly"{/if}
+													{if isset($input.disabled) && $input.disabled} disabled="disabled"{/if}
+													{if isset($input.autocomplete) && !$input.autocomplete} autocomplete="off"{/if} />
+												{if isset($input.maxchar)}
+												</div>
+												{/if}
+											</div>
+											<div class="col-lg-2">
 												<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
 													<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
 													{$language.iso_code}
@@ -132,10 +139,10 @@
 											</div>
 										</div>
 									{/foreach}
-									{if isset($input.maxlength)}
+									{if isset($input.maxchar)}
 									<script type="text/javascript">
 									function countDown($source, $target) {
-										var max = $source.attr("maxlength");
+										var max = $source.attr("data-maxchar");
 										$target.html(max-$source.val().length);
 
 										$source.keyup(function(){
@@ -167,21 +174,26 @@
 											{/literal}
 										{/if}
 										{assign var='value_text' value=$fields_value[$input.name]}
-										{if isset($input.maxlength)}
-										<span id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}_counter" class="input-group-addon"><span class="text-count-down">{$input.maxlength}</span></span>
+										{if isset($input.maxchar)}
+										<div class="input-group">
+										<span id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}_counter" class="input-group-addon"><span class="text-count-down">{$input.maxchar}</span></span>
 										{/if}
 										<input type="text"
 											name="{$input.name}"
 											id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
 											value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
 											class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
-											{if isset($input.size)}size="{$input.size}"{/if}
-											{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-											{if isset($input.class)}class="{$input.class}"{/if}
-											{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-											{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
-											{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
+											{if isset($input.size)} size="{$input.size}"{/if}
+											{if isset($input.maxchar)} data-maxchar="{$input.maxchar}"{/if}
+											{if isset($input.maxlength)} maxlength="{$input.maxlength}"{/if}
+											{if isset($input.class)} class="{$input.class}"{/if}
+											{if isset($input.readonly) && $input.readonly} readonly="readonly"{/if}
+											{if isset($input.disabled) && $input.disabled} disabled="disabled"{/if}
+											{if isset($input.autocomplete) && !$input.autocomplete} autocomplete="off"{/if} />
 										{if isset($input.suffix)}{$input.suffix}{/if}
+										{if isset($input.maxchar)}
+										</div>
+										{/if}
 										{if !empty($input.desc)}
 										<div class="alert alert-info">
 										{if is_array($input.desc)}
@@ -195,10 +207,10 @@
 										{/if}
 										</div>
 										{/if}
-										{if isset($input.maxlength)}
+										{if isset($input.maxchar)}
 										<script type="text/javascript">
 										function countDown($source, $target) {
-											var max = $source.attr("maxlength");
+											var max = $source.attr("data-maxchar");
 											$target.html(max-$source.val().length);
 
 											$source.keyup(function(){
@@ -282,7 +294,7 @@
 									{/if}
 								{elseif $input.type == 'radio'}
 									{foreach $input.values as $value}
-										
+
 										<div class="radio {if isset($input.class)}"{$input.class}"{/if}">
 											<label>
 											<input type="radio"	name="{$input.name}"id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
@@ -336,7 +348,7 @@
 									{if isset($input.lang) AND $input.lang}
 									{foreach $languages as $language}
 									<div class="row translatable-field lang-{$language.id_lang}"  {if $language.id_lang != $defaultFormLanguage}style="display:none;"{/if}>
-										<div class="col-lg-10">
+										<div class="col-lg-9">
 											<textarea name="{$input.name}_{$language.id_lang}" class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}" >{$fields_value[$input.name][$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
 										</div>
 										<div class="col-lg-2">
@@ -475,7 +487,7 @@
 								{elseif $input.type == 'date'}
 									<div class="row">
 										<div class="input-group col-lg-4">
-											<input 
+											<input
 												id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
 												type="text"
 												data-hex="true"
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index df2db2a44..7a5a8d490 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -85,7 +85,7 @@
 									{/if}
 								{/block}
 								{block name="field"}
-									
+
 								{block name="input"}
 									{if $field['type'] == 'select'}
 										<div class="col-lg-9">
@@ -186,16 +186,18 @@
 									{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'}
 
 										{if $field['type'] == 'textLang'}
-											<div class="col-lg-9">
+											<div class="col-lg-12">
 												<div class="row">
 												{foreach $field['languages'] AS $id_lang => $value}
-													<div class="input-group col-lg-12 translatable-field lang-{$id_lang}" {if $id_lang != $current_id_lang}style="display:none;"{/if}>
-														<input type="text"
-															name="{$key}_{$id_lang}"
-															value="{$value|escape:'htmlall':'UTF-8'}"
-															{if isset($input.class)}class="{$input.class}"{/if}
-														/>
-														<div class="input-group-btn">
+													<div class="translatable-field lang-{$id_lang}" {if $id_lang != $current_id_lang}style="display:none;"{/if}>
+														<div class="col-lg-9">
+															<input type="text"
+																name="{$key}_{$id_lang}"
+																value="{$value|escape:'htmlall':'UTF-8'}"
+																{if isset($input.class)}class="{$input.class}"{/if}
+															/>
+														</div>
+														<div class="col-lg-2">
 															<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 																<img src="{$base_url}/img/l/{$id_lang|intval}.jpg" alt="">
 																<!-- name -->
@@ -218,10 +220,9 @@
 											<div class="col-lg-9">
 												{foreach $field['languages'] AS $id_lang => $value}
 													<div class="row translatable-field lang-{$id_lang}" {if $id_lang != $current_id_lang}style="display:none;"{/if}>
-														<div id="{$key}_{$id_lang}" class="col-lg-10" >
+														<div id="{$key}_{$id_lang}" class="col-lg-9" >
 															<textarea class="textarea-autosize" name="{$key}_{$id_lang}">{$value|replace:'\r\n':"\n"}</textarea>
 														</div>
-
 														<div class="input-group-btn col-lg-2">
 															<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 																<img src="{$base_url}/img/l/{$id_lang|intval}.jpg" alt="">
@@ -236,7 +237,7 @@
 																{/foreach}
 															</ul>
 														</div>
-														
+
 													</div>
 												{/foreach}
 												<script type="text/javascript">
@@ -248,7 +249,7 @@
 
 										{elseif $field['type'] == 'selectLang'}
 											{foreach $languages as $language}
-											
+
 												<div id="{$key}_{$language.id_lang}" style="display: {if $language.id_lang == $current_id_lang}block{else}none{/if};" class="col-lg-9">
 													<select name="{$key}_{$language.iso_code|upper}">
 														{foreach $field['list'] AS $k => $v}
@@ -262,7 +263,7 @@
 											{/foreach}
 										{/if}
 
-<!-- 
+<!--
 {if count($languages) > 1}
 	<div class="displayed_flag">
 		<img src="../img/l/{$current_id_lang}.jpg" class="pointer" id="language_current_{$key}" onclick="toggleLanguageFlags(this);" />