Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1241) +++ branches/2.8.x/CHANGELOG (revision 1242) @@ -11,6 +11,9 @@ ! = Update/Change ------------------------------------- 2.8.1 ------------------------------------- +13-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #911 Beginning to fix More CSS-errors in WB backend ++ add SVN- Revision to backend theme 12-Jan-2010 Dietmar Woellbrink (Luisehahne) # Ticket #906 Search Template bug ! update editor min width, dragableresize table Index: branches/2.8.x/wb/admin/start/index.php =================================================================== --- branches/2.8.x/wb/admin/start/index.php (revision 1241) +++ branches/2.8.x/wb/admin/start/index.php (revision 1242) @@ -1,136 +1,171 @@ - - 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 - -*/ - -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Start','start'); - -// Setup template object -$template = new Template(THEME_PATH.'/templates'); -$template->set_file('page', 'start.htt'); -$template->set_block('page', 'main_block', 'main'); - -// Insert values into the template object -$template->set_var(array( - 'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'], - 'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'], - 'DISPLAY_NAME' => $admin->get_display_name(), - 'ADMIN_URL' => ADMIN_URL, - 'WB_URL' => WB_URL, - 'THEME_URL' => THEME_URL, - 'WB_VERSION' => WB_VERSION - ) - ); - -// Insert permission values into the template object -if($admin->get_permission('pages') != true) { - $template->set_var('DISPLAY_PAGES', 'none'); -} -if($admin->get_permission('media') != true) { - $template->set_var('DISPLAY_MEDIA', 'none'); -} -if($admin->get_permission('addons') != true) { - $template->set_var('DISPLAY_ADDONS', 'none'); -} -if($admin->get_permission('access') != true) { - $template->set_var('DISPLAY_ACCESS', 'none'); -} -if($admin->get_permission('settings') != true) { - $template->set_var('DISPLAY_SETTINGS', 'none'); -} -if($admin->get_permission('admintools') != true) { - $template->set_var('DISPLAY_ADMINTOOLS', 'none'); -} - -// Check if installation directory still exists -if(file_exists(WB_PATH.'/install/')) { - // Check if user is part of Adminstrators group - if(in_array(1, $admin->get_groups_id())) { - $template->set_var('WARNING', $MESSAGE['START']['INSTALL_DIR_EXISTS']); - } else { - $template->set_var('DISPLAY_WARNING', 'none'); - } -} else { - $template->set_var('DISPLAY_WARNING', 'none'); -} - -// Insert "Add-ons" section overview (pretty complex compared to normal) -$addons_overview = $TEXT['MANAGE'].' '; -$addons_count = 0; -if($admin->get_permission('modules') == true) { - $addons_overview .= ''.$MENU['MODULES'].''; - $addons_count = 1; -} -if($admin->get_permission('templates') == true) { - if($addons_count == 1) { $addons_overview .= ', '; } - $addons_overview .= ''.$MENU['TEMPLATES'].''; - $addons_count = 1; -} -if($admin->get_permission('languages') == true) { - if($addons_count == 1) { $addons_overview .= ', '; } - $addons_overview .= ''.$MENU['LANGUAGES'].''; -} - -// Insert "Access" section overview (pretty complex compared to normal) -$access_overview = $TEXT['MANAGE'].' '; -$access_count = 0; -if($admin->get_permission('users') == true) { - $access_overview .= ''.$MENU['USERS'].''; - $access_count = 1; -} -if($admin->get_permission('groups') == true) { - if($access_count == 1) { $access_overview .= ', '; } - $access_overview .= ''.$MENU['GROUPS'].''; - $access_count = 1; -} - -// Insert section names and descriptions -$template->set_var(array( - 'PAGES' => $MENU['PAGES'], - 'MEDIA' => $MENU['MEDIA'], - 'ADDONS' => $MENU['ADDONS'], - 'ACCESS' => $MENU['ACCESS'], - 'PREFERENCES' => $MENU['PREFERENCES'], - 'SETTINGS' => $MENU['SETTINGS'], - 'ADMINTOOLS' => $MENU['ADMINTOOLS'], - 'HOME_OVERVIEW' => $OVERVIEW['START'], - 'PAGES_OVERVIEW' => $OVERVIEW['PAGES'], - 'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'], - 'ADDONS_OVERVIEW' => $addons_overview, - 'ACCESS_OVERVIEW' => $access_overview, - 'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'], - 'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'], - 'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS'] - ) - ); - -// Parse template object -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); - -// Print admin footer -$admin->print_footer(); - + +* 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 +* +* 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 +* of the License, or (at your option) any later version. +* +* WebsiteBaker 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 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 admin + * @package start + * @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 + * + */ + +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Start','start'); + +// Setup template object +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'start.htt'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into the template object +$template->set_var(array( + 'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'], + 'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'], + 'DISPLAY_NAME' => $admin->get_display_name(), + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'WB_VERSION' => WB_VERSION + ) + ); + +// Insert permission values into the template object +if($admin->get_permission('pages') != true) { + $template->set_var('DISPLAY_PAGES', 'display:none;'); +} +if($admin->get_permission('media') != true) { + $template->set_var('DISPLAY_MEDIA', 'display:none;'); +} +if($admin->get_permission('addons') != true) { + $template->set_var('DISPLAY_ADDONS', 'display:none;'); +} +if($admin->get_permission('access') != true) { + $template->set_var('DISPLAY_ACCESS', 'display:none;'); +} +if($admin->get_permission('settings') != true) { + $template->set_var('DISPLAY_SETTINGS', 'display:none;'); +} +if($admin->get_permission('admintools') != true) { + $template->set_var('DISPLAY_ADMINTOOLS', 'display:none;'); +} + +// Check if installation directory still exists +if(file_exists(WB_PATH.'/install/')) { + // Check if user is part of Adminstrators group + if(in_array(1, $admin->get_groups_id())) { + $template->set_var('WARNING', $MESSAGE['START']['INSTALL_DIR_EXISTS']); + } else { + $template->set_var('DISPLAY_WARNING', 'display:none;'); + } +} else { + $template->set_var('DISPLAY_WARNING', 'display:none;'); +} + +// Insert "Add-ons" section overview (pretty complex compared to normal) +$addons_overview = $TEXT['MANAGE'].' '; +$addons_count = 0; +if($admin->get_permission('modules') == true) { + $addons_overview .= ''.$MENU['MODULES'].''; + $addons_count = 1; +} +if($admin->get_permission('templates') == true) { + if($addons_count == 1) { $addons_overview .= ', '; } + $addons_overview .= ''.$MENU['TEMPLATES'].''; + $addons_count = 1; +} +if($admin->get_permission('languages') == true) { + if($addons_count == 1) { $addons_overview .= ', '; } + $addons_overview .= ''.$MENU['LANGUAGES'].''; +} + +// Insert "Access" section overview (pretty complex compared to normal) +$access_overview = $TEXT['MANAGE'].' '; +$access_count = 0; +if($admin->get_permission('users') == true) { + $access_overview .= ''.$MENU['USERS'].''; + $access_count = 1; +} +if($admin->get_permission('groups') == true) { + if($access_count == 1) { $access_overview .= ', '; } + $access_overview .= ''.$MENU['GROUPS'].''; + $access_count = 1; +} + +// Insert section names and descriptions +$template->set_var(array( + 'PAGES' => $MENU['PAGES'], + 'MEDIA' => $MENU['MEDIA'], + 'ADDONS' => $MENU['ADDONS'], + 'ACCESS' => $MENU['ACCESS'], + 'PREFERENCES' => $MENU['PREFERENCES'], + 'SETTINGS' => $MENU['SETTINGS'], + 'ADMINTOOLS' => $MENU['ADMINTOOLS'], + 'HOME_OVERVIEW' => $OVERVIEW['START'], + 'PAGES_OVERVIEW' => $OVERVIEW['PAGES'], + 'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'], + 'ADDONS_OVERVIEW' => $addons_overview, + 'ACCESS_OVERVIEW' => $access_overview, + 'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'], + 'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'], + 'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + ?> \ No newline at end of file Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1241) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1242) @@ -70,6 +70,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', '1241'); +if(!defined('REVISION')) define('REVISION', '1242'); ?> \ No newline at end of file Index: branches/2.8.x/wb/framework/class.admin.php =================================================================== --- branches/2.8.x/wb/framework/class.admin.php (revision 1241) +++ branches/2.8.x/wb/framework/class.admin.php (revision 1242) @@ -1,37 +1,68 @@ +* 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 +* +* 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 +* of the License, or (at your option) any later version. +* +* WebsiteBaker 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 this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +**************************************************************************** +* +* WebsiteBaker Extra Information +* +* Admin class +* +* This class will be used for every program that will be included +* in the administration section of Website Baker. +* +* +*****************************************************************************/ +/** + * + * @category frontend + * @package functions + * @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 + * + */ -// $Id$ - -/* - - Website Baker Project - 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 - -*/ - -/* - -Admin class - -This class will be used for every program that will be included -in the administration section of Website Baker. - -*/ - if(!defined('WB_URL')) { header('Location: ../index.php'); exit(0); @@ -141,6 +172,7 @@ 'CHARSET' => $charset, 'LANGUAGE' => strtolower(LANGUAGE), 'VERSION' => VERSION, + 'REVISION' => REVISION, 'WB_URL' => WB_URL, 'ADMIN_URL' => ADMIN_URL, 'THEME_URL' => THEME_URL, Index: branches/2.8.x/wb/framework/frontend.functions.php =================================================================== --- branches/2.8.x/wb/framework/frontend.functions.php (revision 1241) +++ branches/2.8.x/wb/framework/frontend.functions.php (revision 1242) @@ -42,13 +42,13 @@ * * WebsiteBaker Extra Information * -* Version file * -* This file is purely for ensuring compatibility with 3rd party -* contributions made for WB version 2.5.2 or below * * * +* +* +* *****************************************************************************/ /** * @@ -348,7 +348,7 @@ // if empty array, set orginal links $crumbs = (!empty($crumbs)) ? $crumbs : $wb->page_trail; $total_crumbs = ( ($depth <= 0) OR ($depth > sizeof($crumbs)) ) ? sizeof($crumbs) : $depth; - print '
'.$title.''; + print '
'.$title.''; // print_r($crumbs); foreach ($crumbs as $temp) { @@ -367,7 +367,7 @@ case 'none' : case 'hidden' : // if show, you know there is an error in a hidden page - print $show_crumb.' --- '; + print $show_crumb.' '; break; default : print $show_crumb; Index: branches/2.8.x/wb/templates/classic_theme/templates/toggle_zip.js =================================================================== --- branches/2.8.x/wb/templates/classic_theme/templates/toggle_zip.js (revision 1241) +++ branches/2.8.x/wb/templates/classic_theme/templates/toggle_zip.js (nonexistent) @@ -1,14 +0,0 @@ -function toggle() { - var check = document.getElementById("file2"); - if (check.style.visibility == "visible") { - for (i=2; i<=10; i++) { - document.getElementById("file" + i).style.visibility = "hidden"; - } - document.getElementById("delzip").style.display = "inline"; - } else { - for (i=2; i<=10; i++) { - document.getElementById("file" + i).style.visibility = "visible"; - } - document.getElementById("delzip").style.display = "none"; - } -} Index: branches/2.8.x/wb/templates/classic_theme/templates/header.htt =================================================================== --- branches/2.8.x/wb/templates/classic_theme/templates/header.htt (revision 1241) +++ branches/2.8.x/wb/templates/classic_theme/templates/header.htt (revision 1242) @@ -37,7 +37,8 @@   {TITLE_LOGOUT} - Version {VERSION} + Version {VERSION}
+ Revision {REVISION} Index: branches/2.8.x/wb/templates/classic_theme/templates/start.htt =================================================================== --- branches/2.8.x/wb/templates/classic_theme/templates/start.htt (revision 1241) +++ branches/2.8.x/wb/templates/classic_theme/templates/start.htt (revision 1242) @@ -6,7 +6,7 @@ {WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME} - + {WARNING} @@ -14,7 +14,7 @@ - +
@@ -32,7 +32,7 @@
- +
@@ -50,7 +50,7 @@
- +
@@ -68,7 +68,7 @@
- +
- + @@ -14,7 +14,7 @@
@@ -92,7 +92,7 @@ - +
@@ -128,7 +128,7 @@
- +
Index: branches/2.8.x/wb/templates/wb_theme/templates/header.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/header.htt (revision 1241) +++ branches/2.8.x/wb/templates/wb_theme/templates/header.htt (revision 1242) @@ -36,7 +36,8 @@   {TITLE_LOGOUT} - Version {VERSION} + Version {VERSION}
+ Revision {REVISION}
Index: branches/2.8.x/wb/templates/wb_theme/templates/start.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/start.htt (revision 1241) +++ branches/2.8.x/wb/templates/wb_theme/templates/start.htt (revision 1242) @@ -6,7 +6,7 @@ {WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}
{WARNING}
- +
@@ -32,7 +32,7 @@
- +
@@ -50,7 +50,7 @@
- +
@@ -68,7 +68,7 @@
- +
@@ -92,7 +92,7 @@ - +
@@ -128,7 +128,7 @@
- +
Index: branches/2.8.x/wb/templates/argos_theme/templates/header.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/header.htt (revision 1241) +++ branches/2.8.x/wb/templates/argos_theme/templates/header.htt (revision 1242) @@ -31,7 +31,8 @@
Home| {TITLE_VIEW}| {TITLE_LOGOUT}

- CMS version {VERSION}
+ CMS Version {VERSION}
+ Revision {REVISION}
Admin version 1.4
Index: branches/2.8.x/wb/templates/argos_theme/templates/start.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/start.htt (revision 1241) +++ branches/2.8.x/wb/templates/argos_theme/templates/start.htt (revision 1242) @@ -1,75 +1,75 @@ - - - - - - - - - - - - - - -
{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}.
{WARNING}
- - - - - - -
{PAGES}
 - {PAGES_OVERVIEW} -
- - - - - -
{ADDONS}
 - {ADDONS_OVERVIEW} -
- - - - - -
{SETTINGS}
 - {SETTINGS_OVERVIEW} -
- - - - - -
{ACCESS}
 - {ACCESS_OVERVIEW} -
- 		  - - - - - -
{MEDIA}
 - {MEDIA_OVERVIEW} -
- - - - - -
{PREFERENCES}
 - {PREFERENCES_OVERVIEW} -
- - - - - -
{ADMINTOOLS}
 - {ADMINTOOLS_OVERVIEW} -
-
+ + + + + + + + + + + + + + +
{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}.
{WARNING}
+ + + + + + +
{PAGES}
 + {PAGES_OVERVIEW} +
+ + + + + +
{ADDONS}
 + {ADDONS_OVERVIEW} +
+ + + + + +
{SETTINGS}
 + {SETTINGS_OVERVIEW} +
+ + + + + +
{ACCESS}
 + {ACCESS_OVERVIEW} +
+ 		  + + + + + +
{MEDIA}
 + {MEDIA_OVERVIEW} +
+ + + + + +
{PREFERENCES}
 + {PREFERENCES_OVERVIEW} +
+ + + + + +
{ADMINTOOLS}
 + {ADMINTOOLS_OVERVIEW} +
+
\ No newline at end of file