Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1264) +++ branches/2.8.x/CHANGELOG (revision 1265) @@ -12,6 +12,10 @@ ------------------------------------- 2.8.1 ------------------------------------- 22-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #909 WYSIWYG Editor width destroyes backend layout +! Set EDITOR_WIDTH to 0, This way backend theme developper +! can style the WYSIWYG Editor according to their themes. +22-Jan-2010 Dietmar Woellbrink (Luisehahne) ! Ticket #916 Update backend theme footer 21-Jan-2010 Dietmar Woellbrink (Luisehahne) ! updated YUI 2.4.1 to 2.8.0r4 Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1264) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1265) @@ -55,6 +55,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.1'); -if(!defined('REVISION')) define('REVISION', '1264'); +if(!defined('REVISION')) define('REVISION', '1265'); ?> \ No newline at end of file Index: branches/2.8.x/wb/framework/initialize.php =================================================================== --- branches/2.8.x/wb/framework/initialize.php (revision 1264) +++ branches/2.8.x/wb/framework/initialize.php (revision 1265) @@ -1,28 +1,14 @@ -* Copyright (C) 2009, Website Baker Org. e.V. -* http://start.websitebaker2.org/impressum-datenschutz.php -* Copyright (C) 2004-2009, Ryan Djurovich -* -* About WebsiteBaker -* * Website Baker is a PHP-based Content Management System (CMS) * designed with one goal in mind: to enable its users to produce websites * with ease. * -***************************************************************************** +* LICENSE INFORMATION * -***************************************************************************** -* LICENSE INFORMATION -* * WebsiteBaker is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -36,31 +22,36 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -**************************************************************************** * * WebsiteBaker Extra Information * * -* -* -*****************************************************************************/ +*/ /** * - * @category framework - * @package config - * @author Ryan Djurovich - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2010, Website Baker Org. e.V. - * @version $Id$ - * @platform WebsiteBaker 2.8.x - * @requirements >= PHP 4.3.4 - * @license http://www.gnu.org/licenses/gpl.html + * @category framework + * @package initialize + * @author Ryan Djurovich + * @copyright 2004-2009, Ryan Djurovich + * @copyright 2009-2010, Website Baker Org. e.V. + * @filesource $HeadURL$ + * @author Ryan Djurovich + * @copyright 2004-2009, Ryan Djurovich * + * @author WebsiteBaker Project + * @link http://www.websitebaker2.org/ + * @copyright 2009-2010, Website Baker Org. e.V. + * @link http://start.websitebaker2.org/impressum-datenschutz.php + * @license http://www.gnu.org/licenses/gpl.html + * @version $Id$ + * @platform WebsiteBaker 2.8.x + * @requirements PHP 4.3.4 and higher + * @lastmodified $Date$ + * */ //set_include_path(get_include_path() . PATH_SEPARATOR . WB_PATH); - if (file_exists(WB_PATH.'/framework/class.database.php')) { require_once(WB_PATH.'/framework/class.database.php'); @@ -168,7 +159,7 @@ // extended wb_settings define('EDIT_ONE_SECTION', true); - define('EDITOR_WIDTH', 925); // no prozent + define('EDITOR_WIDTH', 0); } Property changes on: branches/2.8.x/wb/framework/initialize.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/wysiwyg/modify.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/modify.php (revision 1264) +++ branches/2.8.x/wb/modules/wysiwyg/modify.php (revision 1265) @@ -1,78 +1,105 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -if(!defined('WB_PATH')) exit('Direct access to this file is not allowed'); - -// Get page content -$query = "SELECT content FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'"; -$get_content = $database->query($query); -$content = $get_content->fetchRow(); -$content = (htmlspecialchars($content['content'])); - -if(!isset($wysiwyg_editor_loaded)) { - $wysiwyg_editor_loaded=true; - - if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) { - function show_wysiwyg_editor($name,$id,$content,$width,$height) { - echo ''; - } - } else { - $id_list=array(); - $query_wysiwyg = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'wysiwyg'"); - if($query_wysiwyg->numRows() > 0) { - while($wysiwyg_section = $query_wysiwyg->fetchRow()) { - $entry='content'.$wysiwyg_section['section_id']; - array_push($id_list,$entry); - } - require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'); - } - } -} - -?> - -
- - - - - - - - - - - -
- - - -
- -
- +query($query); +$content = $get_content->fetchRow(); +$content = (htmlspecialchars($content['content'])); + +if(!isset($wysiwyg_editor_loaded)) { + $wysiwyg_editor_loaded=true; + + if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) { + function show_wysiwyg_editor($name,$id,$content,$width,$height) { + echo ''; + } + } else { + $id_list=array(); + $query_wysiwyg = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'wysiwyg'"); + if($query_wysiwyg->numRows() > 0) { + while($wysiwyg_section = $query_wysiwyg->fetchRow()) { + $entry='content'.$wysiwyg_section['section_id']; + array_push($id_list,$entry); + } + require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'); + } + } +} + +?> + +
+ + + + + + + + + + + +
+ + + +
+ +
+
\ No newline at end of file Property changes on: branches/2.8.x/wb/modules/wysiwyg/modify.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property