mirror of
https://github.com/e107inc/e107.git
synced 2025-04-21 13:11:52 +02:00
TinyMce changes. - no longer need to declare the ID of the textarea element. Just include the class e-wysiwyg. eg. <textarea class='e-wysiwyg tbox' ..... />
This commit is contained in:
CaMer0n
parent
747b81c9bf
commit
3368ac6104
@ -9,8 +9,8 @@
|
||||
* Custom Menus/Pages Administration
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_admin/cpage.php,v $
|
||||
* $Revision: 1.15 $
|
||||
* $Date: 2009-07-10 14:25:21 $
|
||||
* $Revision: 1.16 $
|
||||
* $Date: 2009-07-14 11:05:48 $
|
||||
* $Author: e107coders $
|
||||
*
|
||||
*/
|
||||
@ -20,7 +20,6 @@ require_once("../class2.php");
|
||||
if (!getperms("5")) { header("location:".e_BASE."index.php"); exit; }
|
||||
|
||||
$e_sub_cat = 'custom';
|
||||
$e_wysiwyg = "data";
|
||||
|
||||
require_once("auth.php");
|
||||
require_once(e_HANDLER."userclass_class.php");
|
||||
@ -307,7 +306,7 @@ class page
|
||||
require_once(e_HANDLER."ren_help.php");
|
||||
$insertjs = (!e_WYSIWYG)? " rows='15' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);' style='width:95%'": "rows='25' style='width:100%' ";
|
||||
$data = $tp->toForm($data,FALSE,TRUE); // Make sure we convert HTML tags to entities
|
||||
$text .= "<textarea class='tbox' tabindex='".$frm->getNext()."' id='data' name='data' cols='80'{$insertjs}>".(strstr($data, "[img]http") ? $data : str_replace("[img]../", "[img]", $data))."</textarea>";
|
||||
$text .= "<textarea class='e-wysiwyg tbox' tabindex='".$frm->getNext()."' id='data' name='data' cols='80'{$insertjs}>".(strstr($data, "[img]http") ? $data : str_replace("[img]../", "[img]", $data))."</textarea>";
|
||||
|
||||
$text .= "
|
||||
<br />".display_help('cpage-help', 'cpage')."
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
|
||||
| $Revision: 1.32 $
|
||||
| $Date: 2009-07-14 03:16:16 $
|
||||
| $Revision: 1.33 $
|
||||
| $Date: 2009-07-14 11:05:49 $
|
||||
| $Author: e107coders $
|
||||
+---------------------------------------------------------------+
|
||||
*/
|
||||
@ -138,7 +138,7 @@ echo "<!-- *JS* -->\n";
|
||||
|
||||
// Wysiwyg JS support on or off.
|
||||
// your code should run off e_WYSIWYG
|
||||
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") {
|
||||
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html'])) {
|
||||
define("e_WYSIWYG",TRUE);
|
||||
}else{
|
||||
define("e_WYSIWYG",FALSE);
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $
|
||||
| $Revision: 1.13 $
|
||||
| $Date: 2009-02-21 11:55:38 $
|
||||
| $Author: e107steved $
|
||||
| $Revision: 1.14 $
|
||||
| $Date: 2009-07-14 11:05:49 $
|
||||
| $Author: e107coders $
|
||||
|
|
||||
| Work in progress - supplementary mailer plugin
|
||||
|
|
||||
@ -52,10 +52,7 @@ Each mailout task is implemented as a class, which must include a number of mand
|
||||
|
||||
require_once("../class2.php");
|
||||
$e_sub_cat = 'mail';
|
||||
if (!isset($_POST['submit']))
|
||||
{
|
||||
$e_wysiwyg = "email_body";
|
||||
}
|
||||
|
||||
set_time_limit(180);
|
||||
session_write_close();
|
||||
require_once(e_ADMIN."auth.php");
|
||||
@ -961,7 +958,7 @@ function show_mailform($foo="")
|
||||
|
||||
<tr>
|
||||
<td colspan='2' class='forumheader3'>
|
||||
<textarea rows='10' cols='20' id='email_body' name='email_body' class='tbox' style='width:100%;height:200px' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".$email_body."</textarea>
|
||||
<textarea rows='10' cols='20' id='email_body' name='email_body' class='e-wysiwyg tbox' style='width:100%;height:200px' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".$email_body."</textarea>
|
||||
</td>
|
||||
</tr>";
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_admin/menus.php,v $
|
||||
| $Revision: 1.27 $
|
||||
| $Date: 2009-07-12 10:11:34 $
|
||||
| $Revision: 1.28 $
|
||||
| $Date: 2009-07-14 11:05:49 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -312,6 +312,8 @@ class menuManager{
|
||||
{
|
||||
global $pref,$sql,$admin_log,$ns;
|
||||
|
||||
$menu_act = "";
|
||||
|
||||
if (isset($_POST['menuAct']))
|
||||
{
|
||||
foreach ($_POST['menuAct'] as $k => $v)
|
||||
@ -324,21 +326,6 @@ class menuManager{
|
||||
}
|
||||
}
|
||||
|
||||
if ($menu_act == 'config')
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if ($menu_act == "adv")
|
||||
{
|
||||
// $this->menuVisibilityOptions();
|
||||
}
|
||||
|
||||
if ($menu_act == "move")
|
||||
{
|
||||
@ -778,7 +765,7 @@ class menuManager{
|
||||
$text .= "<div class='portal-column' id='portal-column-block-list' style='border:1px solid silver'>\n";
|
||||
}
|
||||
|
||||
|
||||
$color = "";
|
||||
while ($row = $sql->db_Fetch())
|
||||
{
|
||||
$pdeta = "";
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
* News Administration
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
|
||||
* $Revision: 1.42 $
|
||||
* $Date: 2009-07-04 13:36:15 $
|
||||
* $Revision: 1.43 $
|
||||
* $Date: 2009-07-14 11:05:50 $
|
||||
* $Author: e107coders $
|
||||
*/
|
||||
require_once("../class2.php");
|
||||
@ -123,7 +123,6 @@ function headerjs()
|
||||
return $ret;
|
||||
}
|
||||
$e_sub_cat = 'news';
|
||||
$e_wysiwyg = 'data,news_extended';
|
||||
|
||||
require_once('auth.php');
|
||||
require_once (e_HANDLER.'message_handler.php');
|
||||
@ -163,6 +162,8 @@ class admin_newspost
|
||||
var $_cal = array();
|
||||
var $_pst;
|
||||
var $_fields;
|
||||
var $_sort_order;
|
||||
var $_sort_link;
|
||||
|
||||
function admin_newspost($qry, $pstobj)
|
||||
{
|
||||
@ -174,8 +175,9 @@ class admin_newspost
|
||||
$this->_pst = &$pstobj;
|
||||
|
||||
$this->_fields = array(
|
||||
"news_id" => array("title" => LAN_NEWS_45, "type"=>"number", "width" => "5%", "thclass" => "center", "url" => e_SELF."?main.news_id.{$sort_link}.".$this->getFrom()),
|
||||
"news_title" => array("title" => NWSLAN_40, "type"=>"text", "width" => "30%", "thclass" => "", "url" => e_SELF."?main.news_title.{$sort_link}.".$this->getFrom()),
|
||||
"checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "url" => ""),
|
||||
"news_id" => array("title" => LAN_NEWS_45, "type"=>"number", "width" => "5%", "thclass" => "center", "url" => e_SELF."?main.news_id.".$this->_sort_link.".".$this->getFrom()),
|
||||
"news_title" => array("title" => NWSLAN_40, "type"=>"text", "width" => "30%", "thclass" => "", "url" => e_SELF."?main.news_title.".$this->_sort_link.".".$this->getFrom()),
|
||||
"news_author" => array("title" => LAN_NEWS_50, "type"=>"user", "width" => "10%", "thclass" => "", "url" => ""),
|
||||
"news_datestamp" => array("title" => LAN_NEWS_32, "type"=>"datestamp", "width" => "15%", "thclass" => "", "url" => ""),
|
||||
"news_category" => array("title" => NWSLAN_6, "type"=>"dropdown", "width" => "auto", "thclass" => "", "url" => ""),
|
||||
@ -197,10 +199,13 @@ class admin_newspost
|
||||
$action = varsettrue($tmp[0], 'main');
|
||||
$sub_action = varset($tmp[1], '');
|
||||
$id = isset($tmp[2]) && is_numeric($tmp[2]) ? intval($tmp[2]) : 0;
|
||||
$sort_order = isset($tmp[2]) && !is_numeric($tmp[2]) ? $tmp[2] : 'desc';
|
||||
$this->_sort_order = isset($tmp[2]) && !is_numeric($tmp[2]) ? $tmp[2] : 'desc';
|
||||
$from = intval(varset($tmp[3],0));
|
||||
unset($tmp);
|
||||
|
||||
if ($this->_sort_order != 'asc') $this->_sort_order = 'desc';
|
||||
$this->_sort_link = ($this->_sort_order) == 'asc' ? 'desc' : 'asc';
|
||||
|
||||
$this->_request = array($action, $sub_action, $id, $sort_order, $from);
|
||||
}
|
||||
|
||||
@ -592,9 +597,9 @@ class admin_newspost
|
||||
require_once(e_HANDLER."form_handler.php");
|
||||
$frm = new e_form(true); //enable inner tabindex counter
|
||||
|
||||
$sort_order = $this->getSortOrder();
|
||||
if ($sort_order != 'asc') $sort_order = 'desc';
|
||||
$sort_link = $sort_order == 'asc' ? 'desc' : 'asc'; // Effectively toggle setting for headings
|
||||
// Effectively toggle setting for headings
|
||||
|
||||
|
||||
$amount = 10;//TODO - pref
|
||||
|
||||
if(!is_array($user_pref['admin_news_columns']))
|
||||
@ -651,7 +656,7 @@ class admin_newspost
|
||||
}
|
||||
else
|
||||
{
|
||||
$query = "ORDER BY ".($this->getSubAction() ? $this->getSubAction() : "news_datestamp")." ".strtoupper($sort_order)." LIMIT ".$this->getFrom().", {$amount}";
|
||||
$query = "ORDER BY ".($this->getSubAction() ? $this->getSubAction() : "news_datestamp")." ".strtoupper($this->_sort_order)." LIMIT ".$this->getFrom().", {$amount}";
|
||||
}
|
||||
|
||||
if ($e107->sql->db_Select('news', '*', $query, ($_POST['searchquery'] ? 0 : "nowhere")))
|
||||
@ -683,6 +688,9 @@ class admin_newspost
|
||||
|
||||
// Below must be in the same order as the field_columns above.
|
||||
|
||||
$rowid = "news_selected[".$row["news_id"]."]";
|
||||
$text .= "<td class='center'>".$frm->checkbox($rowid, $row['news_id'])."</td>\n";
|
||||
|
||||
$text .= (in_array("news_id",$user_pref['admin_news_columns'])) ? "<td class='center'>".$row['news_id']."</td>\n" : "";
|
||||
$text .= (in_array("news_title",$user_pref['admin_news_columns'])) ? "<td><a href='".$e107->url->getUrl('core:news', 'main', "action=item&value1={$row['news_id']}&value2={$row['news_category']}")."'>".($row['news_title'] ? $e107->tp->toHTML($row['news_title'], false,"TITLE") : "[".NWSLAN_42."]")."</a></td> \n" : "";
|
||||
$text .= (in_array("news_author",$user_pref['admin_news_columns'])) ? "<td>".$author['user_name']."</td>\n" : "";
|
||||
@ -720,7 +728,7 @@ class admin_newspost
|
||||
|
||||
if (!varset($_POST['searchquery']))
|
||||
{
|
||||
$parms = $newsposts.",".$amount.",".$this->getFrom().",".e_SELF."?".$this->getAction().'.'.($this->getSubAction() ? $this->getSubAction() : 0).'.'.$sort_order.".[FROM]";
|
||||
$parms = $newsposts.",".$amount.",".$this->getFrom().",".e_SELF."?".$this->getAction().'.'.($this->getSubAction() ? $this->getSubAction() : 0).'.'.$this->_sort_order.".[FROM]";
|
||||
$nextprev = $e107->tp->parseTemplate("{NEXTPREV={$parms}}");
|
||||
if ($nextprev) $text .= "<div class='nextprev-bar'>".$nextprev."</div>";
|
||||
|
||||
@ -948,7 +956,7 @@ class admin_newspost
|
||||
// Extended news form textarea
|
||||
// Fixes Firefox issue with hidden wysiwyg textarea.
|
||||
// XXX - WYSIWYG is already plugin, this should go
|
||||
if(defsettrue('e_WYSIWYG')) $ff_expand = "tinyMCE.execCommand('mceResetDesignMode')";
|
||||
// if(defsettrue('e_WYSIWYG')) $ff_expand = "tinyMCE.execCommand('mceResetDesignMode')";
|
||||
$val = (strstr($e107->tp->post_toForm($_POST['news_extended']), "[img]http") ? $e107->tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $e107->tp->post_toForm($_POST['news_extended'])));
|
||||
$text .= "
|
||||
</td>
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_admin/wmessage.php,v $
|
||||
| $Revision: 1.3 $
|
||||
| $Date: 2009-07-10 14:25:22 $
|
||||
| $Revision: 1.4 $
|
||||
| $Date: 2009-07-14 11:05:51 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -23,7 +23,6 @@ if (!getperms("M"))
|
||||
exit;
|
||||
}
|
||||
$e_sub_cat = 'wmessage';
|
||||
$e_wysiwyg = "data";
|
||||
|
||||
require_once(e_HANDLER."preset_class.php");
|
||||
$pst = new e_preset;
|
||||
@ -179,7 +178,7 @@ if ($action == "create" || $action == "edit")
|
||||
$text .= "<tr>
|
||||
<td>".WMLAN_04."</td>
|
||||
<td>
|
||||
<textarea class='tbox' id='data' name='data' cols='70' rows='15' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm($row['gen_chardata'])."</textarea>
|
||||
<textarea class='e-wysiwyg tbox' id='data' name='data' cols='70' rows='15' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm($row['gen_chardata'])."</textarea>
|
||||
<br />";
|
||||
|
||||
$text .= display_help("helpb", "admin");
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id: admin_shortcodes_class.php,v 1.9 2009-07-14 09:53:12 marj_nl_fr Exp $
|
||||
* $Id: admin_shortcodes_class.php,v 1.10 2009-07-14 11:05:51 e107coders Exp $
|
||||
*
|
||||
* Admin shortcode batch - class
|
||||
*/
|
||||
@ -655,7 +655,7 @@ class admin_shortcodes
|
||||
{
|
||||
if(ADMIN && getperms('0'))
|
||||
{
|
||||
global $sql,$pst,$ns,$tp,$e_wysiwyg,$pref;
|
||||
global $sql,$pst,$ns,$tp,$pref;
|
||||
|
||||
if(isset($pst) && $pst->form && $pst->page)
|
||||
{
|
||||
@ -680,7 +680,7 @@ class admin_shortcodes
|
||||
}
|
||||
|
||||
$existing = is_array($pst->id) ? $pst->id[$pid] : $pst->id;
|
||||
$trigger = ($e_wysiwyg && $pref['wysiwyg']) ? 'tinyMCE.triggerSave();' : '';
|
||||
// $trigger = ($e_wysiwyg && $pref['wysiwyg']) ? 'tinyMCE.triggerSave();' : '';
|
||||
|
||||
if (strpos($thispage, $query) !== false)
|
||||
{
|
||||
@ -915,7 +915,7 @@ class admin_shortcodes
|
||||
{
|
||||
/*
|
||||
* e107 website system (c) 2001-2008 Steve Dunstan (e107.org)
|
||||
* $Id: admin_shortcodes_class.php,v 1.9 2009-07-14 09:53:12 marj_nl_fr Exp $
|
||||
* $Id: admin_shortcodes_class.php,v 1.10 2009-07-14 11:05:51 e107coders Exp $
|
||||
*/
|
||||
|
||||
if (ADMIN)
|
||||
@ -1182,8 +1182,7 @@ class admin_shortcodes
|
||||
$id = 'plugnav-'.$row['plugin_path'];
|
||||
|
||||
|
||||
|
||||
$tmp[$id]['text'] = $e107->tp->toHTML($plug_vars['@attributes']['name'], FALSE, "defs");
|
||||
$tmp[$id]['text'] = $e107->tp->toHTML($plug_vars['@attributes']['name'], FALSE, "defs");
|
||||
$tmp[$id]['description'] = $plug_vars['description'];
|
||||
$tmp[$id]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plug_vars['administration']['configFile'];
|
||||
$tmp[$id]['image'] = $icon_src ? "<img src='{$icon_src}' alt='{$tmp['text']}' class='icon S16' />" : E_16_PLUGIN;
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/comment_class.php,v $
|
||||
| $Revision: 1.20 $
|
||||
| $Date: 2009-07-07 06:50:55 $
|
||||
| $Revision: 1.21 $
|
||||
| $Date: 2009-07-14 11:05:52 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -145,7 +145,7 @@ class comment {
|
||||
$text .= "<tr>\n<td style='width:20%; vertical-align:top;'>".COMLAN_16."</td>\n<td style='width:80%'>\n<input class='tbox comment author' type='text' name='author_name' size='61' value='{$author_name}' maxlength='100' />\n</td>\n</tr>";
|
||||
}
|
||||
$text .= $rate."<tr> \n
|
||||
<td style='width:20%; vertical-align:top;'>".COMLAN_8.":</td>\n<td id='commentform' style='width:80%;'>\n<textarea class='tbox comment' id='comment' name='comment' cols='62' rows='7' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>$comval</textarea>\n<br />
|
||||
<td style='width:20%; vertical-align:top;'>".COMLAN_8.":</td>\n<td id='commentform' style='width:80%;'>\n<textarea class='e-wysiwyg tbox comment' id='comment' name='comment' cols='62' rows='7' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>$comval</textarea>\n<br />
|
||||
".display_help('helpb',"comment")."</td></tr>\n<tr style='vertical-align:top'> \n<td style='width:20%'>".$text2."</td>\n
|
||||
<td id='commentformbutton' style='width:80%;'>\n
|
||||
". (isset($action) && $action == "reply" ? "<input type='hidden' name='pid' value='{$id}' />" : '').(isset($eaction) && $eaction == "edit" ? "<input type='hidden' name='editpid' value='{$id}' />" : "").(isset($content_type) && $content_type ? "<input type='hidden' name='content_type' value='{$content_type}' />" : ''). "<input class='button' type='submit' name='".$action."submit' value='".(isset($eaction) && $eaction == "edit" ? COMLAN_320 : COMLAN_9)."' />\n</td>\n</tr>\n</table>\n</form></div>";
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
* Form Handler
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
|
||||
* $Revision: 1.31 $
|
||||
* $Date: 2009-07-14 03:18:16 $
|
||||
* $Revision: 1.32 $
|
||||
* $Date: 2009-07-14 11:05:52 $
|
||||
* $Author: e107coders $
|
||||
*
|
||||
*/
|
||||
@ -127,7 +127,7 @@ class e_form
|
||||
|
||||
function bbarea($name, $value, $help_mod = '', $help_tagid='')
|
||||
{
|
||||
$options = array('class' => 'tbox large');
|
||||
$options = array('class' => 'tbox large e-wysiwyg');
|
||||
if(!defsettrue('e_WYSIWYG'))
|
||||
{
|
||||
require_once(e_HANDLER."ren_help.php");
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* $Id: lan_admin.php,v 1.19 2009-07-09 11:37:36 e107coders Exp $
|
||||
* $Id: lan_admin.php,v 1.20 2009-07-14 11:05:52 e107coders Exp $
|
||||
*
|
||||
* Admin Language File
|
||||
*/
|
||||
@ -235,7 +235,7 @@ define("LAN_TRY_AGAIN","Please try again.");
|
||||
|
||||
define("LAN_RESET","Reset");
|
||||
define("LAN_CLEAR","Clear");
|
||||
define("LAN_OK","OK");
|
||||
// define("LAN_OK","OK"); // defined in e107_languages/English/English.php
|
||||
|
||||
define("LAN_PRESET","Preset");
|
||||
define("LAN_PRESET_SAVED","Preset saved successfully");
|
||||
@ -245,8 +245,8 @@ define("LAN_PRESET_CONFIRMDEL","Are you sure you want to delete this preset?");
|
||||
define("LAN_NOTWRITABLE"," is not writable, you need to CHMOD 777 the file or folder first.");
|
||||
define("LAN_DATE","Date");
|
||||
define("LAN_TIME","Time");
|
||||
define("LAN_YES","Yes");
|
||||
define("LAN_NO","No");
|
||||
// define("LAN_YES","Yes");
|
||||
// define("LAN_NO","No"); // defined in e107_languages/English/English.php
|
||||
define("LAN_EMPTY","There are no entries in the database yet");
|
||||
define("LAN_EXISTING","Existing Entries");
|
||||
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/event.php,v $
|
||||
| $Revision: 1.8 $
|
||||
| $Date: 2009-02-01 20:54:08 $
|
||||
| $Author: e107steved $
|
||||
| $Revision: 1.9 $
|
||||
| $Date: 2009-07-14 11:05:52 $
|
||||
| $Author: e107coders $
|
||||
|
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -58,7 +58,7 @@ if ($cat_filter == -1) $cat_filter = '*';
|
||||
$mult_count = 0;
|
||||
|
||||
|
||||
$e_wysiwyg = $pref['eventpost_editmode'] == 2 ? 'ne_event' : '';
|
||||
// $e_wysiwyg = $pref['eventpost_editmode'] == 2 ? 'ne_event' : '';
|
||||
|
||||
|
||||
// Array links db field names to internal variables
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/chatbox_menu/chatbox_menu.php,v $
|
||||
| $Revision: 1.12 $
|
||||
| $Date: 2008-12-11 21:13:48 $
|
||||
| $Author: e107steved $
|
||||
| $Revision: 1.13 $
|
||||
| $Date: 2009-07-14 11:05:53 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
@ -147,7 +147,7 @@ else
|
||||
$oc = "";
|
||||
}
|
||||
$texta .= "
|
||||
<textarea class='tbox chatbox' id='cmessage' name='cmessage' cols='20' rows='5' style='".($cb_width ? "width:".$cb_width.";" : '')." overflow: auto' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'></textarea>
|
||||
<textarea class='e-wysiwyg tbox chatbox' id='cmessage' name='cmessage' cols='20' rows='5' style='".($cb_width ? "width:".$cb_width.";" : '')." overflow: auto' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'></textarea>
|
||||
<br />
|
||||
<input class='button' type='submit' id='chat_submit' name='chat_submit' value='".CHATBOX_L4."' {$oc}/>
|
||||
<input class='button' type='reset' name='reset' value='".CHATBOX_L5."' />";
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/admin_content_config.php,v $
|
||||
| $Revision: 1.7 $
|
||||
| $Date: 2008-12-29 20:53:24 $
|
||||
| $Author: lisa_ $
|
||||
| $Revision: 1.8 $
|
||||
| $Date: 2009-07-14 11:05:53 $
|
||||
| $Author: e107coders $
|
||||
+---------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
@ -22,7 +22,7 @@ require_once("../../class2.php");
|
||||
|
||||
if(!getperms("P")){header("location:".e_BASE."index.php"); exit; }
|
||||
$e_sub_cat = 'content';
|
||||
$e_wysiwyg = "content_text,cat_text";
|
||||
|
||||
$plugindir = e_PLUGIN."content/";
|
||||
require_once($plugindir."content_shortcodes.php");
|
||||
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/content_manager.php,v $
|
||||
| $Revision: 1.8 $
|
||||
| $Date: 2008-10-07 19:22:20 $
|
||||
| $Author: e107steved $
|
||||
| $Revision: 1.9 $
|
||||
| $Date: 2009-07-14 11:05:53 $
|
||||
| $Author: e107coders $
|
||||
+---------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
@ -63,8 +63,6 @@ if (!USER)
|
||||
// define e_pagetitle
|
||||
$aa -> setPageTitle();
|
||||
|
||||
//these have to be set for the tinymce wysiwyg
|
||||
$e_wysiwyg = "content_text";
|
||||
|
||||
// ##### DB ---------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_post.php,v $
|
||||
| $Revision: 1.35 $
|
||||
| $Date: 2009-01-25 19:19:36 $
|
||||
| $Author: mcfly_e107 $
|
||||
| $Revision: 1.36 $
|
||||
| $Date: 2009-07-14 11:05:53 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
require_once('../../class2.php');
|
||||
$e_wysiwyg = 'post';
|
||||
|
||||
$lan_file = e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_post.php';
|
||||
include(file_exists($lan_file) ? $lan_file : e_PLUGIN.'forum/languages/English/lan_forum_post.php');
|
||||
|
||||
|
||||
@ -78,7 +78,7 @@ class forum_post_shortcodes
|
||||
{
|
||||
global $post, $pref;
|
||||
$rows = (e_WYSIWYG) ? 15 : 10;
|
||||
$ret = "<textarea class='tbox' id='post' name='post' cols='70' rows='{$rows}' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>$post</textarea>\n<br />\n";
|
||||
$ret = "<textarea class='e-wysiwyg tbox' id='post' name='post' cols='70' rows='{$rows}' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>$post</textarea>\n<br />\n";
|
||||
if(!e_WYSIWYG)
|
||||
{
|
||||
$ret .= display_help('helpb', 'forum');
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
* Plugin Administration - gsitemap
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_plugins/tinymce/admin_config.php,v $
|
||||
* $Revision: 1.4 $
|
||||
* $Date: 2009-07-10 14:25:23 $
|
||||
* $Revision: 1.5 $
|
||||
* $Date: 2009-07-14 11:05:54 $
|
||||
* $Author: e107coders $
|
||||
*
|
||||
*/
|
||||
@ -21,7 +21,7 @@ if(!getperms("P") || !plugInstalled('tinymce'))
|
||||
exit();
|
||||
}
|
||||
|
||||
$e_wysiwyg = 'content';
|
||||
|
||||
require_once (e_HANDLER.'message_handler.php');
|
||||
$emessage = &eMessage::getInstance();
|
||||
|
||||
@ -91,7 +91,7 @@ if($_POST['save_settings']) // is there an if $emessage? $emessage->hasMessage
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<textarea id='content' rows='10' cols='10' name='name3' class='tbox' style='width:80%'> </textarea>
|
||||
<textarea id='content' class='e-wysiwyg tbox' rows='10' cols='10' name='name3' style='width:80%'> </textarea>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
@ -4,14 +4,15 @@
|
||||
| e107 website system - Tiny MCE controller file.
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/tinymce/wysiwyg.php,v $
|
||||
| $Revision: 1.11 $
|
||||
| $Date: 2009-07-02 00:13:12 $
|
||||
| $Revision: 1.12 $
|
||||
| $Date: 2009-07-14 11:05:54 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
function wysiwyg($formids)
|
||||
{
|
||||
|
||||
global $pref,$HANDLERS_DIRECTORY,$PLUGINS_DIRECTORY,$IMAGES_DIRECTORY;
|
||||
$lang = e_LANGUAGE;
|
||||
$tinylang = array(
|
||||
@ -51,9 +52,12 @@ function start_tinyMce() {
|
||||
tinyMCE.init({\n";
|
||||
|
||||
$text .= "language : '".$tinylang[$lang]."',\n";
|
||||
$text .= "mode : 'exact',\n";
|
||||
$text .= "elements : '".$formids."',\n";
|
||||
$text .= "mode : 'textareas',\n";
|
||||
// $text .= "elements : '".$formids."',\n";
|
||||
$text .= "editor_selector : 'e-wysiwyg',\n";
|
||||
$text .= "editor_deselector : 'e-wysiwyg-off',\n";
|
||||
$text .= "theme : 'advanced'\n";
|
||||
|
||||
// $text .= ",plugins : 'table,contextmenu";
|
||||
|
||||
$admin_only = array("ibrowser","code");
|
||||
@ -104,13 +108,11 @@ theme_advanced_buttons1 : '".$pref['tinymce']['theme_advanced_buttons1']."',
|
||||
theme_advanced_buttons2 : '".$pref['tinymce']['theme_advanced_buttons2']."',
|
||||
theme_advanced_buttons3 : '".$pref['tinymce']['theme_advanced_buttons3']."',
|
||||
theme_advanced_buttons4 : '".$pref['tinymce']['theme_advanced_buttons4']."',
|
||||
theme_advanced_toolbar_location : \"top\",
|
||||
theme_advanced_toolbar_location : \"bottom\",
|
||||
theme_advanced_toolbar_align : \"left\",
|
||||
theme_advanced_statusbar_location : \"bottom\",
|
||||
theme_advanced_resizing : true\n";
|
||||
|
||||
|
||||
$text .= ",theme_advanced_toolbar_location : 'top'";
|
||||
$text .= ",extended_valid_elements : 'p[style],a[name|href|target|rel|title|style|class],img[class|src|style|alt|title|name],hr[class],span[align|class|style],div[align|class|style|height|width] ,table[class|style|cellpadding|cellspacing|background|height|width],td[background|style|class|valign|align|height|width]'";
|
||||
$text .= ",invalid_elements: 'p,font,align,script,applet,iframe'\n";
|
||||
$text .= ",auto_cleanup_word: true\n";
|
||||
@ -160,7 +162,7 @@ function tinymce_html_bbcode_control(type, source) {
|
||||
";
|
||||
if(in_array("bbcode",$pref['tinymce']['plugins']))
|
||||
{
|
||||
$text .= " return source; ";
|
||||
// $text .= " return source; ";
|
||||
}
|
||||
|
||||
$text .= "
|
||||
|
||||
@ -6,9 +6,9 @@
|
||||
| Released under the terms and conditions of the GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
|
||||
| $Revision: 1.35 $
|
||||
| $Date: 2009-07-13 10:17:09 $
|
||||
| $Author: marj_nl_fr $
|
||||
| $Revision: 1.36 $
|
||||
| $Date: 2009-07-14 11:05:54 $
|
||||
| $Author: e107coders $
|
||||
+-----------------------------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
@ -94,7 +94,7 @@ echo "<title>".(defined('e_PAGETITLE') ? e_PAGETITLE.' - ' : (defined('PAGE_NAME
|
||||
|
||||
|
||||
// Wysiwyg JS support on or off.
|
||||
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "")
|
||||
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']))
|
||||
{
|
||||
define("e_WYSIWYG",TRUE);
|
||||
}
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/submitnews.php,v $
|
||||
| $Revision: 1.10 $
|
||||
| $Date: 2009-07-14 05:31:57 $
|
||||
| $Revision: 1.11 $
|
||||
| $Date: 2009-07-14 11:05:54 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
require_once("class2.php");
|
||||
$e_wysiwyg = varsettrue($pref['subnews_htmlarea']) ? "submitnews_item" : "";
|
||||
|
||||
require_once(HEADERF);
|
||||
|
||||
if (!isset($pref['subnews_class']))
|
||||
@ -201,7 +201,7 @@ $text .= "
|
||||
<tr>
|
||||
<td style='width:20%' class='forumheader3'>".LAN_135."</td>
|
||||
<td style='width:80%' class='forumheader3'>
|
||||
<textarea class='tbox' id='submitnews_item' name='submitnews_item' cols='80' style='max-width:95%' {$insertjs}>".$tp->toHTML($_POST['submitnews_item'],TRUE,'USER_BODY')."</textarea><br />";
|
||||
<textarea class='e-wysiwyg tbox' id='submitnews_item' name='submitnews_item' cols='80' style='max-width:95%' {$insertjs}>".$tp->toHTML($_POST['submitnews_item'],TRUE,'USER_BODY')."</textarea><br />";
|
||||
|
||||
if (!e_WYSIWYG)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user