Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1234) +++ branches/2.8.x/CHANGELOG (revision 1235) @@ -11,6 +11,9 @@ ! = Update/Change ------------------------------------- 2.8.1 ------------------------------------- +10-Jan-2010 Dietmar Woellbrink (Luisehahne) +! Ticket #903 fix CSS-errors in WB backend +! add title class in show_breadcrumbs, now full css styling 05-Jan-2010 Dietmar Woellbrink (Luisehahne) ! recoded function show_breadcrumbs 30-Dec-2009 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1234) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1235) @@ -2,7 +2,7 @@ /**************************************************************************** * SVN Version information: * -* $Id: version.php 1230 2009-12-28 23:34:48Z Luisehahne $ +* $Id: version.php 1233 2009-12-28 23:34:48Z Luisehahne $ * * * @@ -56,7 +56,7 @@ * @author Ryan Djurovich * @copyright 2004-2009, Ryan Djurovich * @copyright 2009-2010, Website Baker Org. e.V. - * @version $Id: version.php 1230 2009-12-28 23:34:48Z Luisehahne $ + * @version $Id: version.php 1233 2009-12-28 23:34:48Z Luisehahne $ * @platform WebsiteBaker 2.8.x * @requirements >= PHP 4.3.4 * @license http://www.gnu.org/licenses/gpl.html @@ -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', '1233'); +if(!defined('REVISION')) define('REVISION', '1235'); ?> \ No newline at end of file Index: branches/2.8.x/wb/framework/class.login.php =================================================================== --- branches/2.8.x/wb/framework/class.login.php (revision 1234) +++ branches/2.8.x/wb/framework/class.login.php (revision 1235) @@ -1,44 +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 +* +* This class will be used to with the login application +* +* +* +* +* +*****************************************************************************/ +/** + * + * @category backend + * @package login + * @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 - -*/ - -/* - * @category backend - * @package Login class - * @author(s) Dietmar Wöllbrink , Dietrich Roland Pehlke - * @platform WB 2.8.x - * @require PHP 5.2.11 - * @license http://www.gnu.org/licenses/gpl.html - * @link http://project.websitebaker2.org/browser/branches/2.8.x/wb/pages - * @changeset 2009/11/27 fixed parse error ticket #878 - - - -This class will be used to with the login application - -*/ - // Stop this file from being accessed directly if(!defined('WB_URL')) { header('Location: ../index.php'); @@ -379,7 +403,7 @@ $template->set_file('page', $this->template_file); $template->set_block('page', 'mainBlock', 'main'); if($this->remember_me_option != true) { - $template->set_var('DISPLAY_REMEMBER_ME', 'none'); + $template->set_var('DISPLAY_REMEMBER_ME', 'display: none;'); } else { $template->set_var('DISPLAY_REMEMBER_ME', ''); } Index: branches/2.8.x/wb/framework/frontend.functions.php =================================================================== --- branches/2.8.x/wb/framework/frontend.functions.php (revision 1234) +++ branches/2.8.x/wb/framework/frontend.functions.php (revision 1235) @@ -231,15 +231,23 @@ global $database; global $wb; $admin = & $wb; - if ($wb->page_access_denied==true) { + if ($wb->page_access_denied==true) + { echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS']; exit(); } - if ($wb->page_no_active_sections==true) { + if ($wb->page_no_active_sections==true) + { echo $MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS']; exit(); } - if(isset($globals) AND is_array($globals)) { foreach($globals AS $global_name) { global $$global_name; } } + if(isset($globals) AND is_array($globals)) + { + foreach($globals AS $global_name) + { + global $$global_name; + } + } // Make sure block is numeric if(!is_numeric($block)) { $block = 1; } // Include page content @@ -303,7 +311,10 @@ echo $content; } } - } else { + } + else + { + require(PAGE_CONTENT); } } @@ -333,28 +344,42 @@ $level = ($count <= $level ) ? $count-1 : $level; // set level from which to show, delete indexes in array $crumbs = array_slice($bread_crumbs, $level ); - // set depth of links -1 or 0 show all links $depth = ($depth <= 0) ? sizeof($crumbs) : $depth; // 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; - - foreach ($crumbs as $temp){ + print '
'.$title.''; + // print_r($crumbs); + foreach ($crumbs as $temp) + { if($counter == $depth) { break; } - // set separator - $query_menu = $database->query("SELECT menu_title, link FROM ".TABLE_PREFIX."pages WHERE page_id = $temp"); + // set links and separator + $query_menu = $database->query("SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = $temp"); $page = $query_menu->fetchRow(); - if ( ($links == true) AND ($temp != $page_id) ) { - print ''.$page['menu_title'].''; - } else { - print ''.$page['menu_title'].''; - } - if ( ( $counter <> $total_crumbs-1 ) ) { + + $show_crumb = (($links == true) AND ($temp != $page_id)) + ? ''.$page['menu_title'].'' + : ''.MENU_TITLE.''; + + // Permission + switch ($page['visibility']) + { + case 'none' : + case 'hidden' : + // if show, you know there is an error in a hidden page + print $show_crumb.' --- '; + break; + default : + print $show_crumb; + break; + } + + if ( ( $counter <> $total_crumbs-1 ) ) + { print ''.$sep.''; } $counter++; - } + } print "
\n"; } } Index: branches/2.8.x/wb/templates/wb_theme/templates/login.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/login.htt (revision 1234) +++ branches/2.8.x/wb/templates/wb_theme/templates/login.htt (revision 1235) @@ -46,7 +46,7 @@ {TEXT_PASSWORD}: - +   Index: branches/2.8.x/wb/templates/argos_theme/templates/login.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/login.htt (revision 1234) +++ branches/2.8.x/wb/templates/argos_theme/templates/login.htt (revision 1235) @@ -1,82 +1,82 @@ - - - - -{TEXT_LOGIN} - - - - - - - -
- - {TEXT_LOGIN} -
- - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{MESSAGE}
{TEXT_USERNAME}: - -
{TEXT_PASSWORD}: - -
  - - -
  - -
-
-
- {TEXT_FORGOTTEN_DETAILS} -
-
-
- {TEXT_HOME} -
-
- - - - -
- - Website Baker is released under the GNU General Public License - -
- - - + + + + +{TEXT_LOGIN} + + + + + + + +
+ + {TEXT_LOGIN} +
+ + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{MESSAGE}
{TEXT_USERNAME}: + +
{TEXT_PASSWORD}: + +
  + + +
  + +
+
+
+ {TEXT_FORGOTTEN_DETAILS} +
+
+
+ {TEXT_HOME} +
+
+ + + + +
+ + Website Baker is released under the GNU General Public License + +
+ + + Index: branches/2.8.x/wb/modules/jsadmin/backend.css =================================================================== --- branches/2.8.x/wb/modules/jsadmin/backend.css (revision 1234) +++ branches/2.8.x/wb/modules/jsadmin/backend.css (revision 1235) @@ -21,7 +21,6 @@ .jsadmin_drag a, .jsadmin_drag input, .jsadmin_drag select { cursor: pointer; - cursor: hand; } ul.jsadmin_drag_area {