// 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

@@ -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",

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}

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);

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);