dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix product edition textarea rte

Browse Source 
// 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
This commit is contained in:
mMarinetti
2011-11-20 23:06:45 +00:00
parent 9e8d16ad6a
commit 08a389a760
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/helper/form/form.tpl
+3 -2
View File
@@ -317,7 +317,7 @@
<script type="text/javascript"> <script type="text/javascript">
var iso = '{$iso}'; var iso = '{$iso}';
var pathCSS = '{$path_css}'; var pathCSS = '{$smarty.const._THEME_CSS_DIR_}';
var ad = '{$ad}'; var ad = '{$ad}';
$(document).ready(function(){ $(document).ready(function(){
@@ -325,7 +325,8 @@
tinySetup(); tinySetup();
{block name="autoload_tinyMCE"} {block name="autoload_tinyMCE"}
$(".autoload_rte").click(function(e){ // change each by click to load only on click
$(".autoload_rte").each(function(e){
tinySetup({ tinySetup({
mode :"exact", mode :"exact",
editor_selector :"autoload_rte", editor_selector :"autoload_rte",
admin-dev/themes/template/products/textarea_lang.tpl
+2 -3
View File
@@ -2,9 +2,8 @@
{foreach from=$languages item=language} {foreach from=$languages item=language}
<div class="lang_{$language.id_lang}" style="{if !$language.is_default}display:none;{/if}float: left;"> <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}" <textarea cols="100" rows="10" type="text" id="{$input_name}_{$language.id_lang}"
name="{$input_name}_{$language.id_lang}" class="autoload_rte" > name="{$input_name}_{$language.id_lang}"
{$input_value[$language.id_lang]|htmlentitiesUTF8} class="autoload_rte" >{$input_value[$language.id_lang]|htmlentitiesUTF8}</textarea>
</textarea>
<span class="hint" name="help_box">{$hint|default:''}<span class="hint-pointer">&nbsp;</span></span> <span class="hint" name="help_box">{$hint|default:''}<span class="hint-pointer">&nbsp;</span></span>
</div> </div>
{/foreach} {/foreach}
classes/AdminController.php
+5 -1
View File
@@ -1473,7 +1473,11 @@ class AdminControllerCore extends Controller
{ {
$iso = Context::getContext()->language->iso_code; $iso = Context::getContext()->language->iso_code;
include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'); 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); $class = strtolower($class);
controllers/admin/AdminProductsController.php
+10 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminProductsController extends AdminController class AdminProductsControllerCore extends AdminController
{ {
protected $max_file_size = 20000000; protected $max_file_size = 20000000;
/** @var integer Max image size for upload /** @var integer Max image size for upload
@@ -2435,7 +2435,16 @@ class AdminProductsController extends AdminController
public function initFormInformations($product, $languages, $defaultLanguage) public function initFormInformations($product, $languages, $defaultLanguage)
{ {
$data = $this->context->smarty->createData(); $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; $currency = $this->context->currency;
$data->assign('languages',$languages); $data->assign('languages',$languages);