Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 864)
+++ trunk/CHANGELOG	(revision 865)
@@ -11,7 +11,14 @@
 ! = Update/Change
 
 ------------------------------------- 2.7.1 -------------------------------------
-19-Aug-2008 Matthias Gallas
+25-Oct-2008 Christian Sommer
+!	updated basic templates according the template guidelines
+24-Oct-2008 Dietrich Roland Pehlke
+#	applied bugfix for ticket #608 (redeclaration of news module)
+23-Oct-2008 Dietrich Roland Pehlke
+!	modified module delete function to provide additional information when module is in use when trying to delete
+!	modified template delete function to provide additional information when template is in when trying to delete
+21-Oct-2008 Matthias Gallas
 #	fixed display issue in news modul
 !	updated show_menu2 to version 4.7
 18-Sep-2008 Thomas Hornik
Index: trunk/wb/templates/allcss/footer.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/allcss/footer.jpg
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/allcss/header.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/allcss/header.jpg
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/allcss/background.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/allcss/background.jpg
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/allcss/screen.css
===================================================================
--- trunk/wb/templates/allcss/screen.css	(revision 864)
+++ trunk/wb/templates/allcss/screen.css	(nonexistent)
@@ -1,154 +0,0 @@
-body,td,th {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-}
-body {
-	background-color: #F0F0F0;
-	background-image: url(background.jpg);
-	margin: 0;
-}
-a:link, a:visited, a:active {
-	color: #660033;
-	text-decoration: none;
-}
-a:hover {
-	color: #993366;
-	text-decoration: none;
-}
-hr {
-	margin: 5px 0px 5px 0px;
-	color: #660033;
-	border: 0;
-	border-top: 1px solid #660033;
-	height: 1px;
-	width: 580px;
-}
-h1 {
-	font-size: 16px;
-	color: #993366;
-	text-align: left;
-	margin: 8px 2px 8px 2px;
-}
-form {
-	margin: 0;
-}
-.main {
-	width: 750px;
-	margin: auto;
-	padding: 0;
-	background-color: #FFFFFF;
-}
-.banner, .search_box {
-	height: 80px;
-	background-image: url(header.jpg);
-	background-repeat: repeat-x;
-	font-size: 20px;
-	font-weight: bold;
-	color: #FFFFFF;
-	text-align: center;
-	padding-top: 20px;
-}
-.banner {
-	width: 530px;
-	padding-left: 20px;
-	float: left;
-	text-align: left;
-}
-.search_box {
-	float: right;
-	clear: right;
-	width: 200px;
-}
-.search_string {
-	width: 100px;
-	height: 16px;
-	font-size: 10px;
-	vertical-align: middle;
-}
-.search_submit {
-	width: 50px;
-	height: 22px;
-	font-size: 10px;
-	vertical-align: middle;
-}
-.highlight {
-	background-color: #D0D0D0;
-}
-.banner a {
-	color: #FFFFFF;
-}
-.menu {
-	float: left;
-	width: 140px;
-	margin: 10px;
-	margin-top: 3px;
-}
-.menu ul, .menu li {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-	margin-bottom: 5px;
-}
-.menu ul ul {
-	padding-left: 8px;
-}
-.menu a:link, .menu a:visited, .menu a:active, .menu a:hover {
-	display: block;
-	padding: 2px;
-}
-.menu_default a:link, .menu_default a:visited, .menu_default a:active {
-	border-bottom: 1px dashed #999999;
-}
-.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;
-	margin-bottom: 5px;
-	text-align: center;
-	padding-bottom: 3px;
-}
-.login_table h1 {
-	color: #660033;
-	font-size: 12px;
-	text-transform: uppercase;
-	font-weight: bold;
-	text-align: center;
-	margin: 5px 0px 5px 0px;
-}
-.login_table input {
-	text-transform: uppercase;
-	font-size: 10px;
-	margin: 5px 0px 1px 0px;
-	width: 100px;
-}
-.content {
-	margin-left: 150px;
-	padding: 4px 10px 14px 10px;
-	text-align: justify;
-	clear: right;
-}
-.footer {
-	background-color: #FFFFFF;
-	clear: both;
-	height: 20px;
-	background-image: url(footer.jpg);
-	background-repeat: repeat-x;
-	font-size: 10px;
-	color: #666666;
-	text-align: center;
-	line-height: 18px;
-}
-.powered_by {
-	text-align: center;
-	font-size: 10px;
-	padding-top: 2px;
-}
\ No newline at end of file

Property changes on: trunk/wb/templates/allcss/screen.css
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: trunk/wb/templates/allcss/preview.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/allcss/preview.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/allcss/info.php
===================================================================
--- trunk/wb/templates/allcss/info.php	(revision 864)
+++ trunk/wb/templates/allcss/info.php	(revision 865)
@@ -1,34 +1,44 @@
 <?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
-
+/**
+ * $Id$
+ * Website Baker template: allcss
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file defines the template variables required by Website Baker.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
 */
 
-$template_directory = 'allcss';
-$template_name = 'All CSS';
-$template_version = '2.6';
-$template_platform = '2.6.x';
-$template_author = 'Ryan Djurovich';
-$template_license = 'GNU General Public License';
-$template_description = 'This template is designed with one goal in mind: to completely control lay-out with css. In case you were wondering, that is where the name came from.';
+// OBLIGATORY WEBSITE BAKER VARIABLES
+$template_directory				= 'allcss';
+$template_name						= 'All CSS';
+$template_version					= '2.70';
+$template_platform				= '2.7';
+$template_author					= 'Ryan Djurovich, C. Sommer';
+$template_license					= '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>';
+$template_license_terms		= '-';
+$template_description			= 'Default template for Website Baker. This template is designed with one goal in mind: to completely control layout with CSS. In case you were wondering, that is where the name came from.';
 
+// OPTIONAL VARIABLES FOR ADDITIONAL MENUES AND BLOCKS
+// $menu[1]								= '';
+// $menu[2]								= '';
+// $block[1]							= '';
+// $block[2]							= '';
 ?>
\ No newline at end of file
Index: trunk/wb/templates/allcss/template.css
===================================================================
--- trunk/wb/templates/allcss/template.css	(nonexistent)
+++ trunk/wb/templates/allcss/template.css	(revision 865)
@@ -0,0 +1,189 @@
+/**
+ * $Id$
+ * Website Baker template: allcss
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file contains all CSS definitions required to display the template
+ * in the Website Baker frontend. 
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
+body,td,th {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000;
+}
+body {
+	background-color: #F0F0F0;
+	background-image: url(images/background.jpg);
+	margin: 0;
+}
+a:link, a:visited, a:active {
+	color: #603;
+	text-decoration: none;
+}
+a:hover {
+	color: #936;
+	text-decoration: none;
+}
+hr {
+	margin: 5px 0px 5px 0px;
+	color: #603;
+	border: 0;
+	border-top: 1px solid #603;
+	height: 1px;
+	width: 580px;
+}
+h1 {
+	font-size: 16px;
+	color: #993366;
+	text-align: left;
+	margin: 8px 2px 8px 2px;
+}
+form {
+	margin: 0;
+}
+.main {
+	width: 750px;
+	margin: auto;
+	padding: 0;
+	background-color: #FFF;
+}
+.banner, .search_box {
+	height: 80px;
+	background-image: url(images/header.jpg);
+	background-repeat: repeat-x;
+	font-size: 20px;
+	font-weight: bold;
+	color: #FFF;
+	text-align: center;
+	padding-top: 20px;
+}
+
+.banner {
+	width: 530px;
+	padding-left: 20px;
+	float: left;
+	text-align: left;
+}
+.search_box {
+	float: right;
+	clear: right;
+	width: 200px;
+}
+.search_string {
+	width: 100px;
+	height: 16px;
+	font-size: 10px;
+	vertical-align: middle;
+}
+.search_submit {
+	width: 50px;
+	height: 22px;
+	font-size: 10px;
+	vertical-align: middle;
+}
+.highlight {
+	background-color: #D0D0D0;
+}
+.banner a {
+	color: #FFF;
+}
+.banner span {
+	color: #D0D0D0;
+}
+
+.menu {
+	float: left;
+	width: 140px;
+	margin: 10px;
+	margin-top: 3px;
+}
+.menu ul, .menu li {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+	margin-bottom: 5px;
+}
+.menu ul ul {
+	padding-left: 8px;
+}
+.menu a:link, .menu a:visited, .menu a:active, .menu a:hover {
+	display: block;
+	padding: 2px;
+}
+.menu_default a:link, .menu_default a:visited, .menu_default a:active {
+	border-bottom: 1px dashed #999;
+}
+.menu_default a:hover {
+	border-bottom: 1px dashed #333;
+}
+
+.menu_current  {
+	border-bottom: 1px dashed #999;
+	font-weight:bold;
+}
+
+.menu fieldset {
+	border: 1px solid #D0D0D0;
+	margin-top: 20px;
+	margin-bottom: 5px;
+	text-align: center;
+	padding-bottom: 3px;
+}
+
+.menu legend {
+	color: #603;
+	font-size: 12px;
+	text-transform: uppercase;
+	font-weight: bold;
+	text-align: center;
+}
+
+.menu input {
+	text-transform: uppercase;
+	font-size: 10px;
+	margin: 5px 0px 1px 0px;
+	width: 100px;
+}
+
+.content {
+	margin-left: 150px;
+	padding: 4px 10px 14px 10px;
+	text-align: justify;
+	clear: right;
+}
+.footer {
+	background-color: #FFF;
+	clear: both;
+	height: 20px;
+	background-image: url(images/footer.jpg);
+	background-repeat: repeat-x;
+	font-size: 10px;
+	color: #666;
+	text-align: center;
+	line-height: 18px;
+}
+.powered_by {
+	text-align: center;
+	font-size: 10px;
+	padding-top: 2px;
+}
\ No newline at end of file
Index: trunk/wb/templates/allcss/images/header.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/allcss/images/header.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/allcss/images/footer.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/allcss/images/footer.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/allcss/images/index.php
===================================================================
--- trunk/wb/templates/allcss/images/index.php	(nonexistent)
+++ trunk/wb/templates/allcss/images/index.php	(revision 865)
@@ -0,0 +1,32 @@
+<?php
+/**
+ * $Id$
+ * Website Baker template: allcss
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file prevents directory listing.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
+// prevent directory listing
+header('Location: ../../../index.php');
+
+?>
\ No newline at end of file
Index: trunk/wb/templates/allcss/images/background.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/allcss/images/background.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/allcss/index.php
===================================================================
--- trunk/wb/templates/allcss/index.php	(revision 864)
+++ trunk/wb/templates/allcss/index.php	(revision 865)
@@ -1,111 +1,132 @@
 <?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
-
+/**
+ * $Id$
+ * Website Baker template: allcss
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file contains the overall template markup and the Website Baker
+ * template functions to add the contents from the database.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
 */
 
-if(!defined('WB_URL')) {
-	header('Location: ../index.php');
-	exit(0);
-}
+// prevent this file from being accessed directly
+if (!defined('WB_PATH')) die(header('Location: ../../index.php'));
 
+// TEMPLATE CODE STARTS BELOW
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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" />
-<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; 
-?>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php 
+	echo defined('DEFAULT_CHARSET') ? DEFAULT_CHARSET : 'utf-8'; ?>" />
+	<meta name="description" content="<?php page_description(); ?>" />
+	<meta name="keywords" content="<?php page_keywords(); ?>" />
+	<?php 
+	// automatically include optional WB module files (frontend.css, frontend.js)
+	if (function_exists('register_frontend_modfiles')) {
+		register_frontend_modfiles('css');
+		register_frontend_modfiles('js');
+	} ?>
+	<link rel="stylesheet" type="text/css" href="<?php 
+	echo TEMPLATE_DIR; ?>/template.css" media="screen,projection" />
+	<link rel="stylesheet" type="text/css" href="<?php 
+	echo TEMPLATE_DIR; ?>/print.css" media="print" />
+	<title><?php page_title('', '[WEBSITE_TITLE]'); ?></title>
 </head>
+
 <body>
 
 <div class="main">
 	
 	<div class="banner">
-		<a href="<?php echo WB_URL; ?>/" target="_top"><?php echo WEBSITE_TITLE; ?></a>
-		<font color="#D0D0D0">| <?php echo PAGE_TITLE; ?></font>
+		<a href="<?php echo WB_URL; ?>/" target="_top"><?php page_title('', '[WEBSITE_TITLE]'); ?></a>
+		<span>| <?php page_title('', '[PAGE_TITLE]'); ?></span>
 	</div>
 	
+	<!-- frontend search -->
 	<div class="search_box">
-		<?php if(SHOW_SEARCH) { ?>
-		<form name="search" action="<?php echo WB_URL.'/search/index.php'; ?>" method="get">
-		<input type="text" name="string" class="search_string" />
-		<input type="submit" name="submit" value="<?php echo $TEXT['SEARCH']; ?>" class="search_submit" />
-		</form>
-		<?php } ?>
+		<?php 
+		// CODE FOR WEBSITE BAKER FRONTEND SEARCH
+		if (SHOW_SEARCH) { ?>
+			<form name="search" action="<?php echo WB_URL; ?>/search/index.php" method="get">
+				<input type="hidden" name="referrer" value="<?php 
+				echo defined('REFERRER_ID') ? REFERRER_ID : PAGE_ID; ?>" />
+				<input type="text" name="string" class="search_string" />
+				<input type="submit" name="wb_search" id="wb_search" value="<?php 
+				echo $TEXT['SEARCH']; ?>" class="search_submit" />
+			</form><?php 
+		} ?>
 	</div>
-	
-	<?php
-	// Only show menu items if we are supposed to
-	if(SHOW_MENU) {
-	?>	
+
+	<!-- main navigation menu -->
 	<div class="menu">
-		<?php 
-		show_menu();
+		<?php show_menu(1, 0, -1, true, 
+			'<li><span [class]>[a][menu_title][/a]</span>', '</li>', 
+			'<ul>', '</ul>', 'class="menu_default"', 'class="menu_current"', 0
+			); 
+		?>
 		
-		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">
-			<h1><?php echo $TEXT['LOGIN']; ?></h1>
-			<?php echo $TEXT['USERNAME']; ?>:
-			<input type="text" name="username" style="text-transform: lowercase;" />
-			<?php echo $TEXT['PASSWORD']; ?>:
-			<input type="password" name="password" />
-			<input type="submit" name="submit" value="<?php echo $TEXT['LOGIN']; ?>" style="margin-top: 3px; text-transform: uppercase;" />
-			<a href="<?php echo FORGOT_URL; ?>"><?php echo $TEXT['FORGOT_DETAILS']; ?></a>
-				<?php if(is_numeric(FRONTEND_SIGNUP)) { ?>
-					<a href="<?php echo SIGNUP_URL; ?>"><?php echo $TEXT['SIGNUP']; ?></a>
-				<?php } ?>
-		</form>
 		<?php
-		} elseif(FRONTEND_LOGIN == 'enabled' AND is_numeric($wb->get_session('USER_ID'))) {
-		?>
-		<form name="logout" action="<?php echo LOGOUT_URL; ?>" method="post" class="login_table">
-			<h1><?php echo $TEXT['LOGGED_IN']; ?></h1>
-			<?php echo $TEXT['WELCOME_BACK']; ?>, <?php echo $wb->get_display_name(); ?>
+		// CODE FOR WEBSITE BAKER FRONTEND LOGIN
+		if (FRONTEND_LOGIN == 'enabled' && VISIBILITY != 'private' 
+			&& $wb->get_session('USER_ID') == '') { ?>
+			<!-- login form -->
 			<br />
-			<input type="submit" name="submit" value="<?php echo $MENU['LOGOUT']; ?>" />
+			<form name="login" id="login" action="<?php echo LOGIN_URL; ?>" method="post">
+				<fieldset>
+					<legend><?php echo $TEXT['LOGIN']; ?></legend>
+					<label for="username" accesskey="1"><?php echo $TEXT['USERNAME']; ?>:</label>
+					<input type="text" name="username" id="username" style="text-transform: lowercase;" /><br />
+					<label for="password" accesskey="2"><?php echo $TEXT['PASSWORD']; ?>:</label>
+					<input type="password" name="password" id="password" /><br />
+					<input type="submit" name="wb_login" id="wb_login" value="<?php echo $MENU['LOGIN']; ?>"/><br />
+	
+					<!-- forgotten details link -->
+					<a href="<?php echo FORGOT_URL; ?>"><?php echo $TEXT['FORGOT_DETAILS']; ?></a>
+
+					<!-- frontend signup -->
+					<?php
+					if (is_numeric(FRONTEND_SIGNUP)) { ?>
+						<a href="<?php echo SIGNUP_URL; ?>"><?php echo $TEXT['SIGNUP']; ?></a>
+					<?php } ?>
+				</fieldset>
+			</form>
+			
+		<?php 
+		} elseif (FRONTEND_LOGIN == 'enabled' && is_numeric($wb->get_session('USER_ID'))) { ?>
+			<!-- logout form -->
 			<br />
-			<a href="<?php echo PREFERENCES_URL; ?>"><?php echo $MENU['PREFERENCES']; ?></a>
-			<a href="<?php echo ADMIN_URL; ?>/index.php"><?php echo $TEXT['ADMINISTRATION']; ?></a>
-		</form>
-		<?php
-		}
-		?>
+			<form name="logout" id="logout" action="<?php echo LOGOUT_URL; ?>" method="post">
+				<fieldset>
+					<legend><?php echo $TEXT['LOGGED_IN']; ?>:</legend>
+					<?php echo $TEXT['WELCOME_BACK']; ?>, <?php echo $wb->get_display_name(); ?>
+					<input type="submit" name="wb_logout" id="wb_logout" value="<?php echo $MENU['LOGOUT']; ?>" />
+					<!-- edit user preferences -->
+					<a href="<?php echo PREFERENCES_URL; ?>"><?php echo $MENU['PREFERENCES']; ?></a>
+				</fieldset>
+			</form>
+		<?php 
+		} ?>
 	</div>
-	<?php } ?>
 	
 	<div class="content">
 		<?php page_content(); ?>
Index: trunk/wb/templates/blank/preview.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/blank/preview.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/blank/info.php
===================================================================
--- trunk/wb/templates/blank/info.php	(revision 864)
+++ trunk/wb/templates/blank/info.php	(revision 865)
@@ -1,34 +1,46 @@
 <?php
+/**
+ * $Id$
+ * Website Baker template: blank
+ * This template is one of four basis templates distributed with Website Baker.
+ * Use this template for pages where you do not want anything wrapping the 
+ * content e.g. a page for a global block.
+ *
+ * This file defines the template variables required by Website Baker.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
 
-// $Id$
+// OBLIGATORY WEBSITE BAKER VARIABLES
+$template_directory				= 'blank';
+$template_name						= 'Blank Template';
+$template_version					= '2.70';
+$template_platform				= '2.7';
+$template_author					= 'Ryan Djurovich, C. Sommer';
+$template_license					= '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>';
+$template_license_terms		= '-';
+$template_description			= 'This template is for use on page where you do not want anything wrapping the content.';
 
-/*
+// OPTIONAL VARIABLES FOR ADDITIONAL MENUES AND BLOCKS
+// $menu[1]								= '';
+// $menu[2]								= '';
+// $block[1]							= '';
+// $block[2]							= '';
 
- 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
-
-*/
-
-$template_directory = 'blank';
-$template_name = 'Blank Template';
-$template_version = '2.6';
-$template_platform = '2.6.x';
-$template_author = 'Ryan Djurovich';
-$template_license = 'GNU General Public License';
-$template_description = 'This template is for use on page where you do not want anything wrapping the content';
-
 ?>
\ No newline at end of file
Index: trunk/wb/templates/blank/index.php
===================================================================
--- trunk/wb/templates/blank/index.php	(revision 864)
+++ trunk/wb/templates/blank/index.php	(revision 865)
@@ -1,33 +1,38 @@
 <?php
+/**
+ * $Id$
+ * Website Baker template: blank
+ * This template is one of four basis templates distributed with Website Baker.
+ * Use this template for pages where you do not want anything wrapping the 
+ * content e.g. a page for a global block.
+ *
+ * This file contains the Website Baker template function to output the content.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
 
-// $Id$
+// prevent this file from being accessed directly
+if (!defined('WB_PATH')) die(header('Location: ../../index.php'));
 
-/*
+// TEMPLATE CODE STARTS BELOW
 
- 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);
-}
-
+// output only the page content, nothing else
 page_content();
 
 ?>
\ No newline at end of file
Index: trunk/wb/templates/round/powered.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/powered.jpg
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/menu_bottom.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/menu_bottom.gif
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/banner.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/banner.jpg
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/menu_top.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/menu_top.gif
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/background.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/background.jpg
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/footer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/footer.png
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/screen.css
===================================================================
--- trunk/wb/templates/round/screen.css	(revision 864)
+++ trunk/wb/templates/round/screen.css	(nonexistent)
@@ -1,120 +0,0 @@
-body,td,th {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-}
-body {
-	background-color: #003366;
-	background-image: url(background.jpg);
-	background-repeat: repeat-x;
-	margin: 10px;
-}
-a:link, a:visited, a:active {
-	color: #003366;
-	text-decoration: none;
-}
-a:hover {
-	color: #336699;
-	text-decoration: none;
-}
-hr {
-	margin: 15px 0px 15px 0px;
-	color: #003366;
-	height: 1px;
-	width: 100%;
-}
-h1 {
-	font-size: 18px;
-	color: #003366;
-	margin: 5px 0px 5px 0px;
-}
-h2 {
-	font-size: 15px;
-	color: #336699;
-	margin: 15px 0px 5px 0px;
-}
-form {
-	margin: 0;
-}
-.header {
-	width: 750px;
-	height: 80px;
-	background-color: #FFFFFF;
-	vertical-align: top;
-}
-.menu {
-	vertical-align: top;
-	background-color: #FFFFFF;
-	width: 170px;
-	padding: 0px;
-}
-.menu ul, .menu li{
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-}
-.menu ul {
-	border-bottom: 0px;
-	background-color: #003366;
-}
-.menu ul ul {
-	padding-left: 10px;
-}
-.menu a:link, .menu a:visited, .menu a:active {
-	padding: 4px 10px 4px 10px;
-	color: #FFFFFF;
-	display: block;
-	background-color: #003366;
-	text-decoration: none;
-}
-.menu a:hover {
-	background-color: #336699;
-	text-decoration: none;
-}
-.menu_current {
-	font-weight: bold;
-}
-.highlight {
-	background-color: #D0D0D0;
-}
-.border {
-	font-size: 1px;
-	height: 10px;
-}
-.login {
-	padding: 2px 10px 2px 10px;
-	font-size: 10px;
-	background-color: #003366;
-	color: #FFFFFF;
-	text-align: center;
-}
-.login input {
-	width: 95%;
-	font-size: 10px;
-}
-.login a:link, .login a:visited, .login a:active {
-	color: #DDDDDD;
-	text-decoration: none;
-}
-.login a:hover {
-	color: #FFFFFF;
-	text-decoration: none;
-}
-.powered_by {
-	padding: 3px 0px 0px 15px;
-	background-color: #FFFFFF;
-}
-.content {
-	padding: 10px;
-	background-color: #FFFFFF;
-	height: 300px;
-	vertical-align: top;
-	text-align: left;
-}
-.footer {
-	padding: 5px;
-	height: 20px;
-	color: #FFFFFF;
-	vertical-align: middle;
-	text-align: center;
-}
\ No newline at end of file

Property changes on: trunk/wb/templates/round/screen.css
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: trunk/wb/templates/round/preview.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/preview.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/info.php
===================================================================
--- trunk/wb/templates/round/info.php	(revision 864)
+++ trunk/wb/templates/round/info.php	(revision 865)
@@ -1,34 +1,45 @@
 <?php
+/**
+ * $Id$
+ * Website Baker template: round
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file defines the template variables required by Website Baker.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
 
-// $Id$
+// OBLIGATORY WEBSITE BAKER VARIABLES
+$template_directory				= 'round';
+$template_name						= 'Round';
+$template_version					= '2.70';
+$template_platform				= '2.7';
+$template_author					= 'Ryan Djurovich, C. Sommer';
+$template_license					= '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>';
+$template_license_terms		= '-';
+$template_description			= 'Default template for Website Baker. Simular to the box template, but with rounded edges.';
 
-/*
+// OPTIONAL VARIABLES FOR ADDITIONAL MENUES AND BLOCKS
+// $menu[1]								= '';
+// $menu[2]								= '';
+// $block[1]							= '';
+// $block[2]							= '';
 
- 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
-
-*/
-
-$template_directory = 'round';
-$template_name = 'Round';
-$template_version = '2.6';
-$template_platform = '2.6.x';
-$template_author = 'Ryan Djurovich';
-$template_license = 'GNU General Public License';
-$template_description = 'Default template for Website Baker 2.2.x. Simular to the box template, but with rounded edges.';
-
 ?>
\ No newline at end of file
Index: trunk/wb/templates/round/template.css
===================================================================
--- trunk/wb/templates/round/template.css	(nonexistent)
+++ trunk/wb/templates/round/template.css	(revision 865)
@@ -0,0 +1,148 @@
+/**
+ * $Id$
+ * Website Baker template: allcss
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file contains all CSS definitions required to display the template
+ * in the Website Baker frontend. 
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
+body,td,th {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000;
+}
+body {
+	background-color: #036;
+	background-image: url(images/background.jpg);
+	background-repeat: repeat-x;
+	margin: 10px;
+}
+a:link, a:visited, a:active {
+	color: #036;
+	text-decoration: none;
+}
+a:hover {
+	color: #369;
+	text-decoration: none;
+}
+hr {
+	margin: 15px 0px 15px 0px;
+	color: #036;
+	height: 1px;
+	width: 100%;
+}
+h1 {
+	font-size: 18px;
+	color: #036;
+	margin: 5px 0px 5px 0px;
+}
+h2 {
+	font-size: 15px;
+	color: #369;
+	margin: 15px 0px 5px 0px;
+}
+form {
+	margin: 0;
+}
+.header {
+	width: 750px;
+	height: 80px;
+	background-color: #FFF;
+	vertical-align: top;
+}
+.menu {
+	vertical-align: top;
+	background-color: #FFF;
+	width: 170px;
+	padding: 0px;
+}
+.menu ul, .menu li{
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+}
+.menu ul {
+	border-bottom: 0px;
+	background-color: #036;
+}
+.menu ul ul {
+	padding-left: 10px;
+}
+.menu a:link, .menu a:visited, .menu a:active {
+	padding: 4px 10px 4px 10px;
+	color: #FFF;
+	display: block;
+	background-color: #036;
+	text-decoration: none;
+}
+.menu a:hover {
+	background-color: #369;
+	text-decoration: none;
+}
+.menu_current {
+	font-weight: bold;
+}
+.highlight {
+	background-color: #D0D0D0;
+}
+.border {
+	font-size: 1px;
+	height: 10px;
+}
+.login {
+	padding: 2px 10px 2px 10px;
+	font-size: 10px;
+	background-color: #036;
+	color: #FFF;
+	text-align: center;
+}
+.login input {
+	width: 95%;
+	font-size: 10px;
+}
+.login a:link, .login a:visited, .login a:active {
+	color: #DDD;
+	text-decoration: none;
+}
+.login a:hover {
+	color: #FFF;
+	text-decoration: none;
+}
+.powered_by {
+	padding: 3px 0px 0px 15px;
+	background-color: #FFF;
+}
+.content {
+	padding: 10px;
+	background-color: #FFF;
+	height: 300px;
+	vertical-align: top;
+	text-align: left;
+}
+.footer {
+	padding: 5px;
+	height: 20px;
+	color: #FFF;
+	vertical-align: middle;
+	text-align: center;
+}
\ No newline at end of file
Index: trunk/wb/templates/round/print.css
===================================================================
--- trunk/wb/templates/round/print.css	(revision 864)
+++ trunk/wb/templates/round/print.css	(revision 865)
@@ -1,18 +1,45 @@
+/**
+ * $Id$
+ * Website Baker template: round
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file defines the CSS styles used for print devices.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
 body,td,th {
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 	font-size: 12px;
-	color: #000000;
+	color: #000;
 }
 body {
-	background-color: #FFFFFF;
+	background-color: #FFF;
 	margin: 0px;
 }
 a:link, a:visited, a:active {
-	color: #003366;
+	color: #036;
 	text-decoration: none;
 }
 a:hover {
-	color: #336699;
+	color: #369;
 	text-decoration: none;
 }
 .header, .menu, .search, .powered_by, .footer {
Index: trunk/wb/templates/round/images/footer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/images/footer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/images/banner.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/images/banner.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/images/powered.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/images/powered.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/images/menu_top.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/images/menu_top.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/images/menu_bottom.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/images/menu_bottom.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/images/index.php
===================================================================
--- trunk/wb/templates/round/images/index.php	(nonexistent)
+++ trunk/wb/templates/round/images/index.php	(revision 865)
@@ -0,0 +1,32 @@
+<?php
+/**
+ * $Id$
+ * Website Baker template: round
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file prevents directory listing.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
+// prevent directory listing
+header('Location: ../../../index.php');
+
+?>
\ No newline at end of file
Index: trunk/wb/templates/round/images/background.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/round/images/background.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/round/index.php
===================================================================
--- trunk/wb/templates/round/index.php	(revision 864)
+++ trunk/wb/templates/round/index.php	(revision 865)
@@ -1,72 +1,79 @@
 <?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
-
+/**
+ * $Id$
+ * Website Baker template: round
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file contains the overall template markup and the Website Baker
+ * template functions to add the contents from the database.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
 */
 
-if(!defined('WB_URL')) {
-	header('Location: ../index.php');
-	exit(0);
-}
+// prevent this file from being accessed directly
+if (!defined('WB_PATH')) die(header('Location: ../../../index.php'));
 
+// TEMPLATE CODE STARTS BELOW
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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" />
-<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; 
-?>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php 
+	echo defined('DEFAULT_CHARSET') ? DEFAULT_CHARSET : 'utf-8'; ?>" />
+	<meta name="description" content="<?php page_description(); ?>" />
+	<meta name="keywords" content="<?php page_keywords(); ?>" />
+	<?php 
+	// automatically include optional WB module files (frontend.css, frontend.js)
+	if (function_exists('register_frontend_modfiles')) {
+		register_frontend_modfiles('css');
+		register_frontend_modfiles('js');
+	} ?>
+	<link rel="stylesheet" type="text/css" href="<?php 
+		echo TEMPLATE_DIR; ?>/template.css" media="screen,projection" />
+	<link rel="stylesheet" type="text/css" href="<?php 
+		echo TEMPLATE_DIR; ?>/print.css" media="print" />
+	<title><?php page_title('', '[WEBSITE_TITLE]'); ?></title>
 </head>
+
 <body>
 
 <table cellpadding="0" cellspacing="0" border="0" align="center" class="main" width="750">
 <tr>
 	<td colspan="2" class="header" height="80">
-		<a href="<?php echo WB_URL; ?>"><img src="<?php echo TEMPLATE_DIR; ?>/banner.jpg" border="0" width="750" height="80" alt="<?php page_title('', '[WEBSITE_TITLE]'); ?>" /></a>
+		<a href="<?php echo WB_URL; ?>">
+			<img src="<?php echo TEMPLATE_DIR; ?>/images/banner.jpg" border="0" width="750" height="80" alt="<?php 
+			page_title('', '[WEBSITE_TITLE]'); ?>" />
+		</a>
 	</td>
 </tr>
 <tr>
 	<?php
-	// Only show menu items if we are supposed to
+	// navigation menu
 	if(SHOW_MENU) {
 	?>	
-	<td style="padding: 10px; background-color: #FFFFFF;" valign="top">
+	<td style="padding: 10px; background-color: #FFF;" valign="top">
 		<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" class="menu">
 		<tr>
 			<td class="border">
-				<img src="<?php echo TEMPLATE_DIR; ?>/menu_top.gif" border="0" alt="" />
+				<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_top.gif" border="0" alt="" />
 			</td>
 		</tr>
 		<tr>
@@ -76,17 +83,21 @@
 		</tr>
 		<tr>
 			<td class="border">
-				<img src="<?php echo TEMPLATE_DIR; ?>/menu_bottom.gif" border="0" alt="" />
+				<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_bottom.gif" border="0" alt="" />
 			</td>
 		</tr>
 		</table>
 		
-		<?php if(SHOW_SEARCH) { ?>
-		<form name="search" action="<?php echo WB_URL.'/search/index.php'; ?>" method="get">
+		
+		<!-- frontend search -->
+		<?php if (SHOW_SEARCH) { ?>
+		<form name="search" action="<?php echo WB_URL; ?>/search/index.php" method="get">
+			<input type="hidden" name="referrer" value="<?php
+				echo defined('REFERRER_ID') ? REFERRER_ID : PAGE_ID; ?>" />
 			<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
 				<tr>
 					<td class="border">
-						<img src="<?php echo TEMPLATE_DIR; ?>/menu_top.gif" border="0" alt="" />
+						<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_top.gif" border="0" alt="" />
 					</td>
 				</tr>
 				<tr>
@@ -101,7 +112,7 @@
 				</tr>
 				<tr>
 					<td class="border">
-						<img src="<?php echo TEMPLATE_DIR; ?>/menu_bottom.gif" border="0" alt="" />
+						<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_bottom.gif" border="0" alt="" />
 					</td>
 				</tr>
 			</table>
@@ -116,7 +127,7 @@
 			<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
 			<tr>
 				<td class="border">
-					<img src="<?php echo TEMPLATE_DIR; ?>/menu_top.gif" border="0" alt="" />
+					<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_top.gif" border="0" alt="" />
 				</td>
 			</tr>
 			<tr>
@@ -146,13 +157,14 @@
 			</tr>
 			<tr>
 				<td class="login">
-					<input type="submit" name="submit" value="<?php echo $TEXT['LOGIN']; ?>" style="margin-top: 3px; text-transform: uppercase;" />
+					<input type="submit" name="submit" value="<?php 
+						echo $TEXT['LOGIN']; ?>" style="margin-top: 3px; text-transform: uppercase;" />
 				</td>
 			</tr>
 			<tr>
 				<td class="login">
 					<a href="<?php echo FORGOT_URL; ?>"><?php echo $TEXT['FORGOT_DETAILS']; ?></a>
-					<?php if(is_numeric(FRONTEND_SIGNUP)) { ?>
+					<?php if (is_numeric(FRONTEND_SIGNUP)) { ?>
 						<a href="<?php echo SIGNUP_URL; ?>"><?php echo $TEXT['SIGNUP']; ?></a>
 					<?php } ?>
 				</td>
@@ -159,7 +171,7 @@
 			</tr>
 			<tr>
 				<td class="border">
-					<img src="<?php echo TEMPLATE_DIR; ?>/menu_bottom.gif" border="0" alt="" />
+					<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_bottom.gif" border="0" alt="" />
 				</td>
 			</tr>
 			</table>
@@ -166,7 +178,7 @@
 		
 		</form>
 		<?php
-		} elseif(FRONTEND_LOGIN AND $wb->is_authenticated()) {
+		} elseif (FRONTEND_LOGIN AND $wb->is_authenticated()) {
 		?>
 		<form name="logout" action="<?php echo LOGOUT_URL; ?>" method="post">
 			
@@ -173,7 +185,7 @@
 			<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;">
 			<tr>
 				<td class="border">
-					<img src="<?php echo TEMPLATE_DIR; ?>/menu_top.gif" border="0" alt="" />
+					<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_top.gif" border="0" alt="" />
 				</td>
 			</tr>
 			<tr>
@@ -188,7 +200,8 @@
 			</tr>
 			<tr>
 				<td class="login">
-					<input type="submit" name="submit" value="<?php echo $MENU['LOGOUT']; ?>" style="margin-top: 3px; text-transform: uppercase;" />
+					<input type="submit" name="submit" value="<?php 
+						echo $MENU['LOGOUT']; ?>" style="margin-top: 3px; text-transform: uppercase;" />
 				</td>
 			</tr>
 			<tr>
@@ -198,7 +211,7 @@
 			</tr>
 			<tr>
 				<td class="border">
-					<img src="<?php echo TEMPLATE_DIR; ?>/menu_bottom.gif" border="0" alt="" />
+					<img src="<?php echo TEMPLATE_DIR; ?>/images/menu_bottom.gif" border="0" alt="" />
 				</td>
 			</tr>
 			</table>
@@ -214,20 +227,15 @@
 	</td>
 </tr>
 <tr>
-	<?php
-	// Only show menu items if we are supposed to
-	if(defined('SHOW_MENU') AND SHOW_MENU == true) {
-	?>	
 	<td height="20" width="155" valign="bottom" class="powered_by">
 		<a href="http://www.websitebaker.org/" target="_blank">
-			<img src="<?php echo TEMPLATE_DIR; ?>/powered.jpg" border="0" alt="Powered By Website Baker" />
+			<img src="<?php echo TEMPLATE_DIR; ?>/images/powered.jpg" border="0" alt="Powered By Website Baker" />
 		</a>
 	</td>
-	<?php } ?>
 </tr>
 <tr>
 	<td colspan="2" class="border">
-		<img src="<?php echo TEMPLATE_DIR; ?>/footer.png" border="0" alt="" />
+		<img src="<?php echo TEMPLATE_DIR; ?>/images/footer.png" border="0" alt="" />
 	</td>
 </tr>
 <tr>
Index: trunk/wb/templates/simple/screen.css
===================================================================
--- trunk/wb/templates/simple/screen.css	(revision 864)
+++ trunk/wb/templates/simple/screen.css	(nonexistent)
@@ -1,63 +0,0 @@
-body,td,th {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-}
-body {
-	background-color: #333333;
-	margin: 10px;
-}
-a:link, a:visited, a:active {
-	color: #003366;
-	text-decoration: none;
-}
-a:hover {
-	color: #336699;
-	text-decoration: none;
-}
-form {
-	margin: 0;
-}
-h1, h2, h3, h4, h5 {
-	margin: 5px 0px 5px 0px;
-}
-.header {
-	background-color: #336699;
-	vertical-align: middle;
-	text-align: center;
-	color: #FFFFFF;
-	height: 50px;
-	font-size: 20px;
-	font-weight: bold;
-}
-.menu {
-	background-color: #EEEEEE;
-	padding: 10px;
-	width: 150px;
-	vertical-align: top;
-}
-.menu ul, .menu li {
-	list-style-type: none;
-	display: block;
-	margin: 0;
-	padding: 0;
-	padding-left: 5px;
-}
-.menu_current {
-	font-weight: bold;
-}
-.highlight {
-	background-color: #D0D0D0;
-}
-.content {
-	background-color: #FFFFFF;
-	padding: 20px;
-	height: 400px;
-	vertical-align: top;
-}
-.footer {
-	background-color: #DDDDDD;
-	text-align: center;
-	font-size: 10px;
-	height: 10px;
-}
\ No newline at end of file

Property changes on: trunk/wb/templates/simple/screen.css
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: trunk/wb/templates/simple/preview.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/templates/simple/preview.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/templates/simple/info.php
===================================================================
--- trunk/wb/templates/simple/info.php	(revision 864)
+++ trunk/wb/templates/simple/info.php	(revision 865)
@@ -1,34 +1,45 @@
 <?php
+/**
+ * $Id$
+ * Website Baker template: simple
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file defines the template variables required by Website Baker.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
 
-// $Id$
+// OBLIGATORY WEBSITE BAKER VARIABLES
+$template_directory				= 'simple';
+$template_name						= 'Simple';
+$template_version					= '2.70';
+$template_platform				= '2.7';
+$template_author					= 'Ryan Djurovich, C. Sommer';
+$template_license					= '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>';
+$template_license_terms		= '-';
+$template_description			= 'Default template for Website Baker. This template is designed for developers to learn how to make templates easily. Please note this template only supports 2 page levels.';
 
-/*
+// OPTIONAL VARIABLES FOR ADDITIONAL MENUES AND BLOCKS
+// $menu[1]								= '';
+// $menu[2]								= '';
+// $block[1]							= '';
+// $block[2]							= '';
 
- 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
-
-*/
-
-$template_directory = 'simple';
-$template_name = 'Simple';
-$template_version = '2.6';
-$template_platform = '2.6.x';
-$template_author = 'Ryan Djurovich';
-$template_license = 'GNU General Public License';
-$template_description = 'This template is designed for developers to learn how to make templates easily. Please note this template only supports 2 page levels.';
-
 ?>
\ No newline at end of file
Index: trunk/wb/templates/simple/template.css
===================================================================
--- trunk/wb/templates/simple/template.css	(nonexistent)
+++ trunk/wb/templates/simple/template.css	(revision 865)
@@ -0,0 +1,91 @@
+/**
+ * $Id$
+ * Website Baker template: simple
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file contains all CSS definitions required to display the template
+ * in the Website Baker frontend. 
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
+body,td,th {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+}
+body {
+	background-color: #333333;
+	margin: 10px;
+}
+a:link, a:visited, a:active {
+	color: #003366;
+	text-decoration: none;
+}
+a:hover {
+	color: #336699;
+	text-decoration: none;
+}
+form {
+	margin: 0;
+}
+h1, h2, h3, h4, h5 {
+	margin: 5px 0px 5px 0px;
+}
+.header {
+	background-color: #336699;
+	vertical-align: middle;
+	text-align: center;
+	color: #FFFFFF;
+	height: 50px;
+	font-size: 20px;
+	font-weight: bold;
+}
+.menu {
+	background-color: #EEEEEE;
+	padding: 10px;
+	width: 150px;
+	vertical-align: top;
+}
+.menu ul, .menu li {
+	list-style-type: none;
+	display: block;
+	margin: 0;
+	padding: 0;
+	padding-left: 5px;
+}
+.menu_current {
+	font-weight: bold;
+}
+.highlight {
+	background-color: #D0D0D0;
+}
+.content {
+	background-color: #FFFFFF;
+	padding: 20px;
+	height: 400px;
+	vertical-align: top;
+}
+.footer {
+	background-color: #DDDDDD;
+	text-align: center;
+	font-size: 10px;
+	height: 10px;
+}
\ No newline at end of file
Index: trunk/wb/templates/simple/print.css
===================================================================
--- trunk/wb/templates/simple/print.css	(revision 864)
+++ trunk/wb/templates/simple/print.css	(revision 865)
@@ -1,3 +1,30 @@
+/**
+ * $Id$
+ * Website Baker template: simple
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file defines the CSS styles used for print devices.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
 body,td,th {
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 	font-size: 12px;
Index: trunk/wb/templates/simple/index.php
===================================================================
--- trunk/wb/templates/simple/index.php	(revision 864)
+++ trunk/wb/templates/simple/index.php	(revision 865)
@@ -1,54 +1,58 @@
 <?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
-
+/**
+ * $Id$
+ * Website Baker template: simple
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file contains the overall template markup and the Website Baker
+ * template functions to add the contents from the database.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
 */
 
-if(!defined('WB_URL')) {
-	header('Location: ../index.php');
-	exit(0);
-}
+// prevent this file from being accessed directly
+if (!defined('WB_PATH')) die(header('Location: ../../index.php'));
 
+// TEMPLATE CODE STARTS BELOW
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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" />
-<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; 
-?>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php 
+	echo defined('DEFAULT_CHARSET') ? DEFAULT_CHARSET : 'utf-8'; ?>" />
+	<meta name="description" content="<?php page_description(); ?>" />
+	<meta name="keywords" content="<?php page_keywords(); ?>" />
+	<?php 
+	// automatically include optional WB module files (frontend.css, frontend.js)
+	if (function_exists('register_frontend_modfiles')) {
+		register_frontend_modfiles('css');
+		register_frontend_modfiles('js');
+	} ?>
+	<link rel="stylesheet" type="text/css" href="<?php 
+		echo TEMPLATE_DIR; ?>/template.css" media="screen,projection" />
+	<link rel="stylesheet" type="text/css" href="<?php 
+		echo TEMPLATE_DIR; ?>/print.css" media="print" />
+	<title><?php page_title('', '[WEBSITE_TITLE]'); ?></title>
 </head>
+
 <body>
 
 <table cellpadding="5" cellspacing="0" border="0" width="750" align="center">
@@ -64,15 +68,20 @@
 </tr>
 <tr>
 	<td class="menu">
-		<?php if(SHOW_MENU) { /* Only shown menu if we need to */ ?>	
-			Menu: <br />
-			<?php show_menu(); ?>
-		<?php } ?>
+		<?php 
+		if (SHOW_MENU) { 
+			// navigation menu
+			echo $TEXT['MENU'] . ':';
+			show_menu();
+		} ?>
 		
-		<?php if(SHOW_SEARCH) { /* Only show search box if search is enabled */ ?>
+		<?php 
+		if (SHOW_SEARCH) { /* Only show search box if search is enabled */ ?>
 			<br />
-			Search: <br />
+			<?php echo $TEXT['SEARCH']; ?>: <br />
 			<form name="search" action="<?php echo WB_URL; ?>/search/index.php" method="get">
+				<input type="hidden" name="referrer" value="<?php
+					echo defined('REFERRER_ID') ? REFERRER_ID : PAGE_ID; ?>" />
 				<input type="text" name="string" style="width: 100%;" />
 				<input type="submit" name="submit" value="<?php echo $TEXT['SEARCH']; ?>" style="width: 100%;" />
 			</form>