From 08a389a760fa11465e9558b4e8ef699c4a6828cf Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Sun, 20 Nov 2011 23:06:45 +0000
Subject: [PATCH] // fix product edition textarea rte // minor fix warning if
 admin translation file doesnt exists

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10304 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/helper/form/form.tpl       |  5 +++--
 admin-dev/themes/template/products/textarea_lang.tpl |  5 ++---
 classes/AdminController.php                          |  6 +++++-
 controllers/admin/AdminProductsController.php        | 11 ++++++++++-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/admin-dev/themes/template/helper/form/form.tpl b/admin-dev/themes/template/helper/form/form.tpl
index 1a39e617f..76befe06b 100644
--- a/admin-dev/themes/template/helper/form/form.tpl
+++ b/admin-dev/themes/template/helper/form/form.tpl
@@ -317,7 +317,7 @@
 	<script type="text/javascript">
 	
 	var iso = '{$iso}';
-	var pathCSS = '{$path_css}';
+	var pathCSS = '{$smarty.const._THEME_CSS_DIR_}';
 	var ad = '{$ad}';
 	
 	$(document).ready(function(){
@@ -325,7 +325,8 @@
 		tinySetup();
 	
 		{block name="autoload_tinyMCE"}
-			$(".autoload_rte").click(function(e){
+			// change each by click to load only on click
+			$(".autoload_rte").each(function(e){
 				tinySetup({
 					mode :"exact",
 					editor_selector :"autoload_rte",
diff --git a/admin-dev/themes/template/products/textarea_lang.tpl b/admin-dev/themes/template/products/textarea_lang.tpl
index 399e975dc..154bf811a 100644
--- a/admin-dev/themes/template/products/textarea_lang.tpl
+++ b/admin-dev/themes/template/products/textarea_lang.tpl
@@ -2,9 +2,8 @@
 {foreach from=$languages item=language}
 <div class="lang_{$language.id_lang}" style="{if !$language.is_default}display:none;{/if}float: left;">
 	<textarea cols="100" rows="10" type="text" id="{$input_name}_{$language.id_lang}" 
-	name="{$input_name}_{$language.id_lang}" class="autoload_rte" >
-		{$input_value[$language.id_lang]|htmlentitiesUTF8}
-		 </textarea>
+	name="{$input_name}_{$language.id_lang}" 
+	class="autoload_rte" >{$input_value[$language.id_lang]|htmlentitiesUTF8}</textarea>
 	<span class="hint" name="help_box">{$hint|default:''}<span class="hint-pointer">&nbsp;</span></span>
 </div>
 {/foreach}
diff --git a/classes/AdminController.php b/classes/AdminController.php
index 00f7e8d8a..c81f1de62 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1473,7 +1473,11 @@ class AdminControllerCore extends Controller
 		{
 			$iso = Context::getContext()->language->iso_code;
 			include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
-			$_LANGADM = array_change_key_case($_LANGADM);
+			
+			if (isset($_LANGADM))
+				$_LANGADM = array_change_key_case($_LANGADM);
+			else
+				$_LANGADM = array();
 		}
 
 		$class = strtolower($class);
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 99c828c5a..18fe00e42 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-class AdminProductsController extends AdminController
+class AdminProductsControllerCore extends AdminController
 {
 	protected $max_file_size = 20000000;
 	/** @var integer Max image size for upload
@@ -2435,7 +2435,16 @@ class AdminProductsController extends AdminController
 	public function initFormInformations($product, $languages, $defaultLanguage)
 	{
 		$data = $this->context->smarty->createData();
+		
+		// autoload rich text editor (tiny mce)
+		$iso = $this->context->language->iso_code;
+		$this->tpl_form_vars['iso'] = file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en';
+		$this->tpl_form_vars['ad'] = dirname($_SERVER['PHP_SELF']);
+		$this->tpl_form_vars['tinymce'] = true;
+		$this->addJS(_PS_JS_DIR_.'tiny_mce/tiny_mce.js');
+		$this->addJS(_PS_JS_DIR_.'tinymce.inc.js');
 
+		
 		$currency = $this->context->currency;
 
 		$data->assign('languages',$languages);