Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 620)
+++ trunk/CHANGELOG	(revision 621)
@@ -12,17 +12,20 @@
 
 ------------------------------------- 2.7.0 -------------------------------------
 27-Jan-2008 Christian Sommer
+!	introduced the WB 2.7 backend style developed by Michael Brinsteiner (escpro), thanks man
 !	added missing ID tags
+27-Jan-2008 Christian Sommer
+!	added missing ID tags
 !	added default language for users to avoid empty language fields
 27-Jan-2008 Matthias Gallas
 +	added kewyword id to new file
 #	Fixed some spelling errors in german language file
-27-Jan-2008 Thomas Hornik
-!	Module form: user supplied input isn't lost on captcha-failure anymore.
-#	fixed 100%-cpu-load-event in CAPTCHA admin-tool.
-+	Added Calc_ttf_image CAPTCHA.
-!	Changed captcha/captcha.php to use table-layout for CAPTCHA.
-!	Some minor changes in CAPTCHA-code.
+27-Jan-2008 Thomas Hornik
+!	Module form: user supplied input isn't lost on captcha-failure anymore.
+#	fixed 100%-cpu-load-event in CAPTCHA admin-tool.
++	Added Calc_ttf_image CAPTCHA.
+!	Changed captcha/captcha.php to use table-layout for CAPTCHA.
+!	Some minor changes in CAPTCHA-code.
 !	Added some text to CAPTCHA admin-tool.
 #	Module form: dropdown "success page" listed foreign private pages, too. Fixed.
 +	Added preview-images for CAPTCHA.
Index: trunk/wb/admin/start/index.php
===================================================================
--- trunk/wb/admin/start/index.php	(revision 620)
+++ trunk/wb/admin/start/index.php	(revision 621)
@@ -59,6 +59,9 @@
 if($admin->get_permission('settings') != true) {
 	$template->set_var('DISPLAY_SETTINGS', 'none');
 }
+if($admin->get_permission('admintools') != true) {
+	$template->set_var('DISPLAY_ADMINTOOLS', 'none');
+}
 
 // Check if installation directory still exists
 if(file_exists(WB_PATH.'/install/')) {
@@ -104,7 +107,6 @@
 
 // Insert section names and descriptions
 $template->set_var(array(
-								'HOME' => $MENU['START'],
 								'PAGES' => $MENU['PAGES'],
 								'MEDIA' => $MENU['MEDIA'],
 								'ADDONS' => $MENU['ADDONS'],
@@ -111,8 +113,7 @@
 								'ACCESS' => $MENU['ACCESS'],
 								'PREFERENCES' => $MENU['PREFERENCES'],
 								'SETTINGS' => $MENU['SETTINGS'],
-								'HELP' => $MENU['HELP'],
-								'VIEW' => $MENU['VIEW'],
+								'ADMINTOOLS' => $MENU['ADMINTOOLS'],
 								'HOME_OVERVIEW' => $OVERVIEW['START'],
 								'PAGES_OVERVIEW' => $OVERVIEW['PAGES'],
 								'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'],
@@ -120,8 +121,7 @@
 								'ACCESS_OVERVIEW' => $access_overview,
 								'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'],
 								'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'],
-								'HELP_OVERVIEW' => $OVERVIEW['HELP'],
-								'VIEW_OVERVIEW' => $OVERVIEW['VIEW']
+								'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS']
 								)
 						);
 
Index: trunk/wb/admin/start/template.html
===================================================================
--- trunk/wb/admin/start/template.html	(revision 620)
+++ trunk/wb/admin/start/template.html	(revision 621)
@@ -69,60 +69,60 @@
 		</tr>
 		</table>
 		
-		<table cellpadding="0" cellspacing="0" border="0" class="section">
+		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_ADDONS};">
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/preferences/index.php">
-					<img src="{ADMIN_URL}/images/icons/preferences.png" border="0" />
+				<a href="{ADMIN_URL}/addons/index.php">
+					<img src="{ADMIN_URL}/images/icons/addons.png" border="0" />
 				</a>
 			</td>
 			<td class="title">
-				<a href="{ADMIN_URL}/preferences/index.php">{PREFERENCES}</a>
+				<a href="{ADMIN_URL}/addons/index.php">{ADDONS}</a>
 			</td>
 		</tr>
 		<tr>
 			<td class="description">
-				{PREFERENCES_OVERVIEW}
+				{ADDONS_OVERVIEW}
 			</td>
 		</tr>
 		</table>
-		
-		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_ACCESS};">
+
+		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_SETTINGS};">
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/access/index.php">
-					<img src="{ADMIN_URL}/images/icons/access.png" border="0" />
+				<a href="{ADMIN_URL}/settings/index.php">
+					<img src="{ADMIN_URL}/images/icons/settings.png" border="0" />
 				</a>
 			</td>
 			<td class="title">
-				<a href="{ADMIN_URL}/access/index.php">{ACCESS}</a>
+				<a href="{ADMIN_URL}/settings/index.php">{SETTINGS}</a>
 			</td>
 		</tr>
 		<tr>
 			<td class="description">
-				{ACCESS_OVERVIEW}
+				{SETTINGS_OVERVIEW}
 			</td>
 		</tr>
 		</table>
-		
-		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_SETTINGS};">
+
+		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_ACCESS};">
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/settings/index.php">
-					<img src="{ADMIN_URL}/images/icons/settings.png" border="0" />
+				<a href="{ADMIN_URL}/access/index.php">
+					<img src="{ADMIN_URL}/images/icons/access.png" border="0" />
 				</a>
 			</td>
 			<td class="title">
-				<a href="{ADMIN_URL}/settings/index.php">{SETTINGS}</a>
+				<a href="{ADMIN_URL}/access/index.php">{ACCESS}</a>
 			</td>
 		</tr>
 		<tr>
 			<td class="description">
-				{SETTINGS_OVERVIEW}
+				{ACCESS_OVERVIEW}
 			</td>
 		</tr>
 		</table>
-		
+
 	</td>
 	<td width="15">
 		&nbsp;
@@ -146,61 +146,43 @@
 			</td>
 		</tr>
 		</table>
-		
+
 		<table cellpadding="0" cellspacing="0" border="0" class="section">
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="http://www.websitebaker.org/go/help/{WB_VERSION}" target="_blank">
-					<img src="{ADMIN_URL}/images/icons/help.png" border="0" />
+				<a href="{ADMIN_URL}/preferences/index.php">
+					<img src="{ADMIN_URL}/images/icons/preferences.png" border="0" />
 				</a>
 			</td>
 			<td class="title">
-				<a href="http://www.websitebaker.org/go/help/{WB_VERSION}" target="_blank">{HELP}</a>
+				<a href="{ADMIN_URL}/preferences/index.php">{PREFERENCES}</a>
 			</td>
 		</tr>
 		<tr>
 			<td class="description">
-				{HELP_OVERVIEW}
+				{PREFERENCES_OVERVIEW}
 			</td>
 		</tr>
 		</table>
-		
-		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_ADDONS};">
+
+		<table cellpadding="0" cellspacing="0" border="0" class="section" style="display: {DISPLAY_ADMINTOOLS};">
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/addons/index.php">
-					<img src="{ADMIN_URL}/images/icons/addons.png" border="0" />
+				<a href="{ADMIN_URL}/admintools/index.php">
+					<img src="{ADMIN_URL}/images/icons/admintools.png" border="0" />
 				</a>
 			</td>
 			<td class="title">
-				<a href="{ADMIN_URL}/addons/index.php">{ADDONS}</a>
+				<a href="{ADMIN_URL}/admintools/index.php">{ADMINTOOLS}</a>
 			</td>
 		</tr>
 		<tr>
 			<td class="description">
-				{ADDONS_OVERVIEW}
+				{ADMINTOOLS_OVERVIEW}
 			</td>
 		</tr>
 		</table>
-		
-		<table cellpadding="0" cellspacing="0" border="0" class="section" style="width: 99%;" align="center">
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{WB_URL}/" target="_blank">
-					<img src="{ADMIN_URL}/images/icons/view.png" border="0" />
-				</a>
-			</td>
-			<td class="title" width="88%">
-				<a href="{WB_URL}/" target="_blank">{VIEW}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{VIEW_OVERVIEW}
-			</td>
-		</tr>
-		</table>
-		
+
 	</td>
 </tr>
 </table>
Index: trunk/wb/admin/interface/stylesheet.css
===================================================================
--- trunk/wb/admin/interface/stylesheet.css	(revision 620)
+++ trunk/wb/admin/interface/stylesheet.css	(revision 621)
@@ -4,8 +4,8 @@
 	color: #000000;
 }
 body {
-	background-color: #557799;
-	background-image: url(../interface/background.png);
+	background-color: #95C8F0;
+	background-image: url(background.png);
 	background-repeat: repeat-x;
 	margin: 0px;
 }
@@ -20,7 +20,7 @@
 h1 {
 	text-align: center;
 	font-size: 20px;
-	color: #003366;
+	color: #000000;
 	text-transform: uppercase;
 }
 h2 {
@@ -46,9 +46,11 @@
 .menu {
 	margin: 0;
 	padding: 0;
-	padding-top: 10px;
-	padding-bottom: 4px;
+	padding-top: 8px;
+	padding-bottom: 10px;
 	padding-left: 8px;
+    background: #000 url(menu.png) ;
+    background-repeat:repeat-x;
 }
 .menu li {
 	list-style-type: none;
@@ -57,19 +59,24 @@
 }
 .menu a, .menu a:link, .menu a:active, .menu a:visited {
 	border-bottom: 0;
-	padding: 4px 3px 4px 3px;
-	color: #003366;
+	padding: 7px 11px 9px 11px;
+	color: #fff;
 }
 .menu a:hover {
 	text-decoration: none;
-	color: #336699;
+	color: #fff;
+    background: #fff url(menuo.png) ;
+    background-repeat:repeat-x;
 }
 .current a, .current a:link, .current a:active, .current a:visited {
-	background-color: #FFFFFF;
-	color: #000000;
+	background: #fff url(menuo.png) ;
+         background-repeat:repeat-x;
+	color: #fff;
 }
 .content {
-	background-color: #FFFFFF;
+	background: #fff;
+    background: #fff url(bgtitle.png) ;
+    background-repeat:repeat-x;
 	padding: 20px;
 	height: 280px;
 	width: 750px;
@@ -77,10 +84,10 @@
 	vertical-align: top;
 }
 .row_a {
-	background-color: #EEEEEE;
+	background-color: #BDE4F4;
 }
 .row_b {
-	background-color: #DDDDDD;
+	background-color: #EBF7FC;
 }
 .hide {
 	display: none;
Index: trunk/wb/admin/interface/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/interface/menu.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/admin/interface/menu.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/admin/interface/header.html
===================================================================
--- trunk/wb/admin/interface/header.html	(revision 620)
+++ trunk/wb/admin/interface/header.html	(revision 621)
@@ -17,14 +17,16 @@
 <table cellpadding="0" cellspacing="0" border="0" width="770" align="center">
 <tr>
 	<td width="60" valign="top">
-		<img src="{INTERFACE_DIR}/logo.png" border="0" width="60" height="60" alt="Logo" />
+		<a href="{WB_URL}/admin" title="Admin Startmenue"><img src="{INTERFACE_DIR}/logo.png" border="0" alt="Logo" /></a>
 	</td>
 	<td width="5">&nbsp;</td>
-	<td style="font-size: 20px;">
-		<font style="color: #FFFFFF;">Website Baker</font>
-		<font style="color: #DDDDDD;">{TEXT_ADMINISTRATION}</font>
-	</td>
-	<td width="100" align="right" style="padding-top: 10px; padding-right: 15px; color: #D0D0D0;">
+	<td style="font-size: 14px;" valign="top" align="right">
+         <a href="{WB_URL}/admin" title="{TITLE_START}"><img src="{WB_URL}/admin/images/home.png" border="0" alt="{TITLE_START}" /></a>
+         &nbsp;&nbsp;<a href="{URL_VIEW}/" target="_blank" title="{TITLE_VIEW}"><img src="{WB_URL}/admin/images/view.png" border="0" alt="{WB_URL}" /></a>
+	&nbsp; <a href="{URL_HELP}" target="_blank" title="{TITLE_HELP}"><img src="{WB_URL}/admin/images/help.png" border="0" alt="{TITLE_HELP}" /></a>
+         &nbsp; <a href="{WB_URL}/admin/logout" title="{TITLE_LOGOUT}"><img src="{WB_URL}/admin/images/dl.png" border="0" alt="TITLE_LOGOUT" /></a>
+</td>
+	<td width="100" align="right" style="padding-top: 10px; padding-right: 15px; color: #fff;">
 	Version {VERSION}
 	</td>
 </tr>
Index: trunk/wb/admin/interface/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/interface/menuo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: trunk/wb/admin/interface/menuo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/admin/interface/bgtitle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

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

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

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

Property changes on: trunk/wb/admin/images/icons/help.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/admin/images/icons/templates.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/groups.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/media.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/pages.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/settings.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/access.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/preferences.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/users.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/languages.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/addons.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/modules.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/wb/admin/images/icons/admintools.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

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

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

Property changes on: trunk/wb/admin/images/home.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/wb/admin/login/forgot/template.html
===================================================================
--- trunk/wb/admin/login/forgot/template.html	(revision 620)
+++ trunk/wb/admin/login/forgot/template.html	(revision 621)
@@ -11,11 +11,11 @@
 <table cellpadding="0" cellspacing="0" border="0" width="770" align="center">
 <tr>
 	<td width="60" valign="top">
-		<img src="{INTERFACE_URL}/logo.png" width="60" height="60" alt="Logo" />
+		<img src="{INTERFACE_URL}/logo.png" alt="Logo" />
 	</td>
 	<td width="5">&nbsp;</td>
 	<td style="font-size: 20px;">
-		<font style="color: #FFFFFF;">Website Baker</font> 
+		<font style="color: #FFFFFF;">Website Baker</font>
 		<font style="color: #DDDDDD;">{SECTION_FORGOT}</font>
 	</td>
 </tr>
Index: trunk/wb/admin/login/warning.html
===================================================================
--- trunk/wb/admin/login/warning.html	(revision 620)
+++ trunk/wb/admin/login/warning.html	(revision 621)
@@ -9,8 +9,9 @@
 	color: #000000;
 }
 body {
-	background-color: #F8F8F8;
 	margin: 0px;
+    background: #fff url(../interface/background.png) ;
+    background-repeat:repeat-x;
 }
 a:link, a:visited, a:active {
 	color: #003366;
@@ -20,6 +21,12 @@
 	text-decoration: underline;
 	color: #336699;
 }
+h1 {
+	text-align: center;
+	font-size: 16px;
+	color: #fff;
+	text-transform: uppercase;
+}
 hr {
 	height: 1px;
 	color: #336699;
Index: trunk/wb/admin/login/template.html
===================================================================
--- trunk/wb/admin/login/template.html	(revision 620)
+++ trunk/wb/admin/login/template.html	(revision 621)
@@ -11,11 +11,11 @@
 <table cellpadding="0" cellspacing="0" border="0" width="770" align="center">
 <tr>
 	<td width="60" valign="top">
-		<img src="{INTERFACE_DIR_URL}/logo.png" width="60" height="60" alt="Logo" />
+		<img src="{INTERFACE_DIR_URL}/logo.png" alt="Logo" />
 	</td>
 	<td width="5">&nbsp;</td>
 	<td style="font-size: 20px;">
-		<font style="color: #FFFFFF;">Website Baker</font> 
+		<font style="color: #FFFFFF;">Website Baker</font>
 		<font style="color: #DDDDDD;">{SECTION_LOGIN}</font>
 	</td>
 </tr>
Index: trunk/wb/framework/class.admin.php
===================================================================
--- trunk/wb/framework/class.admin.php	(revision 620)
+++ trunk/wb/framework/class.admin.php	(revision 621)
@@ -95,6 +95,17 @@
 		} else {
 			$charset='utf-8';
 		}
+
+		// work out the URL for the 'View menu' link in the WB backend
+		// if the page_id is set, show this page otherwise show the root directory of WB
+		$view_url = WB_URL;
+		if(isset($_GET['page_id'])) {
+			// extract page link from the database
+			$result = @$database->query("SELECT link FROM " .TABLE_PREFIX ."pages WHERE page_id = '" .(int) $_GET['page_id'] ."'");
+			$row = @$result->fetchRow();
+			if($row) $view_url .= PAGES_DIRECTORY .$row['link']. PAGE_EXTENSION;
+		}
+
 		$header_template->set_var(	array(
 													'SECTION_NAME' => $MENU[strtoupper($this->section_name)],
 													'INTERFACE_DIR' => ADMIN_URL.'/interface',
@@ -104,24 +115,19 @@
 													'CHARSET' => $charset,
 													'VERSION' => VERSION,
 													'WB_URL' => WB_URL,
+													'TITLE_START' => $MENU['START'],
+													'TITLE_VIEW' => $MENU['VIEW'],
+													'TITLE_HELP' => $MENU['HELP'],
+													'TITLE_LOGOUT' =>  $MENU['LOGOUT'],
+													'URL_VIEW' => $view_url,
+													'URL_HELP' => 'http://www.websitebaker.org/help/'.WB_VERSION,
 													'BACKEND_MODULE_CSS' => $this->register_backend_modfiles('css'),	// adds backend.css
 													'BACKEND_MODULE_JS'  => $this->register_backend_modfiles('js')		// adds backend.js
 													)
 											);
 
-		// work out the URL for the 'View menu' link in the WB backend
-		// if the page_id is set, show this page otherwise show the root directory of WB
-		$view_url = WB_URL;
-		if(isset($_GET['page_id'])) {
-			// extract page link from the database
-			$result = @$database->query("SELECT link FROM " .TABLE_PREFIX ."pages WHERE page_id = '" .(int) $_GET['page_id'] ."'");
-			$row = @$result->fetchRow();
-			if($row) $view_url .= PAGES_DIRECTORY .$row['link']. PAGE_EXTENSION;
-		}
-
 		// Create the menu
 		$menu = array(
-					array(ADMIN_URL.'/start/index.php', '', $MENU['START'], 'start', 0),
 					array(ADMIN_URL.'/pages/index.php', '', $MENU['PAGES'], 'pages', 1),
 					array(ADMIN_URL.'/media/index.php', '', $MENU['MEDIA'], 'media', 1),
 					array(ADMIN_URL.'/addons/index.php', '', $MENU['ADDONS'], 'addons', 1),
@@ -128,10 +134,7 @@
 					array(ADMIN_URL.'/preferences/index.php', '', $MENU['PREFERENCES'], 'preferences', 0),
 					array(ADMIN_URL.'/settings/index.php', '', $MENU['SETTINGS'], 'settings', 1),
 					array(ADMIN_URL.'/admintools/index.php', '', $MENU['ADMINTOOLS'], 'admintools', 1),
-					array(ADMIN_URL.'/access/index.php', '', $MENU['ACCESS'], 'access', 1),
-					array('http://www.websitebaker.org/help/'.WB_VERSION, '_blank', $MENU['HELP'], 'help', 0),
-					array($view_url, '_blank', $MENU['VIEW'], 'view', 0),
-					array(ADMIN_URL.'/logout/index.php', '', $MENU['LOGOUT'], 'logout', 0)
+					array(ADMIN_URL.'/access/index.php', '', $MENU['ACCESS'], 'access', 1)
 					);
 		$header_template->set_block('header_block', 'linkBlock', 'link');
 		foreach($menu AS $menu_item) {
Index: trunk/wb/framework/class.frontend.php
===================================================================
--- trunk/wb/framework/class.frontend.php	(revision 620)
+++ trunk/wb/framework/class.frontend.php	(revision 621)
@@ -390,8 +390,7 @@
 		require_once(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php');
 		echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 		<head><title>'.$MESSAGE['GENERIC']['WEBSITE_UNDER_CONSTRUCTION'].'</title>
-		<style type="text/css"><!-- body { font-family: Verdana, Arial, Helvetica, sans-serif;
-		font-size: 12px; color: #000000;	background-color: #FFFFFF;	margin: 20px; text-align: center; }
+		<style type="text/css"><!-- body{ font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 12px; background-image: url("admin/interface/background.png");background-repeat: repeat-x; margin: 20px; text-align: center; }
 		h1 { margin: 0; padding: 0; }--></style></head><body>
 		<h1>'.$MESSAGE['GENERIC']['WEBSITE_UNDER_CONSTRUCTION'].'</h1><br />
 		'.$MESSAGE['GENERIC']['PLEASE_CHECK_BACK_SOON'].'</body></html>';
Index: trunk/wb/install/index.php
===================================================================
--- trunk/wb/install/index.php	(revision 620)
+++ trunk/wb/install/index.php	(revision 621)
@@ -76,7 +76,7 @@
 <table cellpadding="0" cellspacing="0" border="0" width="750" align="center">
 <tr>
 	<td width="60" valign="top">
-		<img src="../admin/interface/logo.png" width="60" height="60" alt="Logo" />
+		<img src="../admin/interface/logo.png" alt="Logo" />
 	</td>
 	<td width="5">&nbsp;</td>
 	<td style="font-size: 20px;">
Index: trunk/wb/languages/EN.php
===================================================================
--- trunk/wb/languages/EN.php	(revision 620)
+++ trunk/wb/languages/EN.php	(revision 621)
@@ -69,6 +69,7 @@
 $OVERVIEW['GROUPS'] = 'Manage user groups and their system permissions...';
 $OVERVIEW['HELP'] = 'Got a questions? Find your answer...';
 $OVERVIEW['VIEW'] = 'Quickly view and browse your website in a new window...';
+$OVERVIEW['ADMINTOOLS'] = 'Access the Website Baker administration tools...';
 
 // Headings
 $HEADING['MODIFY_DELETE_PAGE'] = 'Modify/Delete Page';
Index: trunk/wb/languages/DE.php
===================================================================
--- trunk/wb/languages/DE.php	(revision 620)
+++ trunk/wb/languages/DE.php	(revision 621)
@@ -69,6 +69,7 @@
 $OVERVIEW['GROUPS'] = 'Verwaltung von Gruppen und Ihrer Zugangsberechtigungen...';
 $OVERVIEW['HELP'] = 'Noch Fragen? Hier finden Sie Antworten';
 $OVERVIEW['VIEW'] = 'Ansicht Ihrer Webseite in einem neuen Fenster...';
+$OVERVIEW['ADMINTOOLS'] = 'Zugriff auf die Website Baker Verwaltungsprogramme...';
 
 // Headings
 $HEADING['MODIFY_DELETE_PAGE'] = 'Seite &auml;ndern/Seite l&ouml;schen';
Index: trunk/wb/modules/fckeditor/wb_config/wb_fckconfig.js
===================================================================
--- trunk/wb/modules/fckeditor/wb_config/wb_fckconfig.js	(revision 620)
+++ trunk/wb/modules/fckeditor/wb_config/wb_fckconfig.js	(revision 621)
@@ -129,6 +129,8 @@
    FCKConfig.FontNames	= 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
    FCKConfig.FontSizes	= 'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large' ;
 
+// make the offic2003 skin the default skin
+   FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/office2003/'
 
 /*
    -----------------------------------------------------------------------------------------