Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 690)
+++ trunk/CHANGELOG	(revision 691)
@@ -10,10 +10,12 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
-10-Feb-2008 Thomas Hornik
+------------------------------------- 2.7.0 -------------------------------------
+10-Feb-2008 Thomas Hornik
 #	CAPTCHA: Wrong text for calc_ttf-captcha. 
 10-Feb-2008 Christian Sommer
+!	made Website Header field in Settings visible per default
+!	modified all templates (display Website Header, use show_menu instead of page_menu)
 !	added highlighting of active input elements to all WB backend areas; changed some colors
 !	removed hover highlighting of input fields to avoid possible confusion
 !	added visualization of wrong/empty input fields
Index: trunk/wb/admin/settings/save.php
===================================================================
--- trunk/wb/admin/settings/save.php	(revision 690)
+++ trunk/wb/admin/settings/save.php	(revision 691)
@@ -24,7 +24,7 @@
 */
 
 // prevent this file from being accessed directly in the browser (would set all entries in DB settings table to '')
-if(!isset($_POST['default_language']) || $_POST['default_language'] == '') die("Cannot access this file directly");  
+if(!isset($_POST['default_language']) || $_POST['default_language'] == '') die(header('Location: index.php'));  
 
 // Find out if the user was view advanced options or not
 if($_POST['advanced'] == 'yes' ? $advanced = '?advanced=yes' : $advanced = '');
Index: trunk/wb/admin/settings/template.html
===================================================================
--- trunk/wb/admin/settings/template.html	(revision 690)
+++ trunk/wb/admin/settings/template.html	(revision 691)
@@ -110,7 +110,7 @@
 		<textarea name="website_keywords">{WEBSITE_KEYWORDS}</textarea>
 	</td>
 </tr>
-<tr class="advanced">
+<tr>
 	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="website_header">{WEBSITE_HEADER}</textarea>
Index: trunk/wb/templates/allcss/screen.css
===================================================================
--- trunk/wb/templates/allcss/screen.css	(revision 690)
+++ trunk/wb/templates/allcss/screen.css	(revision 691)
@@ -97,12 +97,18 @@
 	display: block;
 	padding: 2px;
 }
-.menu_main a:link, .menu_main a:visited, .menu_main a:active {
+.menu_default a:link, .menu_default a:visited, .menu_default a:active {
 	border-bottom: 1px dashed #999999;
 }
-.menu_main a:hover {
+.menu_default a:hover {
 	border-bottom: 1px dashed #333333;
 }
+
+.menu_current  {
+	border-bottom: 1px dashed #999999;
+	font-weight:bold;
+}
+
 .login_table {
 	border: 1px solid #D0D0D0;
 	margin-top: 20px;
Index: trunk/wb/templates/allcss/index.php
===================================================================
--- trunk/wb/templates/allcss/index.php	(revision 690)
+++ trunk/wb/templates/allcss/index.php	(revision 691)
@@ -39,10 +39,15 @@
 <link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
 <link href="<?php echo TEMPLATE_DIR; ?>/print.css" rel="stylesheet" type="text/css" media="print" />
 <?php
+// this allows to include the optional module files (frontend.css, frontend.js) into the head section
 if(function_exists('register_frontend_modfiles')) {
   register_frontend_modfiles('css');
   register_frontend_modfiles('js');
 } ?>
+<?php 
+// this allows to add custom information to the head section of your template (WB-->Settings-->Website Header)
+echo WEBSITE_HEADER; 
+?>
 </head>
 <body>
 
@@ -67,9 +72,9 @@
 	if(SHOW_MENU) {
 	?>	
 	<div class="menu">
-		<?php page_menu(0, 1, '<li class="menu_main"[class]>[a] [menu_title] [/a]</li>', '<ul>', '</ul>', '', ' style="font-weight: bold;"'); ?>
+		<?php 
+		show_menu();
 		
-		<?php
 		if(FRONTEND_LOGIN == 'enabled' AND VISIBILITY != 'private' AND $wb->get_session('USER_ID') == '') {
 		?>
 		<form name="login" action="<?php echo LOGIN_URL; ?>" method="post" class="login_table">
Index: trunk/wb/templates/blank/screen.css
===================================================================
--- trunk/wb/templates/blank/screen.css	(nonexistent)
+++ trunk/wb/templates/blank/screen.css	(revision 691)
@@ -0,0 +1,11 @@
+* { padding: 0; margin: 0; }
+
+body {
+  color: #444; 
+  font-size: 81.25%; 
+  font-family: 'Trebuchet MS', Verdana, Arial, Helvetica, Sans-Serif;
+  margin-left: 1em;
+  margin-top: 1em;
+}
+
+ul { margin-left: 1em; }
\ No newline at end of file
Index: trunk/wb/templates/blank/index.php
===================================================================
--- trunk/wb/templates/blank/index.php	(revision 690)
+++ trunk/wb/templates/blank/index.php	(revision 691)
@@ -1,33 +1,65 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2008, 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_URL')) {
-	header('Location: ../index.php');
-	exit(0);
-}
-
-page_content();
-
-?>
\ No newline at end of file
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2008, 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_URL')) {
+	header('Location: ../index.php');
+	exit(0);
+}
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title><?php page_title(); ?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php if(defined('DEFAULT_CHARSET')) { echo DEFAULT_CHARSET; } else { echo 'utf-8'; }?>" />
+<meta name="description" content="<?php page_description(); ?>" />
+<meta name="keywords" content="<?php page_keywords(); ?>" />
+<link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
+<?php
+// this allows to include the optional module files (frontend.css, frontend.js) into the head section
+if(function_exists('register_frontend_modfiles')) {
+  register_frontend_modfiles('css');
+  register_frontend_modfiles('js');
+} ?>
+<?php 
+// this allows to add custom information to the head section of your template (WB-->Settings-->Website Header)
+echo WEBSITE_HEADER; 
+?>
+</head>
+
+
+<body>
+<?php 
+	// display menu
+	show_menu();
+	
+	// display page content
+	page_content(); 
+	
+	// display website footer
+	page_footer();
+?>
+</body>
+</html>
\ No newline at end of file
Index: trunk/wb/templates/round/index.php
===================================================================
--- trunk/wb/templates/round/index.php	(revision 690)
+++ trunk/wb/templates/round/index.php	(revision 691)
@@ -39,10 +39,15 @@
 <link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
 <link href="<?php echo TEMPLATE_DIR; ?>/print.css" rel="stylesheet" type="text/css" media="print" />
 <?php
+// this allows to include the optional module files (frontend.css, frontend.js) into the head section
 if(function_exists('register_frontend_modfiles')) {
   register_frontend_modfiles('css');
   register_frontend_modfiles('js');
 } ?>
+<?php 
+// this allows to add custom information to the head section of your template (WB-->Settings-->Website Header)
+echo WEBSITE_HEADER; 
+?>
 </head>
 <body>
 
@@ -66,7 +71,7 @@
 		</tr>
 		<tr>
 			<td width="170">
-				<?php page_menu(); ?>
+				<?php show_menu(); ?>
 			</td>
 		</tr>
 		<tr>
Index: trunk/wb/templates/simple/screen.css
===================================================================
--- trunk/wb/templates/simple/screen.css	(revision 690)
+++ trunk/wb/templates/simple/screen.css	(revision 691)
@@ -43,7 +43,7 @@
 	padding: 0;
 	padding-left: 5px;
 }
-.current {
+.menu_current {
 	font-weight: bold;
 }
 .highlight {
Index: trunk/wb/templates/simple/index.php
===================================================================
--- trunk/wb/templates/simple/index.php	(revision 690)
+++ trunk/wb/templates/simple/index.php	(revision 691)
@@ -39,10 +39,15 @@
 <link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
 <link href="<?php echo TEMPLATE_DIR; ?>/print.css" rel="stylesheet" type="text/css" media="print" />
 <?php
+// this allows to include the optional module files (frontend.css, frontend.js) into the head section
 if(function_exists('register_frontend_modfiles')) {
   register_frontend_modfiles('css');
   register_frontend_modfiles('js');
 } ?>
+<?php 
+// this allows to add custom information to the head section of your template (WB-->Settings-->Website Header)
+echo WEBSITE_HEADER; 
+?>
 </head>
 <body>
 
@@ -61,7 +66,7 @@
 	<td class="menu">
 		<?php if(SHOW_MENU) { /* Only shown menu if we need to */ ?>	
 			Menu: <br />
-			<?php page_menu(); ?>
+			<?php show_menu(); ?>
 		<?php } ?>
 		
 		<?php if(SHOW_SEARCH) { /* Only show search box if search is enabled */ ?>
