From c899a277cc858ca89ab6fd3e20cada92f7b4971d Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Wed, 7 Mar 2012 16:35:29 +0000
Subject: [PATCH] // Fix translation pack fetching in AdminLanguages form

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13938 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../controllers/languages/helpers/form/form.tpl        | 10 +++++++---
 controllers/admin/AdminLanguagesController.php         |  6 +++---
 css/admin.css                                          |  2 +-
 js/checkLangPack.js                                    |  6 +++++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
index 1c3d1bf46..597b18cc2 100644
--- a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
@@ -25,10 +25,14 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="start_field_block"}
-	<div class="margin-form">
+{block name="input_block"}
 	{if $input.type == 'special'}
-		<p id="{$input.name}"><img src="../img/admin/{$input.img}" alt="" /> {$input.text}</p>
+		<div id="#resultCheckLangPack">
+			<p id="lang_pack_loading" style="display:none"><img src="../img/admin/{$input.img}" alt="" /> {$input.text}</p>
+			<p id="lang_pack_msg" style="display:none"></p>
+		</div>
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 
diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php
index a540da2a3..a7019b2f2 100644
--- a/controllers/admin/AdminLanguagesController.php
+++ b/controllers/admin/AdminLanguagesController.php
@@ -122,7 +122,7 @@ class AdminLanguagesControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('Name:'),
 					'name' => 'name',
-					'size' => 8,
+					'size' => 32,
 					'maxlength' => 32,
 					'required' => true
 				),
@@ -131,7 +131,7 @@ class AdminLanguagesControllerCore extends AdminController
 					'label' => $this->l('ISO code:'),
 					'name' => 'iso_code',
 					'required' => true,
-					'size' => 4,
+					'size' => 2,
 					'maxlength' => 2,
 					'desc' => $this->l('2-letter ISO code (e.g., fr, en, de)')
 				),
@@ -140,7 +140,7 @@ class AdminLanguagesControllerCore extends AdminController
 					'label' => $this->l('Language code:'),
 					'name' => 'language_code',
 					'required' => true,
-					'size' => 10,
+					'size' => 2,
 					'maxlength' => 5,
 					'desc' => $this->l('Full language code (e.g., en-us, pt-br)')
 				),
diff --git a/css/admin.css b/css/admin.css
index b06902626..5d2ff0582 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -983,7 +983,7 @@ p.fail{
 	font-weight:bold;
 	color:red;
 }
-#resultCheckLangPack{
+#lang_pack_msg {
 	border: 1px solid #DFD5C3;
 	padding:10px;
 	margin-bottom:10px;
diff --git a/js/checkLangPack.js b/js/checkLangPack.js
index 86d2b03cc..350e377b3 100644
--- a/js/checkLangPack.js
+++ b/js/checkLangPack.js
@@ -27,6 +27,8 @@
 function checkLangPack(token){
 	if ($('#iso_code').val().length == 2)
 	{
+		$('#lang_pack_loading').show();
+		$('#lang_pack_msg').hide();
 		doAdminAjax(
 			{
 				controller:'AdminLanguages',
@@ -38,6 +40,7 @@ function checkLangPack(token){
 			},
 			function(ret)
 			{
+				$('#lang_pack_loading').hide();
 				ret = $.parseJSON(ret);
 				if( ret.status == 'ok')
 				{
@@ -46,7 +49,8 @@ function checkLangPack(token){
 						+'<br />' + langPackVersion + ' ' + content['version']
 						+ ' <a href="http://www.prestashop.com/download/lang_packs/gzip/' + content['version'] + '/'
 						+ $('#iso_code').val()+'.gzip" target="_blank" class="link">'+download+'</a><br />' + langPackInfo;
-					showSuccessMessage(message);
+					$('#lang_pack_msg').html(message);
+					$('#lang_pack_msg').show();
 				}
 				else
 					showErrorMessage(ret.error);