Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1427)
+++ branches/2.8.x/CHANGELOG	(revision 1428)
@@ -11,6 +11,10 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.2 -------------------------------------
+07 Feb-2011 Build 1428 Dietmar Woellbrink (Luisehahne)
+! update Argostheme to version 1.5 (Tks to Argos)
+! validation fixes
+! call edit_full_area on the fly
 04 Feb-2011 Build 1427 Dietmar Woellbrink (Luisehahne)
 ! validation fixes in wb_theme
 04 Feb-2011 Build 1426 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/include/editarea/wb_wrapper_edit_area.php
===================================================================
--- branches/2.8.x/wb/include/editarea/wb_wrapper_edit_area.php	(revision 1427)
+++ branches/2.8.x/wb/include/editarea/wb_wrapper_edit_area.php	(revision 1428)
@@ -1,126 +1,138 @@
-<?php
-/**
- *
- * @category        framework
- * @package         include
- * @author		    Christophe Dolivet (EditArea), Christian Sommer (WB wrapper)
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-function loader_help()
-{
-?>
-   <script type="text/javascript">
-      var head= document.getElementsByTagName('head')[0];
-      var script= document.createElement('script');
-      script.type= 'text/javascript';
-      script.src= '<?php print WB_URL; ?>/include/editarea/edit_area_full.js';
-      head.appendChild(script);
-   </script>
-<?php
-
-}
-
-if (!function_exists('registerEditArea')) {
-	function registerEditArea(
-                $id = 'code_area',
-                $syntax = 'php',
-                $syntax_selection = true,
-                $allow_resize = 'both',
-                $allow_toggle = true,
-                $start_highlight = true,
-                $min_width = 600,
-                $min_height = 300,
-                $toolbar = 'default'
-            )
-	{
-
-		// set default toolbar if no user defined was specified
-		if ($toolbar == 'default') {
-			$toolbar = 'search, fullscreen, |, undo, redo, |, select_font, syntax_selection, |, highlight, reset_highlight, |, help';
-			$toolbar = (!$syntax_selection) ? str_replace('syntax_selection,', '', $toolbar) : $toolbar;
-		}
-
-		// check if used Website Baker backend language is supported by EditArea
-		$language = 'en';
-		if (defined('LANGUAGE') && file_exists(dirname(__FILE__) . '/langs/' . strtolower(LANGUAGE) . '.js'))
-        {
-			$language = strtolower(LANGUAGE);
-		}
-
-		// check if highlight syntax is supported by edit_area
-		$syntax = in_array($syntax, array('css', 'html', 'js', 'php', 'xml')) ? $syntax : 'php';
-
-		// check if resize option is supported by edit_area
-		$allow_resize = in_array($allow_resize, array('no', 'both', 'x', 'y')) ? $allow_resize : 'no';
-
-		// return the Javascript code
-		$result = <<< EOT
-		<script type="text/javascript">
-			editAreaLoader.init({
-				id: 				'$id',
-				start_highlight:	$start_highlight,
-				syntax:			    '$syntax',
-				min_width:			$min_width,
-				min_height:		    $min_height,
-				allow_resize: 		'$allow_resize',
-				allow_toggle: 		$allow_toggle,
-				toolbar: 			'$toolbar',
-				language:			'$language'
-			});
-		</script>
-EOT;
-		return $result;	
-	}
-}
-
-if (!function_exists('getEditAreaSyntax')) {
-	function getEditAreaSyntax($file) 
-	{
-		// returns the highlight scheme for edit_area
-		$syntax = 'php';
-		if (is_readable($file)) {
-			// extract file extension
-			$file_info = pathinfo($file);
-		
-			switch ($file_info['extension']) {
-				case 'htm': case 'html': case 'htt':
-					$syntax = 'html';
-	  				break;
-
-	 			case 'css':
-					$syntax = 'css';
-	  				break;
-
-				case 'js':
-					$syntax = 'js';
-					break;
-
-				case 'xml':
-					$syntax = 'xml';
-					break;
-
-	 			case 'php': case 'php3': case 'php4': case 'php5':
-					$syntax = 'php';
-	  				break;
-
-				default:
-					$syntax = 'php';
-					break;
-			}
-		}
-		return $syntax ;
-	}
-}
-
+<?php
+/**
+ *
+ * @category        framework
+ * @package         include
+ * @author		    Christophe Dolivet (EditArea), Christian Sommer (WB wrapper)
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+function loader_help()
+{
+
+?>
+<script type="text/javascript">
+/*<![CDATA[*/
+		try{
+			script = document.createElement("script");
+			script.type = "text/javascript";
+			script.src  = '<?php print WB_URL; ?>/include/editarea/edit_area_full.js';
+			script.charset= "UTF-8";
+			head = document.getElementsByTagName("head");
+			head[0].appendChild(script);
+		}catch(e){
+			document.write("<script type='text/javascript' src='" + url + "' charset=\"UTF-8\"><"+"/script>");
+		}
+/*]]>*/
+</script>
+
+<?php
+
+}
+if (!function_exists('registerEditArea')) {
+	function registerEditArea(
+                $id = 'code_area',
+                $syntax = 'php',
+                $syntax_selection = true,
+                $allow_resize = 'both',
+                $allow_toggle = true,
+                $start_highlight = true,
+                $min_width = 600,
+                $min_height = 450,
+                $toolbar = 'default'  )
+	{
+
+		// set default toolbar if no user defined was specified
+		if ($toolbar == 'default') {
+			$toolbar = 'search, fullscreen, |, undo, redo, |, select_font, syntax_selection, |, highlight, reset_highlight, |, help';
+			$toolbar = (!$syntax_selection) ? str_replace('syntax_selection,', '', $toolbar) : $toolbar;
+		}
+
+		// check if used Website Baker backend language is supported by EditArea
+		$language = 'en';
+		if (defined('LANGUAGE') && file_exists(dirname(__FILE__) . '/langs/' . strtolower(LANGUAGE) . '.js'))
+        {
+			$language = strtolower(LANGUAGE);
+		}
+
+		// check if highlight syntax is supported by edit_area
+		$syntax = in_array($syntax, array('css', 'html', 'js', 'php', 'xml')) ? $syntax : 'php';
+
+		// check if resize option is supported by edit_area
+		$allow_resize = in_array($allow_resize, array('no', 'both', 'x', 'y')) ? $allow_resize : 'no';
+
+		if(!defined('LOADER_HELP')) {
+			loader_help();
+	        define('LOADER_HELP', true);
+		}
+
+		// return the Javascript code
+		$result = <<< EOT
+		<script type="text/javascript">
+			editAreaLoader.init({
+				id: 				'$id',
+				start_highlight:	$start_highlight,
+				syntax:			    '$syntax',
+				min_width:			$min_width,
+				min_height:		    $min_height,
+				allow_resize: 		'$allow_resize',
+				allow_toggle: 		$allow_toggle,
+				toolbar: 			'$toolbar',
+				language:			'$language'
+			});
+		</script>
+EOT;
+		return $result;
+	}
+}
+
+if (!function_exists('getEditAreaSyntax')) {
+	function getEditAreaSyntax($file) 
+	{
+		// returns the highlight scheme for edit_area
+		$syntax = 'php';
+		if (is_readable($file)) {
+			// extract file extension
+			$file_info = pathinfo($file);
+		
+			switch ($file_info['extension']) {
+				case 'htm': case 'html': case 'htt':
+					$syntax = 'html';
+	  				break;
+
+	 			case 'css':
+					$syntax = 'css';
+	  				break;
+
+				case 'js':
+					$syntax = 'js';
+					break;
+
+				case 'xml':
+					$syntax = 'xml';
+					break;
+
+	 			case 'php': case 'php3': case 'php4': case 'php5':
+					$syntax = 'php';
+	  				break;
+
+				default:
+					$syntax = 'php';
+					break;
+			}
+		}
+		return $syntax ;
+	}
+}
+
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/pages/index.php
===================================================================
--- branches/2.8.x/wb/admin/pages/index.php	(revision 1427)
+++ branches/2.8.x/wb/admin/pages/index.php	(revision 1428)
@@ -40,7 +40,7 @@
     return str_replace($entities, $replacements, rawurlencode($string));
 }
 // fixes A URI contains impermissible characters or quotes around the URI are not closed.
-$MESSAGE['PAGES_DELETE_CONFIRM'] = url_encode( ( $MESSAGE['PAGES_DELETE_CONFIRM']) );
+$MESSAGE['PAGES_DELETE_CONFIRM'] = url_encode(  $MESSAGE['PAGES_DELETE_CONFIRM'] );
 
 function set_node ($parent,& $par)
 {
Index: branches/2.8.x/wb/admin/pages/sections.php
===================================================================
--- branches/2.8.x/wb/admin/pages/sections.php	(revision 1427)
+++ branches/2.8.x/wb/admin/pages/sections.php	(revision 1428)
@@ -48,6 +48,17 @@
 	exit();
 }
 */
+/*
+urlencode function and rawurlencode are mostly based on RFC 1738.
+However, since 2005 the current RFC in use for URIs standard is RFC 3986.
+Here is a function to encode URLs according to RFC 3986.
+*/
+function url_encode($string) {
+    $string = html_entity_decode($string,ENT_QUOTES,'UTF-8');
+    $entities = array('%20', '%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%2B', '%24', '%2C', '%2F', '%3F', '%25', '%23', '%5B', '%5D');
+    $replacements = array(' ','!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "+", "$", ",", "/", "?", "%", "#", "[", "]");
+    return str_replace($entities, $replacements, rawurlencode($string));
+}
 
 // Check if we are supposed to add or delete a section
 if(isset($_GET['section_id']) && is_numeric($_GET['section_id']))
@@ -471,7 +482,7 @@
 // Insert language text and messages
 $template->set_var(array(
 					'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'],
-					'TEXT_ARE_YOU_SURE' => $TEXT['ARE_YOU_SURE'],
+					'TEXT_ARE_YOU_SURE' => url_encode($TEXT['ARE_YOU_SURE']),
 					'TEXT_TYPE' => $TEXT['TYPE'],
 					'TEXT_ADD' => $TEXT['ADD'],
 					'TEXT_SAVE' =>  $TEXT['SAVE'],
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1427)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1428)
@@ -52,6 +52,6 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.2.RC5');
-if(!defined('REVISION')) define('REVISION', '1427');
+if(!defined('REVISION')) define('REVISION', '1428');
 
 ?>
Index: branches/2.8.x/wb/framework/class.admin.php
===================================================================
--- branches/2.8.x/wb/framework/class.admin.php	(revision 1427)
+++ branches/2.8.x/wb/framework/class.admin.php	(revision 1428)
@@ -25,7 +25,7 @@
 require_once(ADMIN_PATH.'/interface/version.php');
 
 // Include EditArea wrapper functions
-require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');
+// require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');
 require_once(WB_PATH . '/framework/SecureForm.php');
 
 
Index: branches/2.8.x/wb/framework/module.functions.php
===================================================================
--- branches/2.8.x/wb/framework/module.functions.php	(revision 1427)
+++ branches/2.8.x/wb/framework/module.functions.php	(revision 1428)
@@ -62,7 +62,7 @@
 if (!function_exists('edit_module_css')) {
 	function edit_module_css($mod_dir) {
 		global $page_id, $section_id;
-				
+
 		// check if the required edit_module_css.php file exists
 		if(!file_exists(WB_PATH .'/modules/edit_module_files.php')) return;
 		
@@ -83,7 +83,7 @@
 				<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" />
 				<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" />
 				<input type="hidden" name="mod_dir" value="<?php echo $mod_dir; ?>" />
-				<input type="hidden" name="edit_file" value="<?php echo ($frontend_css) ?'frontend.css' : 'backend.css';?>" />
+				<input type="hidden" name="edit_file" value="<?php echo ($frontend_css) ? 'frontend.css' : 'backend.css';?>" />
 				<input type="hidden" name="action" value="edit" />
 				<input type="submit" value="<?php echo $edit_css_caption;?>" class="mod_<?php echo $mod_dir;?>_edit_css" />
 			</form>
Index: branches/2.8.x/wb/templates/wb_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1427)
+++ branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1428)
@@ -1,20 +1,7 @@
-	* html div{
-		height: 1em;  /* Workaround gegen den 3-Pixel-Bug des Internet Explorers 6 */
-	}
-	html{	/* Schrifteinstellung für das ganze Dokument */
-		font-family: Verdana, "Trebuchet MS", Arial, Helvetica, sans-serif;
-		font-size: 90%;
-		font-weight: normal;
-		color: #404040;
-      overflow: -moz-scrollbars-vertical; /* Force firefox to always show room for a vertical scrollbar */ 
-	}
-	body{
-      margin: 0px 0px 0px 0px;
-      padding: 0px 0px 0px 0px;
-      background: #a8bccb ;
-      text-align: left;
-   }
-body { margin: auto; background-color: #A8BCCB; /*background-image: url(images/background.png);*/ background-repeat: repeat-x; }
+* html div{ height :1em; /* Workaround gegen den 3-Pixel-Bug des Internet Explorers 6 *//* Workaround gegen den 3-Pixel-Bug des Internet Explorers 6 */ }
+html{ /* Schrifteinstellung für das ganze Dokument */ font-family :Verdana, "Trebuchet MS", Arial, Helvetica, sans-serif; font-size :90%; font-weight :normal; color :#404040; overflow :-moz-scrollbars-vertical; /* Force firefox to always show room for a vertical scrollbar *//* Force firefox to always show room for a vertical scrollbar */ }
+body{ margin :0px; padding :0px; background :#a8bccb; text-align :left; }
+body { margin: 0 auto; background-color: #a8bccb; /*background-image: url(images/background.png);*/ background-repeat: repeat-x; }
 
 td,th,input,textarea { color: #000000; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; }
 img { border: 0px; }
@@ -35,7 +22,10 @@
 div.box { width: 100%; margin: -10px 0 0 0; font-size: small; text-align: right; }
 .header { width: 900px; margin: 0 auto; }
 .container { width: 85%; margin: 0 auto; background: #fff url(images/bgtitle.png); background-repeat: repeat-x; }
-.content { padding: 20px; width: 95%; height: 200px; margin: 0 auto; min-height: 300px;  vertical-align: top; }
+.content { padding: 20px; width: 900px;  margin: 0 auto; min-height: 300px;  vertical-align: top; }
+
+#content_container {text-align:center;width:900px;clear:both;margin:0 auto;}
+
 .description { width: 240px; padding: 0px 0px 0px 3px; text-align: left; vertical-align: top; }
 .graphic { width: 50px; border: 4px solid #FDFDFD; padding-left: 3px; height: 50px; }
 .graphic img { padding: 3px 12px 3px 3px; margin-right: 12px; border-right: 3px solid silver; background-color: #FFFFFF; vertical-align: middle; }
@@ -52,8 +42,7 @@
 .page_list_show li { display: block; }
 img.page_list_rights { border: none; margin-right: 5px; float: left; margin-top: 2px; margin-bottom: 2px; }
 .content input { font-size: 12px; }
-.row_a { background-color: #ECF3F7; }
-.row_b { background-color: #DBEBF2; }
+
 .section { margin-top: 10px; padding: 0px; /*border: 1px solid #999999;*/ width: 100%; background-color: #FDFDFD; height: 75px; }
 .sections_header { width: 100%; margin-bottom: 10px; border: none; background-color: #F0F0F0; height: 50px; }
 .sections_header td { padding: 5px; }
@@ -99,19 +88,10 @@
 .header_list_pubdate_start, .header_list_pubdate_end, .list_pubdate_start, .list_pubdate_end { width: 200px; text-align: left; }
 .right{ text-align: right; }
 .left{ text-align: left;  }
+/* set div layers in dead tables */
+.subcolumns {width:100%;overflow:hidden;margin:10px 0;}
+.subcolumns_oldgecko {width:100%;float:left;margin:10px 0;}
 
-div.content_box { position: relative; margin: 0px auto; }
-div.content_box form{background: transparent;  height: auto; }
-div.content_box fieldset { margin: 10px auto; }
-div.content_box legend {  color: #336699; font-size: 15px; font-weight:bold;padding: 0px 3px 0px 4px; }
-div.content_box label{ font-weight: 600; padding-left:4px; }
-div.content_box input{ width: 400px; }
-.be_section { border: 2px groove #6ea0d0; }
-
-
-.subcolumns { width: 100%; overflow: hidden; }
-.subcolumns_oldgecko { width: 100%; float: left; }
-
 .c10l, .c20l, .c25l, .c33l, .c40l, .c38l, .c50l, .c60l, .c62l, .c66l, .c75l, .c80l { float: left; }
 .c10r, .c20r, .c25r, .c33r, .c40r, .c38r, .c50r, .c60r, .c66r, .c62r, .c75r, .c80r { float: right; margin-left: -5px; }
 
@@ -155,17 +135,17 @@
 #submit,
 #reset { max-width: 100px; }
 
-	fieldset.be_section{
-      clear: both;
-      -moz-border-radius: 8px;
-      -khtml-border-radius: 8px;
-      -webkit-border-radius: 8px;
-      margin-top: 0.7em;
-      text-align: left;
-      background: #f5f5f5 none;
-   }
-
  div#username { height: 17px; width:402px; background-color: #e9e9e9; min-width:250px; border: 0px groove #6799c4; text-align: left; font-weight:bold; margin:0;} 
 .save_section { margin: 20px auto 5px auto; }
 
+#language,
+#timezone,
+#date_format,
+#time_format,
+#display_name,
+#username,
+#email,
+#new_password_1,
+#new_password_2,
+#current_password {width:640px;}
 
Index: branches/2.8.x/wb/templates/wb_theme/templates/header.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/header.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/wb_theme/templates/header.htt	(revision 1428)
@@ -7,12 +7,9 @@
 <meta http-equiv="content-language" content="{LANGUAGE}" />
 <meta name="description" content="{TEXT_ADMINISTRATION}" />
 <meta name="keywords" content="{TEXT_ADMINISTRATION}" />
-<meta http-equiv="cache-control" content="no-cache" />
-<meta http-equiv="cache-control" content="no-store" />
-<meta http-equiv="cache-control" content="max-age=0" />
-<meta http-equiv="cache-control" content="must-revalidate" />
-<meta http-equiv="expires" content="0" />
-<meta http-equiv="pragma" content="no-cache" />
+<meta name="author" content="WebsiteBaker Org e.V." />
+<meta http-equiv="Content-Encoding" content="gzip" />
+<meta http-equiv="Accept-Encoding" content="gzip, deflate" />
 <link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
 {BACKEND_MODULE_CSS}
 <script type="text/javascript">
Index: branches/2.8.x/wb/templates/wb_theme/templates/templates.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/templates.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/wb_theme/templates/templates.htt	(revision 1428)
@@ -15,7 +15,7 @@
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
 <tr>
 	<td>
-		<input type="file" name="userfile" size="82%" />
+		<input type="file" name="userfile" size="82" />
 		<script language="javascript" type="text/javascript">
 		document.install.userfile.focus();
 		</script>
Index: branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt	(revision 1428)
@@ -87,7 +87,7 @@
 				</a>
 			</td>
 			<td style="padding-right: 5px;" align="right" class="{DISPLAY_DELETE}">
-				<a href="#" onclick="javascript: confirm_link('{CONFIRM_DELETE}\n {NAME_SLASHED}', 'delete.php?dir={CURRENT_DIR}%26id={TEMP_ID}');" title="{TEXT_DELETE}">
+				<a href="#" onclick="javascript: confirm_link('{CONFIRM_DELETE}\n {NAME_SLASHED}', 'delete.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}');" title="{TEXT_DELETE}">
 					<img src="{THEME_URL}/images/delete_16.png" alt="" border="0" />
 				</a>
 			</td>
Index: branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt	(revision 1428)
@@ -1,9 +1,8 @@
 <!-- BEGIN main_block -->
+<h2>{HEADING_MY_SETTINGS}</h2>
 <div class="content_box">
 	<form name="{FORM_NAME}" id="{FORM_NAME}" action="{ACTION_URL}" method="post">
 		{FTAN}
-		<fieldset class="be_section">
-			<legend class="content_legend">{HEADING_MY_SETTINGS}</legend>
 			<div class="subcolumns">
 				<div class="c25l">
 					<label>{TEXT_USERNAME}:</label><br />
@@ -68,9 +67,7 @@
 					</select>
 				</div>
 			</div>
-		</fieldset>
-		<fieldset class="be_section">
-			<legend class="content_legend">{HEADING_MY_EMAIL}</legend>
+
 			<div class="subcolumns">
 				<div class="c25l">
 					<label>{TEXT_EMAIL}:</label><br />
@@ -79,9 +76,6 @@
 					<input type="text" id="email" name="email" value="{EMAIL}" /><br />
 				</div>
 			</div>
-		</fieldset>
-		<fieldset class="be_section">
-			<legend class="content_legend">{HEADING_MY_PASSWORD}</legend>
 			<div class="subcolumns">
 				<div class="c25l">
 					<label>{TEXT_NEW_PASSWORD}:</label><br />
@@ -98,9 +92,6 @@
 					<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" /><br />
 				</div>
 			</div>
-		</fieldset>
-		<fieldset class="be_section">
-			<legend class="content_legend">{TEXT_SAVE}</legend>
 			<div class="subcolumns">
 				<div class="c25l">
 					<label>{TEXT_NEED_CURRENT_PASSWORD}:</label><br />
@@ -117,7 +108,6 @@
 				<div class="c25l">
 				</div>
 			</div>
-		</fieldset>
 	</form>
 </div>
 
Index: branches/2.8.x/wb/templates/wb_theme/templates/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/languages.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/wb_theme/templates/languages.htt	(revision 1428)
@@ -11,7 +11,7 @@
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
 <tr>
 	<td>
-		<input type="file" name="userfile" size="82%" />
+		<input type="file" name="userfile" size="82" />
 		<script language="javascript" type="text/javascript">
 		document.install.userfile.focus();
 		</script>
Index: branches/2.8.x/wb/templates/wb_theme/templates/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/pages_sections.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/wb_theme/templates/pages_sections.htt	(revision 1428)
@@ -66,7 +66,7 @@
                     </td>
 
                     <td valign="middle" width="20">
-                        <a href="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_ID}');">
+                        <a href="#" onclick="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_ID}');">
                         <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="X" />
                         </a>
                     </td>
Index: branches/2.8.x/wb/templates/wb_theme/templates/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/modules.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/wb_theme/templates/modules.htt	(revision 1428)
@@ -11,7 +11,7 @@
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
 <tr>
 	<td>
-		<input type="file" name="userfile" size="82%" />
+		<input type="file" name="userfile" size="82" />
 		<script language="javascript" type="text/javascript">
 		document.install.userfile.focus();
 		</script><br />
@@ -79,7 +79,7 @@
 <h2>{HEADING_INVOKE_MODULE_FILES}</h2>
 <p>{TEXT_MANUAL_INSTALLATION}</p>
 
-<form name="details" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
+<form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
 	<strong>{TEXT_FILE}:</strong> "install.php"&nbsp;&nbsp;&nbsp;
 	<input type="hidden" name="action" value="install" />
 	<select name="file" style="width: 250px;">
@@ -91,7 +91,7 @@
 	<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width: 100px; margin-left: 1em;" />
 </form>
 
-<form name="details" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
+<form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
 	<br />{TEXT_FILE}: "upgrade.php"
 	<input type="hidden" name="action" value="upgrade" />
 	<select name="file" style="width: 250px;">
@@ -103,7 +103,7 @@
 	<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width: 100px; margin-left: 1em;" />
 </form>
 
-<form name="details" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
+<form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
 	<br />{TEXT_FILE}: "uninstall.php"
 	<input type="hidden" name="action" value="uninstall" />
 	<select name="file" style="width: 250px;">
Index: branches/2.8.x/wb/templates/argos_theme/info.php
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/info.php	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/info.php	(revision 1428)
@@ -1,40 +1,40 @@
-<?php
-/**
- * $Id$
- * Website Baker theme: argos_theme
- * This theme is the default WB backend Theme
- * 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     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
- * @copyright  GNU General Public License
- * @license    http://www.gnu.org/licenses/gpl.html
- * @version    1.1
- * @platform   Website Baker 2.8
- *
- * 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.
-*/
-
-// OBLIGATORY WEBSITE BAKER VARIABLES
-$template_directory			= 'argos_theme';
-$template_name				= 'argos_theme';
-$template_function			= 'theme';
-$template_version			= '1.4';
-$template_platform			= '2.8';
-$template_author			= 'Jurgen Nijhuis (Argos Media) & Ruud Eisinga';
-$template_license			= '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>';
-$template_license_terms		= '-';
-$template_description		= 'Enhanced backend theme for Website Baker 2.8.';
-
+<?php
+/**
+ * $Id$
+ * Website Baker theme: argos_theme
+ * This theme is the default WB backend Theme
+ * 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     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    1.1
+ * @platform   Website Baker 2.8
+ *
+ * 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.
+*/
+
+// OBLIGATORY WEBSITE BAKER VARIABLES
+$template_directory			= 'argos_theme';
+$template_name				= 'argos_theme';
+$template_function			= 'theme';
+$template_version			= '1.5';
+$template_platform			= '2.8';
+$template_author			= 'Jurgen Nijhuis (Argos Media) & Ruud Eisinga';
+$template_license			= '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>';
+$template_license_terms		= '-';
+$template_description		= 'Enhanced backend theme for Website Baker 2.8.';
+
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/theme.css	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/theme.css	(revision 1428)
@@ -1,11 +1,9 @@
 
-html {
-overflow: -moz-scrollbars-vertical;  /* Force firefox to always show room for a vertical scrollbar */
-}
+html {overflow:-moz-scrollbars-vertical; /* Force firefox to always show room for a vertical scrollbar */}
 
 body,td,th,input,textarea {font-family:verdana,arial,helvetica,sans-serif;font-size:11px;color:#333;}
 body {background:#f9f9f9 url(images/background.jpg) 0 0 repeat-x;margin:0;text-align:center;}
-img {	border: 0px;}
+img {border:0px;}
 
 #admin_header {text-align:center;width:900px;height:105px;margin:0 auto;padding:10px 0 0 0;}
 #admin_header a#website_title {display:block;text-align:left;font-size:14px;font-weight:bold;color:#fff;text-transform:uppercase;text-decoration:none;}
@@ -31,11 +29,10 @@
 
 #content_container {text-align:center;width:900px;clear:both;margin:0 auto;}
 .content {margin:0;padding:20px 0;width:900px;text-align:left;vertical-align:top;}
-
 hr {margin:15px 0;color:#003366;height:1px;}
 
 .hide {display:none;}
-.note {color:#666;font-size:10px;}
+.note {color:#666;font-size:11px;}
 
 form {margin:0;}
 label {cursor:pointer;}
@@ -44,13 +41,14 @@
 /* WB2.8 STYLES */
 .img_noborder img {border:0;}
 iframe {border:1px solid #35373a;}
-div.box {font-size:small;width:100%;text-align:right;margin:-10px 0 0 0;}
+div.box {font-size:11px;width:100%;text-align:right;margin:-10px 0 0 0;}
 .section {margin-top:10px;padding:0;border:1px solid #999;height:75px;width:100%;background-color:#fdfdfd;}
 .graphic {width:50px;height:50px;border:4px solid #fdfdfd;padding-left:3px;}
 .graphic img {vertical-align:middle;background-color:#fff;padding:4px;border:1px solid #d0d0d0;}
 .title {text-align:left;font-weight:bold;font-size:14px;margin-bottom:5px;}
+span.title { display :block;}
 .description {text-align:left;padding:4px 4px 0 4px;}
-.note {color:#666;font-size:10px;}
+.note {color:#666;font-size:11px;}
 .bold {font-weight:bold;}
 
 .submit, .cancel {width:100px;margin-top:5px;}
@@ -67,12 +65,12 @@
 select option.disabled {color:#aaa;}
 
 .jsadmin_drag img {margin-top:2px;vertical-align:top;cursor:pointer;}
-.jsadmin_drag img:hover {/* background-color: lightgrey; */}
+.jsadmin_drag img:hover {/* background-color:lightgrey;*/}
 .modify_link {padding:4px 0 0 7px;}
 
 .settings_table td {vertical-align:top;text-align:left;padding:5px;}
 .setting_name {width:10%;min-width:180px;}
-.setting_value { width: 90%}
+.setting_value {width:90%}
 .setting_value input, .setting_value select, .setting_value textarea {width:100%;}
 .setting_value textarea {height:50px;}
 
@@ -86,11 +84,11 @@
 .pages_list {font-weight:bold;}
 .pages_list .icon_col td img {display:block;border-style:none;float:left;padding-right:7px;}
 .pages_list table {width:900px;}
-.pages_list ul {margin:0;font-weight:normal;padding: 0;}
+.pages_list ul {margin:0;font-weight:normal;padding:0;}
 .pages_list ul li {list-style-type:none;margin:2px 0;}
 
 table.pages_view {width:900px;}
-table.pages_view tr, tr.sectionrow {background:#f0f0f0; line-height :2.2em;}
+table.pages_view tr, tr.sectionrow {background:#f0f0f0;line-height:2.2em;}
 table.pages_view tr:hover, tr.sectionrow:hover {background:#eaeff6;}
 tr.sectionrow {padding:0 10px;}
 tr.sectionrow td {border-top:3px solid #f9f9f9;}
@@ -97,12 +95,11 @@
 
 .page_list {display:none;}
 .page_list_show li {display:block;}
-img.page_list_rights {border:none;float:left;margin:0;vertical-align:middle; padding :2px;}
+img.page_list_rights {border:none;float:left;margin:0;vertical-align:middle;padding :2px;}
 
 .sections_list {font-weight:bold;padding-left:10px;}
 .sections_list table {width:900px;}
 
-
 .header_list_type {text-align:left;}
 .header_list_block {text-align:left;width:180px;}
 .header_list_pubdate_start {text-align:left;width:200px;}
@@ -110,107 +107,73 @@
 .header_list_sections_actions {text-align:left;width:30px;}
 .header_list_section_id {width:30px;text-align:right;}
 
-
 .list_section_id {width:30px;text-align:right;}
 .list_pubdate_start {text-align:left;width:200px;}
 .list_pubdate_end {text-align:left;width:200px;}
-/*
-.header_list_page_title {text-align:left;}
-.header_list_menu_title {width:300px;text-align:left;}
-.header_list_page_id{width:50px;text-align:left;}
-.list_page_title {text-align:left;}
-.list_menu_title {width:300px;text-align:left;}
-.list_page_id {width:50px;text-align:left;}
-*/
-.header_list_menu_title {text-align:left;}
-.header_list_page_title {width:300px; text-align:left;}
-td.list_page_title { line-height: 1.3em;
-	padding-top: 3px;
-	padding-bottom: 3px;
-}
 
-.header_list_page_id {width:50px; text-align: right; padding-right:15px;}
-.header_list_actions {width:150px; text-align:left;}
+.header_list_menu_title {text-align:left;padding-left:30px;}
+.header_list_page_title {width:334px;text-align:left;}
+.header_list_page_id {width:30px;text-align:left;}
+.header_list_actions {width:178px;text-align:left;}
 
 .list_menu_title {text-align:left;}
-.list_page_title {width:300px;text-align:left; }
+.list_page_title {width:300px;text-align:left;}
 
-.list_page_id {width:50px;text-align: right; padding-right:15px;}
+.list_page_id {width:50px;text-align:right;padding-right:15px;}
 .list_actions {width:25px;text-align:left;}
 
-.value_page_code {color: #006400; font-weight: 400; width: 240px; }
-.list_page_code { width: 240px; }
-.list_page_language { width: 240px; }
-#multi_lingual { font-weight: bolder; }
-.right{ text-align: right; }
-.left{ text-align: left; }
+.value_page_code {color:#006400;font-weight:bold;width:240px;}
+.list_page_code {width:240px;}
+.list_page_language {width:240px;}
+#multi_lingual {font-weight:bold;}
+.right{text-align:right;}
+.left{text-align:left;}
 
-/* Preference styles */
-div.content_box { position: relative; margin: 0px auto; }
-div.content_box form{background: transparent;  height: auto; }
-div.content_box fieldset { margin: 10px auto; }
-div.content_box legend {  color: #336699; font-size: 15px; font-weight:bold;padding: 0px 3px 0px 4px; }
-div.content_box label{ font-weight: 600; padding-left:4px; }
-div.content_box input{ width: 400px; }
-.be_section { border: 2px groove #6ea0d0; }
+/* set div layers in dead tables */
+.subcolumns {width:100%;overflow:hidden;margin:10px 0;}
+.subcolumns_oldgecko {width:100%;float:left;margin:10px 0;}
 
-/* set div layers indead tables */
-.subcolumns { width: 100%; overflow: hidden; }
-.subcolumns_oldgecko { width: 100%; float: left; }
+.c10l, .c20l, .c25l, .c33l, .c40l, .c38l, .c50l, .c60l, .c62l, .c66l, .c75l, .c80l {float:left;}
+.c10r, .c20r, .c25r, .c33r, .c40r, .c38r, .c50r, .c60r, .c66r, .c62r, .c75r, .c80r {float:right;margin-left:-5px;}
 
-.c10l, .c20l, .c25l, .c33l, .c40l, .c38l, .c50l, .c60l, .c62l, .c66l, .c75l, .c80l { float: left; }
-.c10r, .c20r, .c25r, .c33r, .c40r, .c38r, .c50r, .c60r, .c66r, .c62r, .c75r, .c80r { float: right; margin-left: -5px; }
+.c10l, .c10r {width:10%;}
+.c20l, .c20r {width:20%;line-height:2em;}
+.c40l, .c40r {width:40%;}
+.c60l, .c60r {width:60%;height:21px;}
+.c25l, .c25r {width:28%;}
+.c33l, .c33r {width:33.333%;}
+.c50l, .c50r {width:50%;}
+.c66l, .c66r {width:66.666%;}
+.c38l, .c38r {width:38.2%;}
+.c62l, .c62r {width:61.8%;}
+.subc {padding:0 0.5em;}
+.subcl {padding:0 1em 0 0;}
+.subcr {padding:0 0 0 1em;}
 
-  .c10l, .c10r { width: 10%; }
-  .c20l, .c20r { width: 20%; line-height:2em;}
-  .c40l, .c40r { width: 40%; }
-  .c60l, .c60r { width: 60%; height: 21px;}
-  .c25l, .c25r { width: 28%; }
-  .c33l, .c33r { width: 33.333%; }
-  .c50l, .c50r { width: 50%; }
-  .c66l, .c66r { width: 66.666%; }
-  .c38l, .c38r { width: 38.2%; }
-  .c62l, .c62r { width: 61.8%; }
-  .subc { padding: 0 0.5em; }
-  .subcl { padding: 0 1em 0 0; }
-  .subcr { padding: 0 0 0 1em; }
+.c80l, .c80r, .c90l, .c90r {width:80%;}
+.c75l, .c75r, .c80l, .c80r {width:75%;}
 
-.c80l, .c80r, .c90l, .c90r { width: 80%; }
-.c75l, .c75r, .c80l, .c80r { width: 75%; }
+.info {padding:10px;margin-bottom:0.5em;background:#f8f8f8;color:#666;font-size:11px;}
+.note {border:2px #484 solid;padding:10px;margin:10px auto;background:#efe;color:#040;}
+.important {border:2px #884 solid;padding:10px; margin-bottom:1em;background:#ffe;color:#440;}
+.warning {border:2px #844 solid;padding:10px;margin:1em auto;background:#fee;color:#400;}
 
-.info { padding: 10px; margin-bottom: 0.5em; background: #f8f8f8; color: #666; font-size: 91.7%; }
-.note { border: 2px #484 solid; padding: 10px;margin: 10px auto; background: #efe; color: #040; }
-.important { border: 2px #884 solid; padding: 10px;  margin-bottom: 1em; background: #ffe; color: #440; }
-.warning { border: 2px #844 solid; padding: 10px; margin: 1em auto; background: #fee; color: #400; }
+.row_0 {background-color:transparent;}
+.row_1 {background-color:#ccddee;}
 
-.row_0 { background-color: transparent; }
-.row_1 { background-color: #ccddee; }
-
 #language,
 #timezone,
 #date_format,
-#time_format { min-width: 250px; }
-
+#time_format,
 #display_name,
 #username,
 #email,
 #new_password_1,
 #new_password_2,
-#current_password { min-width: 250px;  }
+#current_password {width:640px;}
 
-
 #submit,
-#reset { max-width: 100px; }
+#reset {max-width:100px;}
 
-	fieldset.be_section{
-      clear: both;
-      -moz-border-radius: 8px;
-      -khtml-border-radius: 8px;
-      -webkit-border-radius: 8px;
-      margin-top: 0.7em;
-      text-align: left;
-      background: #e1e1e1 none;
-   }
-
-div#username { height: 17px; width:402px; min-width:250px; border: 0px groove #6799c4; text-align: left; font-weight:bold; margin:0;} 
-.save_section { margin: 20px auto 5px auto; }
+div#username {height:17px;width:640px;text-align:left;font-weight:bold;margin:0;} 
+.save_section {margin:20px auto 5px auto;}
Index: branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt	(revision 1428)
@@ -1,70 +1,70 @@
-<!-- BEGIN main_block -->
-<!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>Retrieve Login Details</title>
-<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
-<meta http-equiv="content-language" content="{LANGUAGE}" />
-<meta name="description" content="Retrieve Login Details" />
-<meta name="keywords" content="Retrieve Login Details" />
-<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
-</head>
-<body onload="document.forgot_pass.email.focus();">
-
-<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
-	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
-	{SECTION_FORGOT}
-</div> 
-
-<table cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
-<tr>
-	<td class="content">
-	
-	<form name="forgot_pass" action="{ACTION_URL}" method="post">
-	<input type="hidden" name="url" value="{URL}" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" width="500">
-		<tr>
-			<td height="40" align="center" style="color: #{MESSAGE_COLOR};" colspan="2">{MESSAGE}</td>
-		</tr>
-		<tr style="{DISPLAY_FORM}">
-			<td height="10" colspan="2"></td>
-		</tr>
-		<tr style="{DISPLAY_FORM}">
-			<td width="165" height="30" align="right">{TEXT_EMAIL}:</td>
-			<td><input type="text" maxlength="255" name="email" value="{EMAIL}" style="width: 180px;" /></td>
-		</tr>
-		<tr style="{DISPLAY_FORM}" height="30">
-			<td>&nbsp;</td>
-			<td><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;"></td>
-		</tr>
-		<tr style="{DISPLAY_FORM}">
-			<td height="10" colspan="2"></td>
-		</tr>
-		</table>
-	</form>
-	
-	<center>
-		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>
-		<br />
-		<br />
-		<a href="{WB_URL}">{TEXT_HOME}</a>
-	</center>
-
-	</td>
-</tr>
-</table>
-
-<table cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0px 10px 0px;">
-<tr>
-	<td style="font-size:12px;text-align:center;">
-      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
-      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
-      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-	</td>
-</tr>
-</table>
-
-</body>
-</html>
+<!-- BEGIN main_block -->
+<!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>Retrieve Login Details</title>
+<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
+<meta http-equiv="content-language" content="{LANGUAGE}" />
+<meta name="description" content="Retrieve Login Details" />
+<meta name="keywords" content="Retrieve Login Details" />
+<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
+</head>
+<body onload="document.forgot_pass.email.focus();">
+
+<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
+	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
+	{SECTION_FORGOT}
+</div> 
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
+<tr>
+	<td class="content">
+	
+	<form name="forgot_pass" action="{ACTION_URL}" method="post">
+	<input type="hidden" name="url" value="{URL}" />
+		<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
+		<tr>
+			<td height="40" align="center" style="color: #{MESSAGE_COLOR};" colspan="2">{MESSAGE}</td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td height="10" colspan="2"></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td width="165" height="30" align="right">{TEXT_EMAIL}:</td>
+			<td><input type="text" maxlength="255" name="email" value="{EMAIL}" style="width: 180px;" /></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}" height="30">
+			<td>&nbsp;</td>
+			<td><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;"></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td height="10" colspan="2"></td>
+		</tr>
+		</table>
+	</form>
+	
+	<center>
+		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>
+		<br />
+		<br />
+		<a href="{WB_URL}">{TEXT_HOME}</a>
+	</center>
+
+	</td>
+</tr>
+</table>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0px 10px 0px;">
+<tr>
+	<td style="font-size:12px;text-align:center;">
+      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
+      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+	</td>
+</tr>
+</table>
+
+</body>
+</html>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1428)
@@ -4,7 +4,7 @@
 <input type="hidden" name="advanced" value="{ADVANCED}" />
 {FTAN}
 
-<table cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
+<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
 <tr>
 	<td colspan="3"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
 </tr>
@@ -399,7 +399,7 @@
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name"><div id="{ADVANCED_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">{TEXT_FILESYSTEM_PERMISSIONS}:</div></td>
 	<td class="setting_value" id="file_mode" align="left">
-		<table cellpadding="2" cellspacing="0" border="0" width="90%" style="border-right: 1px solid #ddd;" id="{ADVANCED_FILE_PERMS_ID}2">
+		<table summary="" cellpadding="2" cellspacing="0" border="0" width="90%" style="border-right: 1px solid #ddd;" id="{ADVANCED_FILE_PERMS_ID}2">
 		<tr>
 			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_FILES}:</td>
 		</tr>
@@ -443,7 +443,7 @@
 		</table>
 	</td>
 	<td class="setting_value" id="dir_mode" style="text-align: right;">
-		<table cellpadding="2" cellspacing="0" border="0" width="90%" id="{ADVANCED_FILE_PERMS_ID}3">
+		<table summary="" cellpadding="2" cellspacing="0" border="0" width="90%" id="{ADVANCED_FILE_PERMS_ID}3">
 		<tr>
 			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_DIRECTORIES}:</td>
 		</tr>
Index: branches/2.8.x/wb/templates/argos_theme/templates/users.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/users.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/users.htt	(revision 1428)
@@ -3,7 +3,7 @@
 <form name="users" action="users.php" method="post">
 <input type="hidden" name="action" value="delete" />
 
-<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
 	<tr style="background:#f0f0f0;">
 		<td align="left"><h2>{HEADING_MODIFY_DELETE_USER}</h2></td>
 		<td align="right">
Index: branches/2.8.x/wb/templates/argos_theme/templates/access.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/access.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/access.htt	(revision 1428)
@@ -1,33 +1,33 @@
-<!-- BEGIN main_block -->
-<h2>{ACCESS}</h2>
-<table cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-	<tr>
-		<td align="center" valign="top">
-			<!-- BEGIN users_block -->	
-			<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_USERS} >
-				<tr>
-					<td class="graphic" align="center" valign="top" rowspan="2">
-						<a href="{ADMIN_URL}/users/index.php"><img src="{THEME_URL}/icons/users.png" alt="{USERS}" /></a>
-					</td>
-					<td class="description" valign="top">
-						<a href="{ADMIN_URL}/users/index.php"><span class="title">{USERS}</span></a><p>{USERS_OVERVIEW}</p>
-					</td>
-				</tr>
-			</table>	
-			<!-- END users_block -->
-			<!-- BEGIN groups_block -->		
-			<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
-				<tr>
-					<td class="graphic" align="center" valign="top" rowspan="2">
-						<a href="{ADMIN_URL}/groups/index.php"><img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" /></a>
-					</td>
-					<td class="description" valign="top">
-						<a href="{ADMIN_URL}/groups/index.php"><span class="title">{GROUPS}</span></a><p>{GROUPS_OVERVIEW}</p>
-					</td>
-				</tr>
-			</table>
-			<!-- END groups_block -->
-		</td>
-	</tr>
-</table>
-<!-- END main_block -->
+<!-- BEGIN main_block -->
+<h2>{ACCESS}</h2>
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+	<tr>
+		<td align="center" valign="top">
+			<!-- BEGIN users_block -->	
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_USERS} >
+				<tr>
+					<td class="graphic" align="center" valign="top" rowspan="2">
+						<a href="{ADMIN_URL}/users/index.php"><img src="{THEME_URL}/icons/users.png" alt="{USERS}" /></a>
+					</td>
+					<td class="description" valign="top">
+						<a href="{ADMIN_URL}/users/index.php"><span class="title">{USERS}</span></a><p>{USERS_OVERVIEW}</p>
+					</td>
+				</tr>
+			</table>	
+			<!-- END users_block -->
+			<!-- BEGIN groups_block -->		
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
+				<tr>
+					<td class="graphic" align="center" valign="top" rowspan="2">
+						<a href="{ADMIN_URL}/groups/index.php"><img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" /></a>
+					</td>
+					<td class="description" valign="top">
+						<a href="{ADMIN_URL}/groups/index.php"><span class="title">{GROUPS}</span></a><p>{GROUPS_OVERVIEW}</p>
+					</td>
+				</tr>
+			</table>
+			<!-- END groups_block -->
+		</td>
+	</tr>
+</table>
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/templates_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/templates_details.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/templates_details.htt	(revision 1428)
@@ -2,7 +2,7 @@
 
 <h2>{HEADING_TEMPLATE_DETAILS}</h2>
 
-<table cellpadding="5" cellspacing="0" border="0">
+<table summary="" cellpadding="5" cellspacing="0" border="0">
 <tr>
 	<td width="100">{TEXT_NAME}:</td>
 	<td>{NAME}</td>
Index: branches/2.8.x/wb/templates/argos_theme/templates/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/modules.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/modules.htt	(revision 1428)
@@ -1,5 +1,5 @@
 <!-- BEGIN main_block -->
-<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
 	<tr style="background:#f0f0f0;">
 		<td align="right">
 			{URL_TEMPLATES}
@@ -13,10 +13,10 @@
 
 <form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
   <h2>{HEADING_INSTALL_MODULE}</h2>
-  <table cellpadding="2" cellspacing="0" border="0" width="100%">
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
     <tr>
       <td valign="middle">
-        <input type="file" name="userfile" size="97%" />
+        <input type="file" name="userfile" size="97" />
         <script type="text/javascript">
 		document.install.userfile.focus();
 		</script><br />
@@ -32,10 +32,10 @@
 </form>
 <form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
   <h2>{HEADING_UNINSTALL_MODULE}</h2>
-  <table cellpadding="2" cellspacing="0" border="0" width="100%">
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
     <tr>
       <td>
-        <select name="file" style="width: 97%;">
+        <select name="file" style="width: 97;">
 		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
 		<!-- BEGIN module_list_block -->
 			<option value="{VALUE}">{NAME}</option>
@@ -51,7 +51,7 @@
 </form>
 <form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
   <h2>{HEADING_MODULE_DETAILS}</h2>
-  <table cellpadding="2" cellspacing="0" border="0" width="100%">
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
     <tr>
       <td>
         <select name="file" style="width: 97%;">
@@ -71,8 +71,8 @@
 <div class="{DISPLAY_MANUAL_INSTALL}">
   <h2>{HEADING_INVOKE_MODULE_FILES}</h2>
   <p>{TEXT_MANUAL_INSTALLATION}</p>
-  <form name="details" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
-  <table cellpadding="0" cellspacing="2" border="0" width="80%">
+  <form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
 	  <tr>
 		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "install.php"</td>
 		<td valign="middle">
@@ -89,8 +89,8 @@
   </table>
   </form>
   
-  <form name="details" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
-  <table cellpadding="0" cellspacing="2" border="0" width="80%">
+  <form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
 	  <tr>
 		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "upgrade.php"</td>
 		<td valign="middle" >
@@ -107,8 +107,8 @@
   </table>
   </form>
 
-  <form name="details" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
-  <table cellpadding="0" cellspacing="2" border="0" width="80%">
+  <form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
 	  <tr>
 		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "uninstall.php"</td>
 		<td valign="middle">
Index: branches/2.8.x/wb/templates/argos_theme/templates/addons.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/addons.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/addons.htt	(revision 1428)
@@ -1,60 +1,60 @@
-<!-- BEGIN main_block -->
-<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td valign="middle" align="left"><h2>{ADDONS_OVERVIEW}</h2></td>
-		<td align="right">{URL_ADVANCED}</td>
-	</tr>
-</table>
-
-<table cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-	<tr>
-		<td align="center" valign="top">
-			<!-- BEGIN modules_block -->
-			<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_MODULES} >
-				<tr>
-					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/modules/index.php"><img src="{THEME_URL}/icons/modules.png" alt="0" /> </a> </td>
-					<td class="description" valign="top"><a href="{ADMIN_URL}/modules/index.php"><span class="title">{MODULES}</span></a><p>{MODULES_OVERVIEW}</p></td>
-				</tr>
-			</table>
-			<!-- END modules_block -->
-			<!-- BEGIN templates_block -->
-			<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_TEMPLATES} >
-				<tr>
-					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/templates/index.php"><img src="{THEME_URL}/icons/templates.png" alt="{TEMPLATES}" /> </a> </td>
-					<td class="description" valign="top"><a href="{ADMIN_URL}/templates/index.php"><span class="title">{TEMPLATES}</span></a><p>{TEMPLATES_OVERVIEW}</p></td>
-				</tr>
-			</table>
-			<!-- END templates_block -->
-			<!-- BEGIN languages_block -->
-			<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_LANGUAGES} >
-				<tr>
-					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/languages/index.php"><img src="{THEME_URL}/icons/languages.png" alt="{LANGUAGES}" /> </a> </td>
-					<td class="description" valign="top"> <a href="{ADMIN_URL}/languages/index.php"><span class="title">{LANGUAGES}</span></a><p>{LANGUAGES_OVERVIEW}</p></td>
-				</tr>
-			</table>
-			<!-- END languages_block -->
-			<!-- BEGIN reload_block -->
-			<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_RELOAD} >
-				<tr>
-					<td class="graphic" align="center" valign="middle" rowspan="2"><img src="{THEME_URL}/icons/admintools.png" alt="{TXT_ADMIN_SETTINGS}" /> </td>
-					<td class="description" valign="top"><span class="title">{TXT_ADMIN_SETTINGS}</span>
-						<form action="{RELOAD_URL}" method="post">
-						{FTAN}
-							{MESSAGE_RELOAD_ADDONS}
-							<br style="margin-bottom: 0.5em" />
-							<input {DISPLAY_MODULES} type="checkbox" name="reload_modules" id="reload_modules" value="true" />
-							<label {DISPLAY_MODULES} for="reload_modules">{MODULES}</label>
-							<input {DISPLAY_TEMPLATES} type="checkbox" name="reload_templates" id="reload_templates" value="true" />
-							<label {DISPLAY_TEMPLATES} for="reload_templates">{TEMPLATES}</label>
-							<input {DISPLAY_LANGUAGES} type="checkbox" name="reload_languages" id="reload_languages" value="true" />
-							<label {DISPLAY_LANGUAGES} for="reload_languages">{LANGUAGES}</label>
-							<input type="submit" name="submit" value="{TEXT_RELOAD}" />
-						</form>
-					</td>
-				</tr>
-			</table>
-			<!-- END reload_block -->
-		</td>
-	</tr>
-</table>
+<!-- BEGIN main_block -->
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td valign="middle" align="left"><h2>{ADDONS_OVERVIEW}</h2></td>
+		<td align="right">{URL_ADVANCED}</td>
+	</tr>
+</table>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+	<tr>
+		<td align="center" valign="top">
+			<!-- BEGIN modules_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_MODULES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/modules/index.php"><img src="{THEME_URL}/icons/modules.png" alt="0" /> </a> </td>
+					<td class="description" valign="top"><a href="{ADMIN_URL}/modules/index.php"><span class="title">{MODULES}</span></a><p>{MODULES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END modules_block -->
+			<!-- BEGIN templates_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_TEMPLATES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/templates/index.php"><img src="{THEME_URL}/icons/templates.png" alt="{TEMPLATES}" /> </a> </td>
+					<td class="description" valign="top"><a href="{ADMIN_URL}/templates/index.php"><span class="title">{TEMPLATES}</span></a><p>{TEMPLATES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END templates_block -->
+			<!-- BEGIN languages_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_LANGUAGES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/languages/index.php"><img src="{THEME_URL}/icons/languages.png" alt="{LANGUAGES}" /> </a> </td>
+					<td class="description" valign="top"> <a href="{ADMIN_URL}/languages/index.php"><span class="title">{LANGUAGES}</span></a><p>{LANGUAGES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END languages_block -->
+			<!-- BEGIN reload_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_RELOAD} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><img src="{THEME_URL}/icons/admintools.png" alt="{TXT_ADMIN_SETTINGS}" /> </td>
+					<td class="description" valign="top"><span class="title">{TXT_ADMIN_SETTINGS}</span>
+						<form action="{RELOAD_URL}" method="post">
+						{FTAN}
+							{MESSAGE_RELOAD_ADDONS}
+							<br style="margin-bottom: 0.5em" />
+							<input {DISPLAY_MODULES} type="checkbox" name="reload_modules" id="reload_modules" value="true" />
+							<label {DISPLAY_MODULES} for="reload_modules">{MODULES}</label>
+							<input {DISPLAY_TEMPLATES} type="checkbox" name="reload_templates" id="reload_templates" value="true" />
+							<label {DISPLAY_TEMPLATES} for="reload_templates">{TEMPLATES}</label>
+							<input {DISPLAY_LANGUAGES} type="checkbox" name="reload_languages" id="reload_languages" value="true" />
+							<label {DISPLAY_LANGUAGES} for="reload_languages">{LANGUAGES}</label>
+							<input type="submit" name="submit" value="{TEXT_RELOAD}" />
+						</form>
+					</td>
+				</tr>
+			</table>
+			<!-- END reload_block -->
+		</td>
+	</tr>
+</table>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/login.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/login.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/login.htt	(revision 1428)
@@ -1,83 +1,83 @@
-<!-- BEGIN mainBlock -->
-<!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>{TEXT_LOGIN}</title>
-<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
-<meta http-equiv="content-language" content="{LANGUAGE}" />
-<meta name="description" content="{TEXT_LOGIN}" />
-<meta name="keywords" content="{TEXT_LOGIN}" />
-<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
-</head>
-<body onload="document.login.{USERNAME_FIELDNAME}.focus();">
-<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
-	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
-	{TEXT_LOGIN}
-</div> 
-<table cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
-  <tr>
-    <td class="content">
-      <form name="login" action="{ACTION_URL}" method="post">
-        <input type="hidden" name="url" value="{URL}" />
-        <input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
-        <input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
-        <table cellpadding="5" cellspacing="0" border="0" align="center" width="500">
-          <tr>
-            <td height="40" align="center" colspan="2">{MESSAGE}</td>
-          </tr>
-          <tr>
-            <td height="10" colspan="2"></td>
-          </tr>
-          <tr>
-            <td width="170" height="30" align="right">{TEXT_USERNAME}:</td>
-            <td>
-              <input type="text" maxlength="{MAX_USERNAME_LEN}" name="{USERNAME_FIELDNAME}" value="{USERNAME}" style="width: 180px;" />
-            </td>
-          </tr>
-          <tr>
-            <td width="170" height="30" align="right">{TEXT_PASSWORD}:</td>
-            <td>
-              <input type="password" maxlength="{MAX_PASSWORD_LEN}" name="{PASSWORD_FIELDNAME}" style="width: 180px;" />
-            </td>
-          </tr>
-          <tr style="{DISPLAY_REMEMBER_ME}">
-            <td>&nbsp;</td>
-            <td>
-              <input type="checkbox" name="remember" id="remember" value="true" />
-              <label for="remember">{TEXT_REMEMBER_ME}</label>
-            </td>
-          </tr>
-          <tr>
-            <td>&nbsp;</td>
-            <td>
-              <input type="submit" name="submit" value="{TEXT_LOGIN}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" />
-            </td>
-          </tr>
-          <tr>
-            <td height="10" colspan="2"></td>
-          </tr>
-        </table>
-      </form>
-      <center>
-        <a href="{FORGOTTEN_DETAILS_APP}">{TEXT_FORGOTTEN_DETAILS}</a> 
-		<br />
-        <br />
-        <br />
-        <a href="{WB_URL}">{TEXT_HOME}</a>
-      </center>
-    </td>
-  </tr>
-</table>
-<table cellpadding="0" cellspacing="0" border="0" width="100%" style="padding:10px 0;">
-  <tr>
-    <td style="font-size:10px;text-align:center;">
-      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
-      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
-      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-    </td>
-  </tr>
-</table>
-</body>
-</html>
-<!-- END mainBlock -->
+<!-- BEGIN mainBlock -->
+<!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>{TEXT_LOGIN}</title>
+<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
+<meta http-equiv="content-language" content="{LANGUAGE}" />
+<meta name="description" content="{TEXT_LOGIN}" />
+<meta name="keywords" content="{TEXT_LOGIN}" />
+<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
+</head>
+<body onload="document.login.{USERNAME_FIELDNAME}.focus();">
+<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
+	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
+	{TEXT_LOGIN}
+</div> 
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
+  <tr>
+    <td class="content">
+      <form name="login" action="{ACTION_URL}" method="post">
+        <input type="hidden" name="url" value="{URL}" />
+        <input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
+        <input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
+        <table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
+          <tr>
+            <td height="40" align="center" colspan="2">{MESSAGE}</td>
+          </tr>
+          <tr>
+            <td height="10" colspan="2"></td>
+          </tr>
+          <tr>
+            <td width="170" height="30" align="right">{TEXT_USERNAME}:</td>
+            <td>
+              <input type="text" maxlength="{MAX_USERNAME_LEN}" name="{USERNAME_FIELDNAME}" value="{USERNAME}" style="width: 180px;" />
+            </td>
+          </tr>
+          <tr>
+            <td width="170" height="30" align="right">{TEXT_PASSWORD}:</td>
+            <td>
+              <input type="password" maxlength="{MAX_PASSWORD_LEN}" name="{PASSWORD_FIELDNAME}" style="width: 180px;" />
+            </td>
+          </tr>
+          <tr style="{DISPLAY_REMEMBER_ME}">
+            <td>&nbsp;</td>
+            <td>
+              <input type="checkbox" name="remember" id="remember" value="true" />
+              <label for="remember">{TEXT_REMEMBER_ME}</label>
+            </td>
+          </tr>
+          <tr>
+            <td>&nbsp;</td>
+            <td>
+              <input type="submit" name="submit" value="{TEXT_LOGIN}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" />
+            </td>
+          </tr>
+          <tr>
+            <td height="10" colspan="2"></td>
+          </tr>
+        </table>
+      </form>
+      <center>
+        <a href="{FORGOTTEN_DETAILS_APP}">{TEXT_FORGOTTEN_DETAILS}</a> 
+		<br />
+        <br />
+        <br />
+        <a href="{WB_URL}">{TEXT_HOME}</a>
+      </center>
+    </td>
+  </tr>
+</table>
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding:10px 0;">
+  <tr>
+    <td style="font-size:10px;text-align:center;">
+      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
+      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+<!-- END mainBlock -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt	(revision 1428)
@@ -7,10 +7,10 @@
 		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" width="100%">
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a class= "title" href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}"><img src="{THEME_URL}/icons/admintools.png" border="0" align="left"></a>
+				<a class= "title" href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}"><img src="{THEME_URL}/icons/admintools.png" border="0" alt="{TOOL_NAME}" align="left" /></a>
 			</td>
 			<td class="description" valign="top">
-				<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}"><div class="title">{TOOL_NAME}</div></a>{TOOL_DESCRIPTION}
+				<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}"><span class="title">{TOOL_NAME}</span></a>{TOOL_DESCRIPTION}
 			</td>
 		</tr>
 		</table>
Index: branches/2.8.x/wb/templates/argos_theme/templates/languages_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/languages_details.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/languages_details.htt	(revision 1428)
@@ -2,7 +2,7 @@
 
 <h2>{HEADING_LANGUAGE_DETAILS}</h2>
 
-<table cellpadding="5" cellspacing="0" border="0">
+<table summary="" cellpadding="5" cellspacing="0" border="0">
 <tr>
 	<td width="100">{TEXT_NAME}:</td>
 	<td>{NAME}</td>
Index: branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt	(revision 1428)
@@ -1,94 +1,94 @@
-<!-- BEGIN main_block -->
-
-<script type="text/javascript">
-function toggle_radio(radio_on, radio_off) {
-	document.getElementById(radio_on).checked = true;
-	document.getElementById(radio_off).checked = true;
-}
-</script>
-
-<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_USER}</h2>
-
-<form name="user" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
-<input type="hidden" name="user_id" value="{USER_ID}" />
-<input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
-{FTAN}
-<table cellpadding="5" cellspacing="0" border="0" width="100%">
-<tr>
-	<td width="150">{TEXT_USERNAME}:</td>
-	<td class="value_input">
-		<input type="text" name="{USERNAME_FIELDNAME}" maxlength="30" value="{USERNAME}" />
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_PASSWORD}:</td>
-	<td class="value_input">
-		<input type="password" name="password" maxlength="30" />
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_RETYPE_PASSWORD}:</td>
-	<td class="value_input">
-		<input type="password" name="password2" maxlength="30" />
-	</td>
-</tr>
-<tr style="{DISPLAY_EXTRA}">
-	<td>&nbsp;</td>
-	<td style="font-size: 10px;">
-		{CHANGING_PASSWORD}
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_DISPLAY_NAME}:</td>
-	<td class="value_input">
-		<input type="text" name="display_name" maxlength="255" value="{DISPLAY_NAME}" />
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_EMAIL}:</td>
-	<td class="value_input">
-		<input type="text" name="email" maxlength="255" value="{EMAIL}" />
-	</td>
-</tr>
-<tr style="{DISPLAY_HOME_FOLDERS}">
-	<td>{TEXT_HOME_FOLDER}:</td>
-	<td class="value_input">
-		<select name="home_folder">
-			<option value="">{TEXT_NONE}</option>
-			<!-- BEGIN folder_list_block -->
-			<option value="{FOLDER}"{SELECTED}>{NAME}</option>
-			<!-- END folder_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_GROUP}:</td>
-	<td class="value_input">
-		<select name="groups[]" multiple="multiple" size="5">
-		<!-- BEGIN group_list_block -->
-			<option value="{ID}" {SELECTED}>{NAME}</option>
-		<!-- END group_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="radio" name="active[]" id="active" value="1" {ACTIVE_CHECKED} />
-		<label for="active">{TEXT_ACTIVE}</label>
-		<input type="radio" name="active[]" id="disabled" value="0" {DISABLED_CHECKED} />
-		<label for="disabled">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
-		<input type="reset" name="reset" value="{TEXT_RESET}" />
-	</td>
-</tr>
-</table>
-
-</form>
-
+<!-- BEGIN main_block -->
+
+<script type="text/javascript">
+function toggle_radio(radio_on, radio_off) {
+	document.getElementById(radio_on).checked = true;
+	document.getElementById(radio_off).checked = true;
+}
+</script>
+
+<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_USER}</h2>
+
+<form name="user" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
+<input type="hidden" name="user_id" value="{USER_ID}" />
+<input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
+{FTAN}
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="150">{TEXT_USERNAME}:</td>
+	<td class="value_input">
+		<input type="text" name="{USERNAME_FIELDNAME}" maxlength="30" value="{USERNAME}" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_PASSWORD}:</td>
+	<td class="value_input">
+		<input type="password" name="password" maxlength="30" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_RETYPE_PASSWORD}:</td>
+	<td class="value_input">
+		<input type="password" name="password2" maxlength="30" />
+	</td>
+</tr>
+<tr style="{DISPLAY_EXTRA}">
+	<td>&nbsp;</td>
+	<td style="font-size: 10px;">
+		{CHANGING_PASSWORD}
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_DISPLAY_NAME}:</td>
+	<td class="value_input">
+		<input type="text" name="display_name" maxlength="255" value="{DISPLAY_NAME}" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_EMAIL}:</td>
+	<td class="value_input">
+		<input type="text" name="email" maxlength="255" value="{EMAIL}" />
+	</td>
+</tr>
+<tr style="{DISPLAY_HOME_FOLDERS}">
+	<td>{TEXT_HOME_FOLDER}:</td>
+	<td class="value_input">
+		<select name="home_folder">
+			<option value="">{TEXT_NONE}</option>
+			<!-- BEGIN folder_list_block -->
+			<option value="{FOLDER}"{SELECTED}>{NAME}</option>
+			<!-- END folder_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_GROUP}:</td>
+	<td class="value_input">
+		<select name="groups[]" multiple="multiple" size="5">
+		<!-- BEGIN group_list_block -->
+			<option value="{ID}" {SELECTED}>{NAME}</option>
+		<!-- END group_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="radio" name="active[]" id="active" value="1" {ACTIVE_CHECKED} />
+		<label for="active">{TEXT_ACTIVE}</label>
+		<input type="radio" name="active[]" id="disabled" value="0" {DISABLED_CHECKED} />
+		<label for="disabled">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
+		<input type="reset" name="reset" value="{TEXT_RESET}" />
+	</td>
+</tr>
+</table>
+
+</form>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/header.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/header.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/header.htt	(revision 1428)
@@ -7,12 +7,9 @@
 <meta http-equiv="content-language" content="{LANGUAGE}" />
 <meta name="description" content="{TEXT_ADMINISTRATION}" />
 <meta name="keywords" content="{TEXT_ADMINISTRATION}" />
-<meta http-equiv="cache-control" content="no-cache" />
-<meta http-equiv="cache-control" content="no-store" />
-<meta http-equiv="cache-control" content="max-age=0" />
-<meta http-equiv="cache-control" content="must-revalidate" />
-<meta http-equiv="expires" content="0" />
-<meta http-equiv="pragma" content="no-cache" />
+<meta name="author" content="WebsiteBaker Org e.V." />
+<meta http-equiv="Content-Encoding" content="gzip" />
+<meta http-equiv="Accept-Encoding" content="gzip, deflate" />
 <link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
 {BACKEND_MODULE_CSS}
 <script type="text/javascript">
@@ -25,13 +22,12 @@
 <script src="{WB_URL}/include/jquery/jquery-include.js" type="text/javascript"></script>
 <!--[if lt IE 7]><script type="text/javascript" src="{WB_URL}/include/jquery/plugins/jquery-pngFix.js"></script><![endif]-->
 <script src="{THEME_URL}/jquery/jquery-plugins.js" type="text/javascript"></script>
-<script src="{WB_URL}/include/editarea/edit_area_full.js" type="text/javascript"></script>
-{BACKEND_MODULE_JS}
 <script type="text/javascript">
 function confirm_link(message, url) {
 	if(confirm(message)) location.href = url;
 }
 </script>
+{BACKEND_MODULE_JS}
 </head>
 <body>
 <div id="admin_header">
@@ -41,7 +37,7 @@
       <br />
       <span class="version">CMS Version  {VERSION}</span><br/>
       <span class="version">Revision {REVISION}</span><br/>
-      <span class="version">Admin version 1.4</span>
+      <span class="version">Admin version 1.5</span>
 	 </div>
     <a href="{ADMIN_URL}" title="{TITLE_START}" id="website_title">
     {WEBSITE_TITLE} - {TEXT_ADMINISTRATION}
Index: branches/2.8.x/wb/templates/argos_theme/templates/setparameter.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/setparameter.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/setparameter.htt	(revision 1428)
@@ -1,4 +1,4 @@
-<!-- BEGIN main_block --> 
+<!-- BEGIN main_block -->
 <!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>
@@ -34,7 +34,7 @@
 </head>
 <body>
 
-<table cellpadding="4" cellspacing="0" border="0" width="100%" style="border-bottom: 1px solid #666; width: 100%;">
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" style="border-bottom: 1px solid #666; width: 100%;">
 <tr style="background-color: #DDD;">
 	<td align="center">{TEXT_HEADER}</td>
 </tr>
@@ -41,7 +41,7 @@
 </table>
 <form method="post" action="{ADMIN_URL}/media/setparameter.php">
 	{FTAN}
-<table cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
 	<tr><td>{SETTINGS}</td><td><input type="checkbox" name="show_thumbs" {NO_SHOW_THUMBS_SELECTED}> {NO_SHOW_THUMBS}</td></tr>
 	<tr class="{DISPLAY_ADMIN}"><td></td>&nbsp;<td><input type="checkbox" name="admin_only" {ADMIN_ONLY_SELECTED}> {ADMIN_ONLY}</td></tr>
 	<tr><td colspan="2" style="border-bottom: 1px solid #666; line-height: 1px;">&nbsp;</td></tr>
Index: branches/2.8.x/wb/templates/argos_theme/templates/start.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/start.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/start.htt	(revision 1428)
@@ -1,75 +1,75 @@
-<!-- BEGIN main_block -->
-
-<table cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-  <tr>
-    <td colspan="3">{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}. </td>
-  </tr>
-  <tr style="{DISPLAY_WARNING};">
-    <td colspan="3" align="center" style="color: #FF0000; font-weight: bold;">{WARNING}</td>
-  </tr>
-  <tr>
-    <td align="center" valign="top" width="49%">
-      <table cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_PAGES};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/pages/index.php"> <img src="{THEME_URL}/icons/pages.png" border="0" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/pages/index.php"><div class="title">{PAGES}</div></a>
-		  {PAGES_OVERVIEW}
-		  </td>
-        </tr>
-
-      </table>
-      <table cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADDONS};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/addons/index.php"> <img src="{THEME_URL}/icons/addons.png" border="0" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/addons/index.php"><div class="title">{ADDONS}</div></a>
-		  {ADDONS_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-      <table cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_SETTINGS};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/settings/index.php"> <img src="{THEME_URL}/icons/settings.png" border="0" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/settings/index.php"><div class="title">{SETTINGS}</div></a>
-		  {SETTINGS_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-      <table cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ACCESS};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/access/index.php"> <img src="{THEME_URL}/icons/access.png" border="0" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/access/index.php"><div class="title">{ACCESS}</div></a>
-		  {ACCESS_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-    </td>
-    <td width="10">&nbsp; </td>
-    <td align="center" valign="top">
-	  <table cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_MEDIA};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/media/index.php"> <img src="{THEME_URL}/icons/media.png" border="0" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/media/index.php"><div class="title">{MEDIA}</div></a>
-		  {MEDIA_OVERVIEW}
-		  </td>
-        </tr>
-      </table>	  
-      <table cellpadding="0" cellspacing="0" border="0" class="section">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/preferences/index.php"> <img src="{THEME_URL}/icons/preferences.png" border="0" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/preferences/index.php"><div class="title">{PREFERENCES}</div></a>
-		  {PREFERENCES_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-      <table cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADMINTOOLS};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/admintools/index.php"> <img src="{THEME_URL}/icons/admintools.png" border="0" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/admintools/index.php"><div class="title">{ADMINTOOLS}</div></a>
-		  {ADMINTOOLS_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+  <tr>
+    <td colspan="3">{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}. </td>
+  </tr>
+  <tr style="{DISPLAY_WARNING};">
+    <td colspan="3" align="center" style="color: #FF0000; font-weight: bold;">{WARNING}</td>
+  </tr>
+  <tr>
+    <td align="center" valign="top" width="49%">
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_PAGES};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/pages/index.php"> <img src="{THEME_URL}/icons/pages.png" border="0" alt="{PAGES}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/pages/index.php"><span class="title">{PAGES}</span></a>
+		  {PAGES_OVERVIEW}
+		  </td>
+        </tr>
+
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADDONS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/addons/index.php"> <img src="{THEME_URL}/icons/addons.png" border="0" alt="{ADDONS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/addons/index.php"><span class="title">{ADDONS}</span></a>
+		  {ADDONS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_SETTINGS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/settings/index.php"> <img src="{THEME_URL}/icons/settings.png" border="0" alt="{SETTINGS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/settings/index.php"><span class="title">{SETTINGS}</span></a>
+		  {SETTINGS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ACCESS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/access/index.php"> <img src="{THEME_URL}/icons/access.png" border="0" alt="{ACCESS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/access/index.php"><span class="title">{ACCESS}</span></a>
+		  {ACCESS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+    </td>
+    <td width="10">&nbsp; </td>
+    <td align="center" valign="top">
+	  <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_MEDIA};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/media/index.php"> <img src="{THEME_URL}/icons/media.png" border="0" alt="{MEDIA}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/media/index.php"><span class="title">{MEDIA}</span></a>
+		  {MEDIA_OVERVIEW}
+		  </td>
+        </tr>
+      </table>	  
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/preferences/index.php"> <img src="{THEME_URL}/icons/preferences.png" border="0" alt="{PREFERENCES}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/preferences/index.php"><span class="title">{PREFERENCES}</span></a>
+		  {PREFERENCES_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADMINTOOLS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/admintools/index.php"> <img src="{THEME_URL}/icons/admintools.png" border="0" alt="{ADMINTOOLS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/admintools/index.php"><span class="title">{ADMINTOOLS}</span></a>
+		  {ADMINTOOLS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/templates.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/templates.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/templates.htt	(revision 1428)
@@ -1,88 +1,88 @@
-<!-- BEGIN main_block -->
-
-<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
-		<td align="right">
-			{URL_MODULES}
-			-
-			{URL_LANGUAGES}
-			-
-			{URL_ADVANCED}
-		</td>
-     </tr>
-</table>
-
-<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
-{FTAN}
-
-<h2>{HEADING_INSTALL_TEMPLATE}</h2>
-
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td>
-		<input type="file" name="userfile" size="82%" />
-		<script type="text/javascript">
-		document.install.userfile.focus();
-		</script>
-	</td>
-	<td width="110" align="left">
-		<input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" />
-	</td>
-</tr>
-</table>
-
-<br />
-
-</form>
-
-<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
-{FTAN}
-
-<h2>{HEADING_UNINSTALL_TEMPLATE}</h2>
-
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td>
-		<select name="file" style="width: 97%;">
-		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN template_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-		<!-- END template_list_block -->
-		</select>
-	</td>
-	<td width="110">
-		<input type="submit" name="submit" value="{TEXT_UNINSTALL}" style="width: 100px;" />
-	</td>
-</tr>
-</table>
-
-<br />
-
-</form>
-
-<form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
-{FTAN}
-
-<h2>{HEADING_TEMPLATE_DETAILS}</h2>
-
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td>
-		<select name="file" style="width: 97%;">
-		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN template_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-		<!-- END template_list_block -->
-		</select>
-	</td>
-	<td width="110">
-		<input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
-	</td>
-</tr>
-</table>
-
-<br />
-</form>
-
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
+		<td align="right">
+			{URL_MODULES}
+			-
+			{URL_LANGUAGES}
+			-
+			{URL_ADVANCED}
+		</td>
+     </tr>
+</table>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
+
+<h2>{HEADING_INSTALL_TEMPLATE}</h2>
+
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td>
+		<input type="file" name="userfile" size="82" />
+		<script type="text/javascript">
+		document.install.userfile.focus();
+		</script>
+	</td>
+	<td width="110" align="left">
+		<input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" />
+	</td>
+</tr>
+</table>
+
+<br />
+
+</form>
+
+<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
+{FTAN}
+
+<h2>{HEADING_UNINSTALL_TEMPLATE}</h2>
+
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td>
+		<select name="file" style="width: 97%;">
+		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN template_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+		<!-- END template_list_block -->
+		</select>
+	</td>
+	<td width="110">
+		<input type="submit" name="submit" value="{TEXT_UNINSTALL}" style="width: 100px;" />
+	</td>
+</tr>
+</table>
+
+<br />
+
+</form>
+
+<form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
+{FTAN}
+
+<h2>{HEADING_TEMPLATE_DETAILS}</h2>
+
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td>
+		<select name="file" style="width: 97%;">
+		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN template_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+		<!-- END template_list_block -->
+		</select>
+	</td>
+	<td width="110">
+		<input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
+	</td>
+</tr>
+</table>
+
+<br />
+</form>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt	(revision 1428)
@@ -41,7 +41,7 @@
 	</td>
 	<td width="60" align="right" class="{DISPLAY_RENAME}">
 		<a href="rename.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}"><img src="{THEME_URL}/images/modify_16.png" alt="{TEXT_RENAME}" border="0" /> </a> &nbsp;&nbsp;
-		<a href="#" onclick="javascript: confirm_link('{CONFIRM_DELETE}\n {NAME_SLASHED}', 'delete.php?dir={CURRENT_DIR}%26id={TEMP_ID}');"><img src="{THEME_URL}/images/delete_16.png" alt="{TEXT_DELETE}" border="0" /></a>&nbsp;&nbsp;
+		<a href="#" onclick="javascript: confirm_link('{CONFIRM_DELETE}\n {NAME_SLASHED}', 'delete.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}');"><img src="{THEME_URL}/images/delete_16.png" alt="{TEXT_DELETE}" border="0" /></a>&nbsp;&nbsp;
 	</td>
 </tr>
 <!-- END list_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt	(revision 1428)
@@ -1,9 +1,8 @@
 <!-- BEGIN main_block -->
+<h2>{HEADING_MY_SETTINGS}</h2>
 <div class="content_box">
 	<form name="{FORM_NAME}" id="{FORM_NAME}" action="{ACTION_URL}" method="post">
 		{FTAN}
-		<fieldset class="be_section">
-			<legend class="content_legend">{HEADING_MY_SETTINGS}</legend>
 			<div class="subcolumns">
 				<div class="c25l">
 					<label>{TEXT_USERNAME}:</label><br />
@@ -68,9 +67,7 @@
 					</select>
 				</div>
 			</div>
-		</fieldset>
-		<fieldset class="be_section">
-			<legend class="content_legend">{HEADING_MY_EMAIL}</legend>
+
 			<div class="subcolumns">
 				<div class="c25l">
 					<label>{TEXT_EMAIL}:</label><br />
@@ -79,9 +76,6 @@
 					<input type="text" id="email" name="email" value="{EMAIL}" /><br />
 				</div>
 			</div>
-		</fieldset>
-		<fieldset class="be_section">
-			<legend class="content_legend">{HEADING_MY_PASSWORD}</legend>
 			<div class="subcolumns">
 				<div class="c25l">
 					<label>{TEXT_NEW_PASSWORD}:</label><br />
@@ -98,9 +92,6 @@
 					<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" /><br />
 				</div>
 			</div>
-		</fieldset>
-		<fieldset class="be_section">
-			<legend class="content_legend">{TEXT_SAVE}</legend>
 			<div class="subcolumns">
 				<div class="c25l">
 					<label>{TEXT_NEED_CURRENT_PASSWORD}:</label><br />
@@ -117,7 +108,6 @@
 				<div class="c25l">
 				</div>
 			</div>
-		</fieldset>
 	</form>
 </div>
 
Index: branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt	(revision 1428)
@@ -17,7 +17,7 @@
 <tr>
 	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
 	<td>
-		<table cellpadding="0" cellspacing="0" width="100%" border="0">
+		<table summary="" cellpadding="0" cellspacing="0" width="100%" border="0">
 		<tr>
 			<td>
 				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
@@ -223,7 +223,7 @@
 </tr>
 </table>
 
-<table cellpadding="2" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
 <tr>
 	<td valign="top" align="left" width="150">{TEXT_MODULE_PERMISSIONS}:</td>
 	<td valign="top" align="left">
@@ -266,7 +266,7 @@
 <input type="hidden" name="group_id" value="{GROUP_ID}" />
 <input type="hidden" name="action" value="modify" />
 {FTAN}
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
 <tr>
     <td>&nbsp;</td>
 	<td style="text-align:center;">
Index: branches/2.8.x/wb/templates/argos_theme/templates/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/languages.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/languages.htt	(revision 1428)
@@ -1,71 +1,71 @@
-<!-- BEGIN main_block -->
-
-<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
-		<td align="right">
-			{URL_MODULES}
-			-
-			{URL_TEMPLATES}
-			-
-			{URL_ADVANCED}
-		</td>
-     </tr>
-</table>
-
-<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
-  <h2>{HEADING_INSTALL_LANGUAGE}</h2>
-  <table cellpadding="2" cellspacing="0" border="0" width="100%">
-    <tr>
-      <td>
-        <input type="file" name="userfile" size="97%" />
-        <script type="text/javascript">
-		document.install.userfile.focus();
-		</script>
-      </td>
-      <td width="110" align="left">
-        <input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" />
-      </td>
-    </tr>
-  </table>
-  <br />
-</form>
-<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
-  <h2>{HEADING_UNINSTALL_LANGUAGE}</h2>
-  <table cellpadding="2" cellspacing="0" border="0" width="100%">
-    <tr>
-      <td>
-        <select name="code" style="width: 97%;">
-		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN language_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-          <!-- END language_list_block -->
-        </select>
-      </td>
-      <td width="110">
-        <input type="submit" name="submit" value="{TEXT_UNINSTALL}" style="width: 100px;" />
-      </td>
-    </tr>
-  </table>
-  <br />
-</form>
-<form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
-  <h2>{HEADING_LANGUAGE_DETAILS}</h2>
-  <table cellpadding="2" cellspacing="0" border="0" width="100%">
-    <tr>
-      <td>
-        <select name="code" style="width: 97%;">
-		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN language_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-          <!-- END language_list_block -->
-        </select>
-      </td>
-      <td width="110">
-        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
-      </td>
-    </tr>
-  </table>
-  <br />
-</form>
-<!-- END main_block -->
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
+		<td align="right">
+			{URL_MODULES}
+			-
+			{URL_TEMPLATES}
+			-
+			{URL_ADVANCED}
+		</td>
+     </tr>
+</table>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+  <h2>{HEADING_INSTALL_LANGUAGE}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td>
+        <input type="file" name="userfile" size="97" />
+        <script type="text/javascript">
+		document.install.userfile.focus();
+		</script>
+      </td>
+      <td width="110" align="left">
+        <input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" />
+      </td>
+    </tr>
+  </table>
+  <br />
+</form>
+<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
+  <h2>{HEADING_UNINSTALL_LANGUAGE}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td>
+        <select name="code" style="width: 97%;">
+		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN language_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+          <!-- END language_list_block -->
+        </select>
+      </td>
+      <td width="110">
+        <input type="submit" name="submit" value="{TEXT_UNINSTALL}" style="width: 100px;" />
+      </td>
+    </tr>
+  </table>
+  <br />
+</form>
+<form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
+  <h2>{HEADING_LANGUAGE_DETAILS}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td>
+        <select name="code" style="width: 97%;">
+		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN language_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+          <!-- END language_list_block -->
+        </select>
+      </td>
+      <td width="110">
+        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
+      </td>
+    </tr>
+  </table>
+  <br />
+</form>
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt	(revision 1428)
@@ -1,6 +1,6 @@
 <!-- BEGIN main_block -->
 <div class="jsadmin jcalendar hide"></div>
-<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
 	<tr style="background:#f0f0f0;">
 		<td valign="middle" align="left"><h2>{HEADING_MANAGE_SECTIONS}</h2></td>
 		<td align="left" width="20%">ID: {PAGE_ID}</td>
@@ -16,7 +16,7 @@
         <form name="section_properties" action="{ADMIN_URL}/pages/sections_save.php?page_id={PAGE_IDKEY}" method="post">
 		{FTAN}
 		
-        <table cellpadding="0" cellspacing="0" border="0" width="100%" class="img_noborder">
+        <table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" class="img_noborder">
 			<tr class="sections_list">
 				<td class="header_list_type">{TEXT_TYPE}</td>
 				<td class="header_list_block"><span {STYLE_DISPLAY_SECTION_BLOCK}>{TEXT_BLOCK}&nbsp;</span></td>
@@ -60,13 +60,13 @@
                     <td>{VAR_MOVE_DOWN_URL}</td>
 
                     <td>
-                        <a href="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_ID}');">
+                        <a href="#" onclick="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_ID}');">
                         <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="{TEXT_DELETE}" border="0" />
                         </a>
                     </td>
-					
+
                     <td class="list_section_id">{VAR_SECTION_ID}</td>
-					
+
                     <td {DISPLAY_DEBUG}>{POSITION}</td>
                 </tr>
 <!-- END section_block -->
@@ -83,7 +83,7 @@
 	<form name="add" action="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" method="post">
         <input type="hidden" name="page_id" value="{PAGE_IDKEY}"  />
 		{FTAN}
-    	<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%">
+    	<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%">
     	<tr>
     		<td width="50%" valign="middle">
     			<select name="module" class="input_large">
Index: branches/2.8.x/wb/templates/argos_theme/templates/modules_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/modules_details.htt	(revision 1427)
+++ branches/2.8.x/wb/templates/argos_theme/templates/modules_details.htt	(revision 1428)
@@ -2,7 +2,7 @@
 
 <h2>{HEADING_MODULE_DETAILS}</h2>
 
-<table cellpadding="5" cellspacing="0" border="0">
+<table summary="" cellpadding="5" cellspacing="0" border="0">
 <tr>
 	<td width="100">{TEXT_NAME}:</td>
 	<td>{NAME}</td>
Index: branches/2.8.x/wb/modules/edit_module_files.php
===================================================================
--- branches/2.8.x/wb/modules/edit_module_files.php	(revision 1427)
+++ branches/2.8.x/wb/modules/edit_module_files.php	(revision 1428)
@@ -1,150 +1,147 @@
-<?php
-/**
- *
- * @category        backend
- * @package         modules
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// prevent this file from being accessed directly
-if(!(isset($_POST['page_id']) && isset($_POST['section_id']) && isset($_POST['action'])
-	&& isset($_POST['mod_dir'])  && isset($_POST['edit_file']))) die(header('Location: index.php'));
-
-// include configuration file and admin wrapper script
-require('../config.php');
-
-// include the and admin wrapper script
-require(WB_PATH.'/modules/admin.php');
-
-// leave if the required module.functions.php file does not exist
-if(!file_exists(WB_PATH .'/framework/module.functions.php')) {
-	echo 'The required file: /framework/module.functions.php is missing - script stopped.';
-	die;
-}
-
-echo (function_exists('registerEditArea')) ? registerEditArea('code_area', 'css', false) : 'none';
-
-// set default text output if varibles are not defined in the global WB language files
-$HEADING_CSS_FILE = (isset($GLOBALS['TEXT']['HEADING_CSS_FILE'])) ?$GLOBALS['TEXT']['HEADING_CSS_FILE'] :'Actual module file: ';
-$TXT_EDIT_CSS_FILE = (isset($GLOBALS['TEXT']['TXT_EDIT_CSS_FILE'])) ?$GLOBALS['TEXT']['TXT_EDIT_CSS_FILE'] :'Edit the CSS definitions in the textarea below.';
-
-// include functions to edit the optional module CSS files (frontend.css, backend.css)
-require_once(WB_PATH .'/framework/module.functions.php');
-
-// check if the module directory is valid
-$mod_dir = check_module_dir($_POST['mod_dir']);
-if($mod_dir == '')
-{
-	echo 'The specified module directory is invalid - script stopped.';
-	die;
-};
-
-// check if action is: save or edit
-if($_POST['action'] == 'save' && mod_file_exists($mod_dir, $_POST['edit_file'])) {
-	/** 
-		SAVE THE UPDATED CONTENTS TO THE CSS FILE
-	*/
-	$css_content = '';
-	if (isset($_POST['css_data']) && strlen($_POST['css_data']) > 0) {
-		$css_content = stripslashes($_POST['css_data']);
-	}
-
-	$bytes = 0;
-	if ($css_content != '')
-    {
-		// open the module CSS file for writting
-		$mod_file = @fopen(WB_PATH .'/modules/' .$mod_dir .'/' .$_POST['edit_file'], 'wb');
-		// write new content to the module CSS file
-		$bytes = @fwrite($mod_file, $css_content);
-		// close the file
-		@fclose($mod_file);
-	}
-
-	// write out status message
-	if($bytes == 0 )
-    {
-		$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	} else {
-		$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	}
-
-
-} else {
-	/** 
-		MODIFY CONTENTS OF THE CSS FILE VIA TEXT AREA 
-	*/
-	// check if module backend.css file needs to be included into the <body>
-	if((!method_exists($admin, 'register_backend_modfiles') || !isset($_GET['page_id']))
-			&& file_exists(WB_PATH .'/modules/'.$mod_dir.'/backend.css')) {
-		echo '<style type="text/css">';
-		include(WB_PATH .'/modules/' .$mod_dir .'/backend.css');
-		echo "\n</style>\n";
-	}
-
-	// check which module file to edit (frontend.css, backend.css or '')
-	$css_file = (in_array($_POST['edit_file'], array('frontend.css', 'backend.css'))) ? $_POST['edit_file'] : '';
-
-	// display output
-	if($css_file == '')
-    {
-		// no valid module file to edit; display error message and backlink to modify.php
-		echo "<h2>Nothing to edit</h2>";
-		echo "<p>No valid module file exists for this module.</p>";
-		$output  = "<a href=\"#\" onclick=\"javascript: window.location = '";
-		$output .= ADMIN_URL ."/pages/modify.php?page_id=" .$page_id ."'\">back</a>";
-		echo $output;
-	
-	} else {
-		// store content of the module file in variable
-		$css_content = @file_get_contents(WB_PATH .'/modules/' .$mod_dir .'/' .$css_file);
-		// write out heading
-		echo '<h2>' .$HEADING_CSS_FILE .'"' .$css_file .'"</h2>';
-		// include button to switch between frontend.css and backend.css (only shown if both files exists)
-		toggle_css_file($mod_dir, $css_file); 
-		echo '<p>' .$TXT_EDIT_CSS_FILE .'</p>';
-
-		// output content of module file to textareas
-	?>
-		<form name="edit_module_file" action="<?php echo $_SERVER['SCRIPT_NAME'];?>" method="post" style="margin: 0;">
-	  	<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" />
-	  	<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" />
-	  	<input type="hidden" name="mod_dir" value="<?php echo $mod_dir; ?>" />
-		<input type="hidden" name="edit_file" value="<?php echo $css_file; ?>" />
-	  	<input type="hidden" name="action" value="save" />
-		<textarea id="code_area" name="css_data" cols="115" rows="25" wrap="VIRTUAL" style="margin:2px;width:100%;"><?php
-			echo htmlspecialchars($css_content); ?>
-		</textarea>
-<?php
-
-?>
-  			<table cellpadding="0" cellspacing="0" border="0" width="100%">
-  			<tr>
-    			<td class="left">
- 				<input name="save" type="submit" value="<?php echo $TEXT['SAVE'];?>" style="width: 100px; margin-top: 5px;" />
-    			</td>
-  				<td class="right">
-      			<input type="button" value="<?php echo $TEXT['CANCEL']; ?>"
-						onclick="javascript: window.location = '<?php echo ADMIN_URL;?>/pages/modify.php?page_id=<?php echo $page_id; ?>';"
-						style="width: 100px; margin-top: 5px;" />
-  				</td>
-  			</tr>
-  			</table>
-		</form>
-		<?php 
-	}
-}
-
-// Print admin footer
-$admin->print_footer();
-
+<?php
+/**
+ *
+ * @category        backend
+ * @package         modules
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// prevent this file from being accessed directly
+if(!(isset($_POST['page_id']) && isset($_POST['section_id']) && isset($_POST['action'])
+	&& isset($_POST['mod_dir'])  && isset($_POST['edit_file']))) die(header('Location: index.php'));
+
+// include configuration file and admin wrapper script
+require('../config.php');
+
+require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');
+
+// include the and admin wrapper script
+require(WB_PATH.'/modules/admin.php');
+
+// leave if the required module.functions.php file does not exist
+if(!file_exists(WB_PATH .'/framework/module.functions.php')) {
+	echo 'The required file: /framework/module.functions.php is missing - script stopped.';
+	die;
+}
+echo (function_exists('registerEditArea')) ? registerEditArea('code_area', 'css') : 'none';
+// set default text output if varibles are not defined in the global WB language files
+$HEADING_CSS_FILE = (isset($GLOBALS['TEXT']['HEADING_CSS_FILE'])) ?$GLOBALS['TEXT']['HEADING_CSS_FILE'] :'Actual module file: ';
+$TXT_EDIT_CSS_FILE = (isset($GLOBALS['TEXT']['TXT_EDIT_CSS_FILE'])) ?$GLOBALS['TEXT']['TXT_EDIT_CSS_FILE'] :'Edit the CSS definitions in the textarea below.';
+
+// include functions to edit the optional module CSS files (frontend.css, backend.css)
+require_once(WB_PATH .'/framework/module.functions.php');
+
+// check if the module directory is valid
+$mod_dir = check_module_dir($_POST['mod_dir']);
+if($mod_dir == '')
+{
+	echo 'The specified module directory is invalid - script stopped.';
+	die;
+};
+
+// check if action is: save or edit
+if($_POST['action'] == 'save' && mod_file_exists($mod_dir, $_POST['edit_file'])) {
+	/** 
+		SAVE THE UPDATED CONTENTS TO THE CSS FILE
+	*/
+	$css_content = '';
+	if (isset($_POST['css_data']) && strlen($_POST['css_data']) > 0) {
+		$css_content = stripslashes($_POST['css_data']);
+	}
+
+	$bytes = 0;
+	if ($css_content != '')
+    {
+		// open the module CSS file for writting
+		$mod_file = @fopen(WB_PATH .'/modules/' .$mod_dir .'/' .$_POST['edit_file'], 'wb');
+		// write new content to the module CSS file
+		$bytes = @fwrite($mod_file, $css_content);
+		// close the file
+		@fclose($mod_file);
+	}
+
+	// write out status message
+	if($bytes == 0 )
+    {
+		$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+	} else {
+		$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+	}
+
+
+} else {
+	/** 
+		MODIFY CONTENTS OF THE CSS FILE VIA TEXT AREA 
+	*/
+	// check if module backend.css file needs to be included into the <body>
+	if((!method_exists($admin, 'register_backend_modfiles') || !isset($_GET['page_id']))
+			&& file_exists(WB_PATH .'/modules/'.$mod_dir.'/backend.css')) {
+		echo '<style type="text/css">';
+		include(WB_PATH .'/modules/' .$mod_dir .'/backend.css');
+		echo "\n</style>\n";
+	}
+
+	// check which module file to edit (frontend.css, backend.css or '')
+	$css_file = (in_array($_POST['edit_file'], array('frontend.css', 'backend.css'))) ? $_POST['edit_file'] : '';
+
+	// display output
+	if($css_file == '')
+    {
+		// no valid module file to edit; display error message and backlink to modify.php
+		echo "<h2>Nothing to edit</h2>";
+		echo "<p>No valid module file exists for this module.</p>";
+		$output  = "<a href=\"#\" onclick=\"javascript: window.location = '";
+		$output .= ADMIN_URL ."/pages/modify.php?page_id=" .$page_id ."'\">back</a>";
+		echo $output;
+	
+	} else {
+		// store content of the module file in variable
+		$css_content = @file_get_contents(WB_PATH .'/modules/' .$mod_dir .'/' .$css_file);
+		// write out heading
+		echo '<h2>' .$HEADING_CSS_FILE .'"' .$css_file .'"</h2>';
+		// include button to switch between frontend.css and backend.css (only shown if both files exists)
+		toggle_css_file($mod_dir, $css_file);
+		echo '<p>' .$TXT_EDIT_CSS_FILE .'</p>';
+
+		// output content of module file to textareas
+	?>
+		<form name="edit_module_file" action="<?php echo $_SERVER['SCRIPT_NAME'];?>" method="post" style="margin: 0;">
+	  	<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" />
+	  	<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" />
+	  	<input type="hidden" name="mod_dir" value="<?php echo $mod_dir; ?>" />
+		<input type="hidden" name="edit_file" value="<?php echo $css_file; ?>" />
+	  	<input type="hidden" name="action" value="save" />
+		<textarea id="code_area" name="css_data" cols="100" rows="25" wrap="VIRTUAL" style="margin:2px;width:100%;">
+		<?php echo htmlspecialchars($css_content); ?>
+		</textarea>
+  			<table cellpadding="0" cellspacing="0" border="0" width="100%">
+  			<tr>
+    			<td class="left">
+ 				<input name="save" type="submit" value="<?php echo $TEXT['SAVE'];?>" style="width: 100px; margin-top: 5px;" />
+    			</td>
+  				<td class="right">
+      			<input type="button" value="<?php echo $TEXT['CANCEL']; ?>"
+						onclick="javascript: window.location = '<?php echo ADMIN_URL;?>/pages/modify.php?page_id=<?php echo $page_id; ?>';"
+						style="width: 100px; margin-top: 5px;" />
+  				</td>
+  			</tr>
+  			</table>
+		</form>
+		<?php 
+	}
+}
+
+// Print admin footer
+$admin->print_footer();
+
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/modules/code/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/code/uninstall.php	(nonexistent)
+++ branches/2.8.x/wb/modules/code/uninstall.php	(revision 1428)
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * @category        modules
+ * @package         show_menu2
+ * @author          Independend-Software-Team
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link            http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource      $HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Must include code to stop this file being access directly
+if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+
+?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/code/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision Id HeadURL
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/modify.php
===================================================================
--- branches/2.8.x/wb/modules/code/modify.php	(revision 1427)
+++ branches/2.8.x/wb/modules/code/modify.php	(revision 1428)
@@ -18,6 +18,9 @@
 
 // Must include code to stop this file being access directly
 if(defined('WB_PATH') == false) { die("Cannot access this file directly"); }
+
+require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');
+
 // Setup template object
 $template = new Template(WB_PATH.'/modules/code');
 $template->set_file('page', 'htt/modify.htt');
Index: branches/2.8.x/wb/modules/code/upgrade.php
===================================================================
--- branches/2.8.x/wb/modules/code/upgrade.php	(nonexistent)
+++ branches/2.8.x/wb/modules/code/upgrade.php	(revision 1428)
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * @category        modules
+ * @package         show_menu2
+ * @author          Independend-Software-Team
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link            http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource      $HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Must include code to stop this file being access directly
+if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+
+?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/code/upgrade.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision Id HeadURL
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property