[-] MO : Fix bug #PSCFV-7822 could not load tinymce in referral program

This commit is contained in:
gRoussac committed 2013-03-01 17:16:42 +01:00
1 parent d9588e0924
commit e9d759ae03
2 files changed
+55 -18

No files matched your search

@@ -26,11 +26,11 @@
<div class="translatable"> <div class="translatable">
{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" id="{$input_name}_{$language.id_lang}"
name="{$input_name}_{$language.id_lang}" name="{$input_name}_{$language.id_lang}"
class="autoload_rte" >{if isset($input_value[$language.id_lang])}{$input_value[$language.id_lang]|htmlentitiesUTF8}{/if}</textarea> class="autoload_rte" >{if isset($input_value[$language.id_lang])}{$input_value[$language.id_lang]|htmlentitiesUTF8}{/if}</textarea>
<span class="counter" max="{if isset($max)}{$max}{else}none{/if}"></span> <span class="counter" max="{if isset($max)}{$max}{else}none{/if}"></span>
<span class="hint" name="help_box">{$hint|default:''}<span class="hint-pointer">&nbsp;</span></span> <span class="hint">{$hint|default:''}<span class="hint-pointer">&nbsp;</span></span>
</div> </div>
{/foreach} {/foreach}
</div> </div>
+53 -16
View File
@@ -294,8 +294,8 @@ class ReferralProgram extends Module
foreach ($languages AS $language) foreach ($languages AS $language)
$this->_html .= ' $this->_html .= '
<div id="dd_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left; margin-left: 4px;"> <div class="lang_'.(int)$language['id_lang'].'" id="dd_'.(int)$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left; margin-left: 4px;">
<input type="text" name="discount_description['.$language['id_lang'].']" id="discount_description['.$language['id_lang'].']" value="'.(isset($_POST['discount_description'][(int)($language['id_lang'])]) ? $_POST['discount_description'][(int)($language['id_lang'])] : $this->_configuration['REFERRAL_DISCOUNT_DESCRIPTION'][(int)($language['id_lang'])]).'" style="width: 200px;" /> <input type="text" name="discount_description['.(int)$language['id_lang'].']" id="discount_description['.$language['id_lang'].']" value="'.(isset($_POST['discount_description'][(int)($language['id_lang'])]) ? $_POST['discount_description'][(int)($language['id_lang'])] : $this->_configuration['REFERRAL_DISCOUNT_DESCRIPTION'][(int)($language['id_lang'])]).'" style="width: 200px;" />
</div>'; </div>';
$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'dd', true); $this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'dd', true);
$this->_html .= ' $this->_html .= '
@@ -308,7 +308,7 @@ class ReferralProgram extends Module
private function _displayFormRules() private function _displayFormRules()
{ {
// Languages preliminaries // Languages preliminaries
$languages = Language::getLanguages(); $languages = Language::getLanguages(false);
$iso = $this->context->language->iso_code; $iso = $this->context->language->iso_code;
$divLangName = 'cpara¤dd'; $divLangName = 'cpara¤dd';
@@ -319,30 +319,67 @@ class ReferralProgram extends Module
$this->_html .= $this->displayError($this->l('Your text is empty.')); $this->_html .= $this->displayError($this->l('Your text is empty.'));
// TinyMCE // TinyMCE
$isoTinyMCE = (file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en'); if (version_compare(_PS_VERSION_, '1.4.0.0') >= 0)
$ad = dirname($_SERVER["PHP_SELF"]); $this->_html .= '
$this->_html .= ' <script type="text/javascript">
<script type="text/javascript"> var iso = \''.(file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en').'\' ;
var iso = \''.$isoTinyMCE.'\' ; var pathCSS = \''._THEME_CSS_DIR_.'\' ;
var pathCSS = \''._THEME_CSS_DIR_.'\' ; var ad = \''.dirname($_SERVER['PHP_SELF']).'\' ;
var ad = \''.$ad.'\' ;
</script> </script>
<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tiny_mce/tiny_mce.js"></script> <script type="text/javascript" src="'.__PS_BASE_URI__.'js/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tinymce.inc.js"></script> <script type="text/javascript" src="'.__PS_BASE_URI__.'js/tinymce.inc.js"></script>
<script language="javascript" type="text/javascript">id_language = Number('.$this->context->language->id.');</script> <script language="javascript" type="text/javascript">
<form method="post" action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" enctype="multipart/form-data"> id_language = Number('.(int)$this->context->language->id.');
tinySetup();
</script>';
else
{
$this->_html .= '
<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript">
tinyMCE.init({
mode : "textareas",
theme : "advanced",
plugins : "safari,pagebreak,style,layer,table,advimage,advlink,inlinepopups,media,searchreplace,contextmenu,paste,directionality,fullscreen",
theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,,|,forecolor,backcolor",
theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,media,|,ltr,rtl,|,fullscreen",
theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,pagebreak",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : false,
content_css : "'.__PS_BASE_URI__.'themes/'._THEME_NAME_.'/css/global.css",
document_base_url : "'.__PS_BASE_URI__.'",
width: "600",
height: "auto",
font_size_style_values : "8pt, 10pt, 12pt, 14pt, 18pt, 24pt, 36pt",
template_external_list_url : "lists/template_list.js",
external_link_list_url : "lists/link_list.js",
external_image_list_url : "lists/image_list.js",
media_external_list_url : "lists/media_list.js",
elements : "nourlconvert",
entity_encoding: "raw",
convert_urls : false,
language : "'.(file_exists(_PS_ROOT_DIR_.'/js/tinymce/jscripts/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en').'"
});
id_language = Number('.(int)$this->context->language->id.');
</script>';
}
$this->_html .= '<form method="post" action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" enctype="multipart/form-data">
<fieldset> <fieldset>
<legend><img src="'.$this->_path.'logo.gif" alt="" title="" /> '.$this->l('Conditions of the referral program').'</legend>'; <legend><img src="'.$this->_path.'logo.gif" alt="" title="" /> '.$this->l('Conditions of the referral program').'</legend>
<div class="translatable">';
foreach ($languages AS $language) foreach ($languages AS $language)
{ {
$this->_html .= ' $this->_html .= '
<div id="cpara_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->context->language->id ? 'block' : 'none').';float: left;"> <div class="lang_'.(int)$language['id_lang'].'" id="cpara_'.(int)$language['id_lang'].'" style="display: '.($language['id_lang'] == (int)$this->context->language->id ? 'block' : 'none').';float: left;">
<textarea class="rte" cols="120" rows="25" id="body_paragraph_'.$language['id_lang'].'" name="body_paragraph_'.$language['id_lang'].'">'.($xml ? stripslashes(htmlspecialchars($xml->body->{'paragraph_'.$language['id_lang']})) : '').'</textarea> <textarea class="rte" cols="120" rows="25" id="body_paragraph_'.(int)$language['id_lang'].'" name="body_paragraph_'.(int)$language['id_lang'].'">'.($xml ? stripslashes(htmlspecialchars($xml->body->{'paragraph_'.(int)$language['id_lang']})) : '').'</textarea>
</div>'; </div>';
} }
$this->_html .= $this->displayFlags($languages, $this->context->language->id, $divLangName, 'cpara', true); $this->_html .= $this->displayFlags($languages, $this->context->language->id, $divLangName, 'cpara', true);
$this->_html .= ' $this->_html .= '</div>
<div class="clear center"><input type="submit" name="submitText" value="'.$this->l('Update text').'" class="button" style="margin-top: 10px" /></div> <div class="clear center"><input type="submit" name="submitText" value="'.$this->l('Update text').'" class="button" style="margin-top: 10px" /></div>
</fieldset> </fieldset>
</form>'; </form>';