Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1426)
+++ branches/2.8.x/CHANGELOG	(revision 1427)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.2 -------------------------------------
+04 Feb-2011 Build 1427 Dietmar Woellbrink (Luisehahne)
+! validation fixes in wb_theme
 04 Feb-2011 Build 1426 Dietmar Woellbrink (Luisehahne)
 ! validation fixes
 04 Feb-2011 Build 1425 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/media/browse.php
===================================================================
--- branches/2.8.x/wb/admin/media/browse.php	(revision 1426)
+++ branches/2.8.x/wb/admin/media/browse.php	(revision 1427)
@@ -94,7 +94,7 @@
 // Check to see if the user wanted to go up a directory into the parent folder
 if($admin->get_get('up') == 1) {
 	$parent_directory = dirname($directory);
-	header("Location: browse.php?dir=$parent_directory");	
+	header("Location: browse.php?dir=$parent_directory");
 	exit(0);
 }
 
@@ -103,7 +103,7 @@
 }
 
 // Workout the parent dir link
-$parent_dir_link = ADMIN_URL.'/media/browse.php?dir='.$directory.'&up=1';
+$parent_dir_link = ADMIN_URL.'/media/browse.php?dir='.$directory.'&amp;up=1';
 // Workout if the up arrow should be shown
 if(($directory == '') or ($directory==$currentHome)) {
 	$display_up_arrow = 'hide';
@@ -152,7 +152,7 @@
 											'NAME_SLASHED' => addslashes($name),
 											'TEMP_ID' => $admin->getIDKEY($temp_id),
 											'LINK' => "browse.php?dir=$directory/$link_name",
-											'LINK_TARGET' => '',
+											'LINK_TARGET' => '_SELF',
 											'ROW_BG_COLOR' => $row_bg_color,
 											'FT_ICON' => THEME_URL.'/images/folder_16.png',
 											'FILETYPE_ICON' => THEME_URL.'/images/folder_16.png',
@@ -182,7 +182,7 @@
 			$date = gmdate(DATE_FORMAT.' '.TIME_FORMAT, $fdate);
 			$filetypeicon = get_filetype_icon(WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name);
 			$filetype = get_filetype(WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name);
-				
+
 			if (in_array($filetype, $filepreview)) {
 				$preview = 'preview';
 			} else {
@@ -198,8 +198,8 @@
 				$info = getimagesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name);
 				if ($info[0]) {
 					$imgdetail = fsize(filesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)).'<br /> '.$info[0].' x '.$info[1].' px';
-					$icon = 'thumb.php?t=1&img='.$directory.'/'.$name;
-					$tooltip = ShowTip('thumb.php?t=2&img='.$directory.'/'.$name);
+					$icon = 'thumb.php?t=1&amp;img='.$directory.'/'.$name;
+					$tooltip = ShowTip('thumb.php?t=2&amp;img='.$directory.'/'.$name);
 				}
 			}
 			$template->set_var(array(
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1426)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1427)
@@ -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', '1426');
+if(!defined('REVISION')) define('REVISION', '1427');
 
 ?>
Index: branches/2.8.x/wb/templates/wb_theme/templates/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/users_form.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/users_form.htt	(revision 1427)
@@ -1,94 +1,94 @@
-<!-- BEGIN main_block -->
-
-<script language="javascript" 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 language="javascript" 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/wb_theme/templates/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/login_forgot.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/login_forgot.htt	(revision 1427)
@@ -1,77 +1,77 @@
-<!-- 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();">
-
-<table cellpadding="0" cellspacing="0" border="0" width="770" align="center">
-<tr>
-	<td width="60" valign="top">
-		<img src="{THEME_URL}/images/logo.png" alt="Logo" />
-	</td>
-	<td width="5">&nbsp;</td>
-	<td style="font-size: 20px;">
-		<font style="color: #FFF;">{SECTION_FORGOT}</font>
-	</td>
-</tr>
-</table>
-
-<table cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;" class="container">
-<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();">
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center">
+<tr>
+	<td width="60" valign="top">
+		<img src="{THEME_URL}/images/logo.png" alt="Logo" />
+	</td>
+	<td width="5">&nbsp;</td>
+	<td style="font-size: 20px;">
+		<font style="color: #FFF;">{SECTION_FORGOT}</font>
+	</td>
+</tr>
+</table>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;" class="container">
+<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/wb_theme/templates/start.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/start.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/start.htt	(revision 1427)
@@ -1,153 +1,153 @@
-<!-- BEGIN main_block -->
-
-<table cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-<tr>
-	<td colspan="3" align="center">
-		{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">
-		
-		<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" alt="{PAGES}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/pages/index.php">{PAGES}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{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" alt="{ADDONS}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/addons/index.php">{ADDONS}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{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" alt="{SETTINGS}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/settings/index.php">{SETTINGS}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{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" alt="{ACCESS}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/access/index.php">{ACCESS}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{ACCESS_OVERVIEW}
-			</td>
-		</tr>
-		</table>
-
-	</td>
-	<td width="15">
-		&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" alt="{MEDIA}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/media/index.php">{MEDIA}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{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" alt="{PREFERENCES}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/preferences/index.php">{PREFERENCES}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{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" alt="{ADMINTOOLS}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/admintools/index.php">{ADMINTOOLS}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{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" align="center">
+		{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">
+		
+		<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" alt="{PAGES}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/pages/index.php">{PAGES}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{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" alt="{ADDONS}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/addons/index.php">{ADDONS}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{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" alt="{SETTINGS}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/settings/index.php">{SETTINGS}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{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" alt="{ACCESS}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/access/index.php">{ACCESS}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{ACCESS_OVERVIEW}
+			</td>
+		</tr>
+		</table>
+
+	</td>
+	<td width="15">
+		&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" alt="{MEDIA}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/media/index.php">{MEDIA}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{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" alt="{PREFERENCES}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/preferences/index.php">{PREFERENCES}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{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" alt="{ADMINTOOLS}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/admintools/index.php">{ADMINTOOLS}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{ADMINTOOLS_OVERVIEW}
+			</td>
+		</tr>
+		</table>
+
+	</td>
+</tr>
+</table>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/templates.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/templates.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/templates.htt	(revision 1427)
@@ -1,82 +1,82 @@
-<!-- BEGIN main_block -->
-
-<div class="box">
-	{URL_MODULES}&nbsp;&nbsp;{URL_LANGUAGES}
-</div>
-
-<br />
-{CHANGE_TEMPLATE_NOTICE}<br /><br />
-
-<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 language="javascript" 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 -->
+
+<div class="box">
+	{URL_MODULES}&nbsp;&nbsp;{URL_LANGUAGES}
+</div>
+
+<br />
+{CHANGE_TEMPLATE_NOTICE}<br /><br />
+
+<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 language="javascript" 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/wb_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1427)
@@ -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>
@@ -427,7 +427,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="100%" style="border-right: 1px solid #DDDDDD;" id="{ADVANCED_FILE_PERMS_ID}2">
+		<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" style="border-right: 1px solid #DDDDDD;" id="{ADVANCED_FILE_PERMS_ID}2">
 		<tr>
 			<td colspan="3" style="text-align: center; font-weight: bold;">
 				{TEXT_FILES}:
@@ -473,7 +473,7 @@
 		</table>
 	</td>
 	<td class="setting_value" id="dir_mode" style="text-align: right;">
-		<table cellpadding="2" cellspacing="0" border="0" width="100%" id="{ADVANCED_FILE_PERMS_ID}3">
+		<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" id="{ADVANCED_FILE_PERMS_ID}3">
 		<tr>
 			<td colspan="3" style="text-align: center; font-weight: bold;">
 				{TEXT_DIRECTORIES}:
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 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt	(revision 1427)
@@ -1,107 +1,108 @@
-<!-- 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>Browse Media</title>
-<link href="{THEME_URL}/media.css" rel="stylesheet" type="text/css" />
-<link href="{THEME_URL}/jquery/plugins/fancybox/fancybox.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript">
-function confirm_link(message, url) {
-	if(confirm(message)) location.href = url;
-}
-</script>
-
-<script src="{INCLUDE_PATH}/jquery/jquery-min.js" type="text/javascript"></script>
-<script src="{THEME_URL}/jquery/jquery-fixedheader.js" type="text/javascript"></script>
-<script src="{THEME_URL}/jquery/plugins/fancybox/jquery-fancybox.js" type="text/javascript"></script>
-<script src="{THEME_URL}/jquery/jquery-metadata.js" type="text/javascript"></script>
-
-<script language="javascript" type="text/javascript">
-$(document).ready(function(){
-	$("#browser").fixedHeader({
-		width: '100%', height: 355
-	});
-
-	$("table#browser a.preview").fancybox({
-		'hideOnContentClick': true,
-		'overlayShow': true,
-		'zoomSpeedIn': 0,
-		'zoomSpeedOut': 0
-	});
-})
-</script>
-
-</head>
-<body onload="parent.document.create.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}'; parent.document.upload.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}';">
-<table cellpadding="4" cellspacing="0" border="0" width="100%" class="browse_header">
-	<tr>
-		<td align="left" width="100">
-			<a href="{PARENT_DIR_LINK}">
-				<img src="{THEME_URL}/images/up_folder_16.png" border="0" class="{DISPLAY_UP_ARROW}" alt="^" align="absmiddle" />
-			</a>
-			<a href="{PARENT_DIR_LINK}" class="{DISPLAY_UP_ARROW}">
-				{TEXT_UP}
-			</a>
-		</td>
-		<td align="center">
-			{TEXT_CURRENT_FOLDER}: {MEDIA_DIRECTORY}{CURRENT_DIR}
-		</td>
-		<td align="right" width="100" >
-			<a href="browse.php?dir={CURRENT_DIR}">
-				<img src="{THEME_URL}/images/reload_16.png" border="0" alt="" align="absmiddle" />
-			</a>
-			<a id="reload" href="browse.php?dir={CURRENT_DIR}">
-				{TEXT_RELOAD}
-			</a>
-		</td>
-	</tr>
-</table>
-
-<table id="browser" cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
-	<thead>
-		<tr style="background-color: #EEE;">
-			<th width="18" class="headline">{TEXT_TYPE}</th>
-			<th align="left" class="headline">{TEXT_NAME}</th>
-			<th align="right" width="80" class="headline">{TEXT_SIZE}</th>
-			<th align="right" width="80" class="headline">{TEXT_DATE}</th>
-			<th align="right" width="40" class="headline">{TEXT_RENAME}</th>
-			<th align="right" width="40" class="headline">{TEXT_DELETE}</th>
-		</tr>
-	</thead>
-	<tbody>
-		<!-- BEGIN list_block -->
-		<tr style="background-color: #{ROW_BG_COLOR}" onmouseover="this.style.backgroundColor = '#F1F8DD'" onmouseout="this.style.backgroundColor = '#{ROW_BG_COLOR}'">
-			<td style="padding-left: 10px;">
-				<img src="{FILETYPE_ICON}" class="{DISPLAY_ICON}" border="0" alt="" />
-			</td>
-			<td>
-				<a href="{LINK}" target="{LINK_TARGET}" class="{PREVIEW}">
-					{NAME}
-				</a>
-			</td>
-			<td align="right" style="font-size: 10px;">{SIZE}</td>
-			<td align="right" style="font-size: 10px;">{DATE}</td>
-			<td align="right" class="{DISPLAY_RENAME}">
-				<a href="rename.php?dir={CURRENT_DIR}&id={TEMP_ID}" title="{TEXT_RENAME}">
-					<img src="{THEME_URL}/images/modify_16.png" alt="" border="0" />
-				</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}&id={TEMP_ID}');" title="{TEXT_DELETE}">
-					<img src="{THEME_URL}/images/delete_16.png" alt="" border="0" />
-				</a>
-			</td>
-		</tr>
-		<!-- END list_block -->
-</table>
-
-<span class="{DISPLAY_NONE_FOUND}">
-<br />
-&nbsp; &nbsp; 
-{NONE_FOUND}
-</span>
-
-</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>Browse Media</title>
+<link href="{THEME_URL}/media.css" rel="stylesheet" type="text/css" />
+<link href="{THEME_URL}/jquery/plugins/fancybox/fancybox.css" rel="stylesheet" type="text/css" />
+<script type="text/javascript">
+function confirm_link(message, url) {
+	if(confirm(message)) location.href = url;
+}
+</script>
+
+<script src="{INCLUDE_PATH}/jquery/jquery-min.js" type="text/javascript"></script>
+<script src="{THEME_URL}/jquery/jquery-fixedheader.js" type="text/javascript"></script>
+<script src="{THEME_URL}/jquery/plugins/fancybox/jquery-fancybox.js" type="text/javascript"></script>
+<script src="{THEME_URL}/jquery/jquery-metadata.js" type="text/javascript"></script>
+
+<script language="javascript" type="text/javascript">
+$(document).ready(function(){
+	$("#browser").fixedHeader({
+		width: '100%', height: 355
+	});
+
+	$("table#browser a.preview").fancybox({
+		'hideOnContentClick': true,
+		'overlayShow': true,
+		'zoomSpeedIn': 0,
+		'zoomSpeedOut': 0
+	});
+})
+</script>
+
+</head>
+<body onload="parent.document.create.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}'; parent.document.upload.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}';">
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" class="browse_header">
+	<tr>
+		<td align="left" width="100">
+			<a href="{PARENT_DIR_LINK}">
+				<img src="{THEME_URL}/images/up_folder_16.png" border="0" class="{DISPLAY_UP_ARROW}" alt="^" />
+			</a>
+			<a href="{PARENT_DIR_LINK}" class="{DISPLAY_UP_ARROW}">
+				{TEXT_UP}
+			</a>
+		</td>
+		<td align="center">
+			{TEXT_CURRENT_FOLDER}: {MEDIA_DIRECTORY}{CURRENT_DIR}
+		</td>
+		<td align="right" width="100" >
+			<a href="browse.php?dir={CURRENT_DIR}">
+				<img src="{THEME_URL}/images/reload_16.png" border="0" alt="" />
+			</a>
+			<a id="reload" href="browse.php?dir={CURRENT_DIR}">
+				{TEXT_RELOAD}
+			</a>
+		</td>
+	</tr>
+</table>
+
+<table summary="" id="browser" cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
+	<thead>
+		<tr style="background-color: #EEE;">
+			<th width="18" class="headline">{TEXT_TYPE}</th>
+			<th align="left" class="headline">{TEXT_NAME}</th>
+			<th align="right" width="80" class="headline">{TEXT_SIZE}</th>
+			<th align="right" width="80" class="headline">{TEXT_DATE}</th>
+			<th align="right" width="40" class="headline">{TEXT_RENAME}</th>
+			<th align="right" width="40" class="headline">{TEXT_DELETE}</th>
+		</tr>
+	</thead>
+	<tbody>
+		<!-- BEGIN list_block -->
+		<tr style="background-color: #{ROW_BG_COLOR}" onmouseover="this.style.backgroundColor = '#F1F8DD'" onmouseout="this.style.backgroundColor = '#{ROW_BG_COLOR}'">
+			<td style="padding-left: 10px;">
+				<img src="{FILETYPE_ICON}" class="{DISPLAY_ICON}" border="0" alt="" />
+			</td>
+			<td>
+				<a href="{LINK}" target="{LINK_TARGET}" class="{PREVIEW}">
+					{NAME}
+				</a>
+			</td>
+			<td align="right" style="font-size: 10px;">{SIZE}</td>
+			<td align="right" style="font-size: 10px;">{DATE}</td>
+			<td align="right" class="{DISPLAY_RENAME}">
+				<a href="rename.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}" title="{TEXT_RENAME}">
+					<img src="{THEME_URL}/images/modify_16.png" alt="" border="0" />
+				</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}">
+					<img src="{THEME_URL}/images/delete_16.png" alt="" border="0" />
+				</a>
+			</td>
+		</tr>
+		<!-- END list_block -->
+	</tbody>
+</table>
+
+<span class="{DISPLAY_NONE_FOUND}">
+<br />
+&nbsp; &nbsp; 
+{NONE_FOUND}
+</span>
+
+</body>
+</html>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/users.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/users.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/users.htt	(revision 1427)
@@ -4,7 +4,7 @@
 
 <input type="hidden" name="action" value="delete" />
 
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%">
 <tr>
 	<td align="left">
 		<h2>{HEADING_MODIFY_DELETE_USER}</h2>
Index: branches/2.8.x/wb/templates/wb_theme/templates/access.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/access.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/access.htt	(revision 1427)
@@ -1,10 +1,10 @@
 <!-- BEGIN main_block -->
 
-<table cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+<table summary="" 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} >
+		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_USERS} >
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
 				<a href="{ADMIN_URL}/users/index.php">
@@ -23,7 +23,7 @@
 		</table>
 		<!-- END users_block -->
 		<!-- BEGIN groups_block -->		
-		<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
+		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
 		<tr>
 			<td class="graphic" align="center" valign="middle" rowspan="2">
 				<a href="{ADMIN_URL}/groups/index.php">
Index: branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt	(revision 1427)
@@ -1,294 +1,294 @@
-<!-- BEGIN main_block -->
-
-<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_GROUP}</h2>
-
-<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
-<input type="hidden" name="advanced" value="{ADVANCED}" />
-<input type="hidden" name="group_id" value="{GROUP_ID}" />
-{FTAN}
-<table cellpadding="5" cellspacing="0" border="0" width="100%">
-<tr>
-	<td width="152">{TEXT_NAME}:</td>
-	<td>
-		<input type="text" name="group_name" maxlength="255" value="{GROUP_NAME}" style="width: 100%" />
-	</td>
-</tr>
-</table>
-<table cellpadding="5" cellspacing="0" border="0" width="100%" style="{DISPLAY_BASIC}">
-<tr>
-	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td>
-		<table cellpadding="0" cellspacing="0" width="100%" border="0">
-		<tr>
-			<td>
-				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
-				<label for="pages">{SECTION_PAGES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
-				<label for="media">{SECTION_MEDIA}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
-				<label for="modules">{SECTION_MODULES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
-				<label for="templates">{SECTION_TEMPLATES}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
-				<label for="languages">{SECTION_LANGUAGES}</label>
-			</td>
-			<td>		
-				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
-				<label for="settings">{SECTION_SETTINGS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
-				<label for="users">{SECTION_USERS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
-				<label for="groups">{SECTION_GROUPS}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
-				<label for="admintools">{SECTION_ADMINTOOLS}</label>
-			</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-<table cellpadding="5" cellspacing="0" border="0" width="100%" style="{DISPLAY_ADVANCED}">
-<tr>
-	<td valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td align="left">
-
-
-<table cellpadding="3" cellspacing="0" border="0" width="400">
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_PAGES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
-	<td><label for="pages_view">{TEXT_VIEW}</label></td>
-	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
-	<td>
-		<label for="pages_add">{TEXT_ADD}</label>
-		&nbsp;
-		<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
-		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
-	</td>
-</tr>
-<tr>
-	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
-	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
-	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
-</tr>
-<tr>
-	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
-	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
-	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
-	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_MEDIA}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
-	<td><label for="media_view">{TEXT_VIEW}</label></td>
-	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
-	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
-</tr>
-<tr>
-	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
-	<td><label for="media_rename">{TEXT_RENAME}</label></td>
-	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
-	<td><label for="media_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
-	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_MODULES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
-	<td><label for="modules_view">{TEXT_VIEW}</label></td>
-	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
-	<td><label for="modules_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
-	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_TEMPLATES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
-	<td><label for="templates_view">{TEXT_VIEW}</label></td>
-	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
-	<td><label for="templates_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
-	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_LANGUAGES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
-	<td><label for="languages_view">{TEXT_VIEW}</label></td>
-	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
-	<td><label for="languages_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
-	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_SETTINGS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
-	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
-	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
-	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_USERS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
-	<td><label for="users_view">{TEXT_VIEW}</label></td>
-	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
-	<td><label for="users_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
-	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
-	<td><label for="users_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_GROUPS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
-	<td><label for="groups_view">{TEXT_VIEW}</label></td>
-	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
-	<td><label for="groups_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
-	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
-	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_ADMINTOOLS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
-	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-</table>
-
-
-	</td>
-</tr>
-</table>
-
-<table cellpadding="5" 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">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN module_list_block -->
-			<li>
-				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="m_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END module_list_block -->
-		</ul>
-	</td>
-	<td valign="top" align="left" width="150">
-	{TEXT_TEMPLATE_PERMISSIONS}:
-	</td>
-	<td valign="top" align="left">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN template_list_block -->
-			<li>
-				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="t_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END template_list_block -->
-		</ul>
-	</td>
-</tr>
-
-<tr>
-	<td colspan="2"><input type="submit" name="submit" value="{SUBMIT_TITLE}" /></td>
-    <td colspan="2" align="right"><input type="reset" name="reset" value="{TEXT_RESET}" /></td>
-</tr>
-</table>
-</form>
-
-<table cellpadding="5" cellspacing="0" border="0" width="100%">
-<tr>
-	<td align="center">
-	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
-        <input type="hidden" name="group_id" value="{GROUP_ID}" />
-        <input type="hidden" name="action" value="modify" />
-		{FTAN}
-        <input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
-    </form>
-	</td>
-</tr>
-</table>
-
-
+<!-- BEGIN main_block -->
+
+<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_GROUP}</h2>
+
+<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
+<input type="hidden" name="advanced" value="{ADVANCED}" />
+<input type="hidden" name="group_id" value="{GROUP_ID}" />
+{FTAN}
+<table summary=""  cellpadding="5" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="152">{TEXT_NAME}:</td>
+	<td>
+		<input type="text" name="group_name" maxlength="255" value="{GROUP_NAME}" style="width: 100%" />
+	</td>
+</tr>
+</table>
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%" style="{DISPLAY_BASIC}">
+<tr>
+	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td>
+		<table summary="" cellpadding="0" cellspacing="0" width="100%" border="0">
+		<tr>
+			<td>
+				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
+				<label for="pages">{SECTION_PAGES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
+				<label for="media">{SECTION_MEDIA}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
+				<label for="modules">{SECTION_MODULES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
+				<label for="templates">{SECTION_TEMPLATES}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
+				<label for="languages">{SECTION_LANGUAGES}</label>
+			</td>
+			<td>		
+				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
+				<label for="settings">{SECTION_SETTINGS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
+				<label for="users">{SECTION_USERS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
+				<label for="groups">{SECTION_GROUPS}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
+				<label for="admintools">{SECTION_ADMINTOOLS}</label>
+			</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%" style="{DISPLAY_ADVANCED}">
+<tr>
+	<td valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td align="left">
+
+
+<table summary="" cellpadding="3" cellspacing="0" border="0" width="400">
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_PAGES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
+	<td><label for="pages_view">{TEXT_VIEW}</label></td>
+	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
+	<td>
+		<label for="pages_add">{TEXT_ADD}</label>
+		&nbsp;
+		<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
+		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
+	</td>
+</tr>
+<tr>
+	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
+	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
+	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
+</tr>
+<tr>
+	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
+	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
+	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
+	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_MEDIA}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
+	<td><label for="media_view">{TEXT_VIEW}</label></td>
+	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
+	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
+</tr>
+<tr>
+	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
+	<td><label for="media_rename">{TEXT_RENAME}</label></td>
+	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
+	<td><label for="media_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
+	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_MODULES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
+	<td><label for="modules_view">{TEXT_VIEW}</label></td>
+	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
+	<td><label for="modules_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
+	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_TEMPLATES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
+	<td><label for="templates_view">{TEXT_VIEW}</label></td>
+	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
+	<td><label for="templates_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
+	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_LANGUAGES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
+	<td><label for="languages_view">{TEXT_VIEW}</label></td>
+	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
+	<td><label for="languages_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
+	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_SETTINGS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
+	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
+	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
+	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_USERS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
+	<td><label for="users_view">{TEXT_VIEW}</label></td>
+	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
+	<td><label for="users_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
+	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
+	<td><label for="users_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_GROUPS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
+	<td><label for="groups_view">{TEXT_VIEW}</label></td>
+	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
+	<td><label for="groups_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
+	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
+	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_ADMINTOOLS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
+	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+
+	</td>
+</tr>
+</table>
+
+<table summary="" cellpadding="5" 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">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN module_list_block -->
+			<li>
+				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="m_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END module_list_block -->
+		</ul>
+	</td>
+	<td valign="top" align="left" width="150">
+	{TEXT_TEMPLATE_PERMISSIONS}:
+	</td>
+	<td valign="top" align="left">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN template_list_block -->
+			<li>
+				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="t_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END template_list_block -->
+		</ul>
+	</td>
+</tr>
+
+<tr>
+	<td colspan="2"><input type="submit" name="submit" value="{SUBMIT_TITLE}" /></td>
+    <td colspan="2" align="right"><input type="reset" name="reset" value="{TEXT_RESET}" /></td>
+</tr>
+</table>
+</form>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
+<tr>
+	<td align="center">
+	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
+        <input type="hidden" name="group_id" value="{GROUP_ID}" />
+        <input type="hidden" name="action" value="modify" />
+		{FTAN}
+        <input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
+    </form>
+	</td>
+</tr>
+</table>
+
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/templates_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/templates_details.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/templates_details.htt	(revision 1427)
@@ -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/wb_theme/templates/media_rename.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/media_rename.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/media_rename.htt	(revision 1427)
@@ -7,7 +7,7 @@
 </head>
 <body>
 
-<table cellpadding="0" cellspacing="0" border="0" width="100%" align="center">
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" align="center">
 <tr>
 	<td class="rename">
 <form name="rename" action="rename2.php" method="post">
@@ -15,7 +15,7 @@
 <input type="hidden" name="old_name" value="{FILENAME}" />
 <input type="hidden" name="id" value="{FILE_ID}" />
 {FTAN}
-<table cellpadding="5" cellspacing="0" border="0" width="400" align="center">
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="400" align="center">
 <tr>
 	<td align="center" colspan="2">{TEXT_RENAME} '{FILENAME}' {TEXT_TO}:</td>
 </tr>
Index: branches/2.8.x/wb/templates/wb_theme/templates/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/languages.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/languages.htt	(revision 1427)
@@ -1,76 +1,76 @@
-<!-- BEGIN main_block -->
-
-<div class="box">
-	{URL_MODULES}&nbsp;&nbsp;{URL_TEMPLATES}
-</div>
-
-<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="82%" />
-		<script language="javascript" 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>
-
+<!-- BEGIN main_block -->
+
+<div class="box">
+	{URL_MODULES}&nbsp;&nbsp;{URL_TEMPLATES}
+</div>
+
+<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="82%" />
+		<script language="javascript" 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 -->
\ No newline at end of file
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 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/pages_sections.htt	(revision 1427)
@@ -1,6 +1,6 @@
 <!-- BEGIN main_block -->
         <div class="jsadmin jcalendar hide"></div>
-        <table cellpadding="0" cellspacing="0" class="sections_header">
+        <table summary="" cellpadding="0" cellspacing="0" class="sections_header">
             <tr>
                 <td valign="middle" align="left">
                     <h2>{HEADING_MANAGE_SECTIONS}</h2>
@@ -18,7 +18,7 @@
         <form name="section_properties" action="{ADMIN_URL}/pages/sections_save.php?page_id={PAGE_IDKEY}" method="post">
 		{FTAN}
 		
-        <table cellpadding="5" cellspacing="0" align="center" border="0" width="100%">
+        <table summary="" cellpadding="5" cellspacing="0" align="center" border="0" width="100%">
                 <tr class="sections_list">
                 	<td valign="middle" width="{NAME_SIZE}">{TEXT_TYPE}:</td>
                 	<td {STYLE_DISPLAY_SECTION_BLOCK}>{TEXT_BLOCK}:</td>
@@ -88,7 +88,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="100%">
     			<select name="module" class="input_full">
Index: branches/2.8.x/wb/templates/wb_theme/templates/login.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/login.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/login.htt	(revision 1427)
@@ -1,93 +1,93 @@
-<!-- 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();">
-
-<table cellpadding="0" cellspacing="0" border="0" width="770" align="center">
-<tr>
-	<td width="60" valign="top">
-		<img src="{THEME_URL}/images/logo.png" alt="Logo" />
-	</td>
-	<td width="5">&nbsp;</td>
-	<td style="font-size: 20px; ">
-		<font style="color: #FFFFFF;">{SECTION_LOGIN}</font>
-	</td>
-</tr>
-</table>
-
-<table cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;" class="container">
-<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 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 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();">
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center">
+<tr>
+	<td width="60" valign="top">
+		<img src="{THEME_URL}/images/logo.png" alt="Logo" />
+	</td>
+	<td width="5">&nbsp;</td>
+	<td style="font-size: 20px; ">
+		<font style="color: #FFFFFF;">{SECTION_LOGIN}</font>
+	</td>
+</tr>
+</table>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;" class="container">
+<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 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 mainBlock -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/addons.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/addons.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/addons.htt	(revision 1427)
@@ -3,11 +3,11 @@
 	{URL_ADVANCED}
 </div>
 
-<table cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+<table summary="" 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} >
+		<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="title"><a href="{ADMIN_URL}/modules/index.php">{MODULES}</a></td>
@@ -18,7 +18,7 @@
 		</table>
 		<!-- END modules_block -->		
 		<!-- BEGIN templates_block -->
-		<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_TEMPLATES} >
+		<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="title"><a href="{ADMIN_URL}/templates/index.php">{TEMPLATES}</a></td>
@@ -29,7 +29,7 @@
 		</table>
 		<!-- END templates_block -->
 		<!-- BEGIN languages_block -->
-		<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_LANGUAGES} >
+		<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="title"><a href="{ADMIN_URL}/languages/index.php">{LANGUAGES}</a></td>
@@ -40,7 +40,7 @@
 		</table>
 		<!-- END languages_block -->
 		<!-- BEGIN reload_block -->
-		<table cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_RELOAD} >
+		<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="title">{TXT_ADMIN_SETTINGS}</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 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/modules.htt	(revision 1427)
@@ -8,7 +8,7 @@
 
 <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>
 		<input type="file" name="userfile" size="82%" />
@@ -32,7 +32,7 @@
 
 <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%;">
@@ -56,7 +56,7 @@
 
 <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%;">
Index: branches/2.8.x/wb/templates/wb_theme/templates/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/admintools.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/admintools.htt	(revision 1427)
@@ -1,30 +1,30 @@
-<!-- BEGIN main_block -->
-
-<table cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="tool_table">
-
-<tr class="advanced">
-	<td colspan="3">
-		<a name="administration_tools"></a>
-		<h2>{HEADING_ADMINISTRATION_TOOLS}</h2>
-	</td>
-</tr>
-<tr>
-	<td colspan="3">
-		<ul>
-		<!-- BEGIN tool_list_block -->
-		<li>
-		<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}">{TOOL_NAME}</a>
-		<br />{TOOL_DESCRIPTION}
-		</li>
-		<!-- END tool_list_block -->
-		</ul>
-		{TOOL_LIST}
-	</td>
-	<td>
-		&nbsp;
-	</td>
-	<td>&nbsp;</td>
-</tr>
-</table>
-
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="tool_table">
+
+<tr class="advanced">
+	<td colspan="3">
+		<a name="administration_tools"></a>
+		<h2>{HEADING_ADMINISTRATION_TOOLS}</h2>
+	</td>
+</tr>
+<tr>
+	<td colspan="3">
+		<ul>
+		<!-- BEGIN tool_list_block -->
+		<li>
+		<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}">{TOOL_NAME}</a>
+		<br />{TOOL_DESCRIPTION}
+		</li>
+		<!-- END tool_list_block -->
+		</ul>
+		{TOOL_LIST}
+	</td>
+	<td>
+		&nbsp;
+	</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/languages_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/languages_details.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/languages_details.htt	(revision 1427)
@@ -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/wb_theme/templates/modules_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/modules_details.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/modules_details.htt	(revision 1427)
@@ -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/templates/wb_theme/templates/media.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/media.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/media.htt	(revision 1427)
@@ -1,94 +1,94 @@
-<!-- BEGIN main_block -->
-
-<script src="{THEME_URL}/jquery/toggle_zip.js" type="text/javascript"></script>
-
-<h2>{HEADING_BROWSE_MEDIA}</h2>
-
-<iframe width="100%" height="382px" src="browse.php" scrolling="no"></iframe>
-<br />
-<form name="create" action="create.php" method="post" class="{DISPLAY_CREATE}">
-{FTAN}
-<h2>{HEADING_CREATE_FOLDER}</h2>
-
-<table cellpadding="3" cellspacing="0" border="0" width="100%">
-<tr>
-	<td width="100">{TEXT_TARGET_FOLDER}:</td>
-	<td>
-		<select name="target" style="width: 100%;">
-			<option value="{MEDIA_DIRECTORY}{HOME_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}{HOME_DIRECTORY}</option>
-			<!-- BEGIN dir_list_block -->
-				<option value="{NAME}">{NAME}</option>
-			<!-- END dir_list_block -->
-		</select>
-	</td>
-</tr>
-</table>
-<table cellpadding="3" cellspacing="0" border="0" width="100%">
-<tr>
-	<td width="100">{TEXT_NAME}:</td>
-	<td>
-		<input type="text" name="name" style="width: 100%;" />
-	</td>
-	<td align="right" width="160">
-		<input type="submit" name="submit" value="{TEXT_CREATE_FOLDER}" style="width: 160px;" />
-	</td>
-</tr>
-</table>
-
-</form>
-
-<form name="upload" action="upload.php" method="post" enctype="multipart/form-data" class="{DISPLAY_UPLOAD}">
-{FTAN}
-<br />
-
-<h2>{HEADING_UPLOAD_FILES}</h2>
-
-<table cellpadding="3" cellspacing="0" border="0" width="100%">
-<tr>
-	<td width="100">{TEXT_TARGET_FOLDER}:</td>
-	<td>
-		<select name="target" style="width: 100%;">
-			<option value="{MEDIA_DIRECTORY}{HOME_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}{HOME_DIRECTORY}</option>
-			<!-- BEGIN dir_list_block -->
-				<option value="{NAME}">{NAME}</option>
-			<!-- END dir_list_block -->
-		</select>
-	</td>
-</tr>
-</table>
-<table cellpadding="3" cellspacing="0" border="0" align="center" width="100%">
-    <tr>
-    	<td valign="top"><input type="checkbox" name="unzip" id="unzip"  onclick="toggle();" />
-<label for="unzip">{TEXT_UNZIP_FILE}</label>
-<span id="delzip" style="display: none;"><br /><input type="checkbox" name="delzip" id="deletezip" />
-<label for="deletezip">{TEXT_DELETE_ZIP}</label></span>
-</td>
-      <td valign="top"><input type="checkbox" name="overwrite" id="overwrite" value="yes" /><label for="overwrite">{TEXT_OVERWRITE_EXISTING}{TEXT_FILES}</label>      </td>
-      <td width="160" valign="top"><input type="submit" name="submit" value="{TEXT_UPLOAD_FILES}" style="width: 160px;" /></td>
-    </tr>
-  </table>
-<table cellpadding="3" cellspacing="0" border="0" width="100%">
-    <tr>
-      <td width="50%" align="left"><input type="file" size="27" name="file1" /></td>
-      <td width="50%" align="right"><input type="file" size="27" name="file2" id="file2" style="visibility: visible;" /></td>
-    </tr>
-    <tr>
-      <td width="50%" align="left"><input type="file" size="27" name="file3" id="file3" style="visibility: visible;" /></td>
-      <td width="50%" align="right"><input type="file" size="27" name="file4" id="file4" style="visibility: visible;" /></td>
-    </tr>
-    <tr>
-      <td width="50%" align="left"><input type="file" size="27" name="file5" id="file5" style="visibility: visible;" /></td>
-      <td width="50%" align="right"><input type="file" size="27" name="file6" id="file6" style="visibility: visible;" /></td>
-    </tr>
-    <tr>
-      <td width="50%" align="left"><input type="file" size="27" name="file7" id="file7" style="visibility: visible;" /></td>
-      <td width="50%" align="right"><input type="file" size="27" name="file8" id="file8" style="visibility: visible;" /></td>
-    </tr>
-    <tr>
-      <td width="50%" align="left"><input type="file" size="27" name="file9" id="file9" style="visibility: visible;" /></td>
-      <td width="50%" align="right"><input type="file" size="27" name="file10" id="file10" style="visibility: visible;" /></td>
-    </tr>
-  </table>
-</form>
-
+<!-- BEGIN main_block -->
+
+<script src="{THEME_URL}/jquery/toggle_zip.js" type="text/javascript"></script>
+
+<h2>{HEADING_BROWSE_MEDIA}</h2>
+
+<iframe width="100%" height="382" src="browse.php" scrolling="no"></iframe>
+<br />
+<form name="create" action="create.php" method="post" class="{DISPLAY_CREATE}">
+{FTAN}
+<h2>{HEADING_CREATE_FOLDER}</h2>
+
+<table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="100">{TEXT_TARGET_FOLDER}:</td>
+	<td>
+		<select name="target" style="width: 100%;">
+			<option value="{MEDIA_DIRECTORY}{HOME_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}{HOME_DIRECTORY}</option>
+			<!-- BEGIN dir_list_block -->
+				<option value="{NAME}">{NAME}</option>
+			<!-- END dir_list_block -->
+		</select>
+	</td>
+</tr>
+</table>
+<table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>
+		<input type="text" name="name" style="width: 100%;" />
+	</td>
+	<td align="right" width="160">
+		<input type="submit" name="submit" value="{TEXT_CREATE_FOLDER}" style="width: 160px;" />
+	</td>
+</tr>
+</table>
+
+</form>
+
+<form name="upload" action="upload.php" method="post" enctype="multipart/form-data" class="{DISPLAY_UPLOAD}">
+{FTAN}
+<br />
+
+<h2>{HEADING_UPLOAD_FILES}</h2>
+
+<table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="100">{TEXT_TARGET_FOLDER}:</td>
+	<td>
+		<select name="target" style="width: 100%;">
+			<option value="{MEDIA_DIRECTORY}{HOME_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}{HOME_DIRECTORY}</option>
+			<!-- BEGIN dir_list_block -->
+				<option value="{NAME}">{NAME}</option>
+			<!-- END dir_list_block -->
+		</select>
+	</td>
+</tr>
+</table>
+<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%">
+    <tr>
+    	<td valign="top"><input type="checkbox" name="unzip" id="unzip"  onclick="toggle();" />
+<label for="unzip">{TEXT_UNZIP_FILE}</label>
+<span id="delzip" style="display: none;"><br /><input type="checkbox" name="delzip" id="deletezip" />
+<label for="deletezip">{TEXT_DELETE_ZIP}</label></span>
+</td>
+      <td valign="top"><input type="checkbox" name="overwrite" id="overwrite" value="yes" /><label for="overwrite">{TEXT_OVERWRITE_EXISTING}{TEXT_FILES}</label>      </td>
+      <td width="160" valign="top"><input type="submit" name="submit" value="{TEXT_UPLOAD_FILES}" style="width: 160px;" /></td>
+    </tr>
+  </table>
+<table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td width="50%" align="left"><input type="file" size="27" name="file1" /></td>
+      <td width="50%" align="right"><input type="file" size="27" name="file2" id="file2" style="visibility: visible;" /></td>
+    </tr>
+    <tr>
+      <td width="50%" align="left"><input type="file" size="27" name="file3" id="file3" style="visibility: visible;" /></td>
+      <td width="50%" align="right"><input type="file" size="27" name="file4" id="file4" style="visibility: visible;" /></td>
+    </tr>
+    <tr>
+      <td width="50%" align="left"><input type="file" size="27" name="file5" id="file5" style="visibility: visible;" /></td>
+      <td width="50%" align="right"><input type="file" size="27" name="file6" id="file6" style="visibility: visible;" /></td>
+    </tr>
+    <tr>
+      <td width="50%" align="left"><input type="file" size="27" name="file7" id="file7" style="visibility: visible;" /></td>
+      <td width="50%" align="right"><input type="file" size="27" name="file8" id="file8" style="visibility: visible;" /></td>
+    </tr>
+    <tr>
+      <td width="50%" align="left"><input type="file" size="27" name="file9" id="file9" style="visibility: visible;" /></td>
+      <td width="50%" align="right"><input type="file" size="27" name="file10" id="file10" style="visibility: visible;" /></td>
+    </tr>
+  </table>
+</form>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/groups.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/wb_theme/templates/groups.htt	(revision 1427)
@@ -3,7 +3,7 @@
 <form name="groups" action="groups.php" method="post">
 <input type="hidden" name="action" value="delete" />
 {FTAN}
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<table summary=""  cellpadding="0" cellspacing="0" border="0" width="100%">
 <tr>
 	<td align="left">
 		<h2>{HEADING_MODIFY_DELETE_GROUP}</h2>
Index: branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt	(revision 1427)
@@ -4,7 +4,7 @@
 	<ul>
 	<!-- BEGIN tool_list_block -->
 	<li>
-		<table cellpadding="0" cellspacing="0" border="0" class="section" width="100%">
+		<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>
Index: branches/2.8.x/wb/templates/argos_theme/templates/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/groups.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/argos_theme/templates/groups.htt	(revision 1427)
@@ -1,31 +1,31 @@
-<!-- BEGIN main_block -->
-
-<form name="groups" action="groups.php" method="post">
-  <input type="hidden" name="action" value="delete" />
- {FTAN}  
-  <table 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_GROUP}</h2></td>
-		<td align="right">
-		<!-- BEGIN manage_users_block -->
-		<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a>
-		<!-- END manage_users_block -->
-		</td>
-     </tr>
-</table>
-
-  <select name="group_id" style="width: 500px;">
-    <!-- BEGIN list_block -->
-    <option value="{VALUE}">
-    {NAME}
-    </option>
-    <!-- END list_block -->
-  </select>
-  <input type="submit" name="modify" style="width: 100px;" value="{TEXT_MODIFY}" class="{DISPLAY_MODIFY}" />
-  <input type="submit" name="delete" style="width: 100px;" value="{TEXT_DELETE}" onclick="return confirm('{CONFIRM_DELETE}');" class="{DISPLAY_DELETE}" />
-</form>
-<br />
-<h2 class="{DISPLAY_ADD}">
-  {HEADING_ADD_GROUP}
-</h2>
-<!-- END main_block -->
+<!-- BEGIN main_block -->
+
+<form name="groups" action="groups.php" method="post">
+  <input type="hidden" name="action" value="delete" />
+ {FTAN}  
+  <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_GROUP}</h2></td>
+		<td align="right">
+		<!-- BEGIN manage_users_block -->
+		<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a>
+		<!-- END manage_users_block -->
+		</td>
+     </tr>
+</table>
+
+  <select name="group_id" style="width: 500px;">
+    <!-- BEGIN list_block -->
+    <option value="{VALUE}">
+    {NAME}
+    </option>
+    <!-- END list_block -->
+  </select>
+  <input type="submit" name="modify" style="width: 100px;" value="{TEXT_MODIFY}" class="{DISPLAY_MODIFY}" />
+  <input type="submit" name="delete" style="width: 100px;" value="{TEXT_DELETE}" onclick="return confirm('{CONFIRM_DELETE}');" class="{DISPLAY_DELETE}" />
+</form>
+<br />
+<h2 class="{DISPLAY_ADD}">
+  {HEADING_ADD_GROUP}
+</h2>
+<!-- END main_block -->
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 1426)
+++ branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt	(revision 1427)
@@ -1,55 +1,56 @@
-<!-- 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>Browse Media</title>
-<link href="{THEME_URL}/browse.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript">
-function confirm_link(message, url) {
-	if(confirm(message)) location.href = url;
-}
-</script>
-<script type="text/javascript" src="overlib.js"></script>
-</head>
-<body onload="parent.document.create.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}'; parent.document.upload.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}';">
-
-<table cellpadding="4" cellspacing="0" border="0" width="100%" style="border-bottom: 1px solid #666; width: 100%;">
-<tr style="background-color: #DDD;">
-	<td width="16" align="center" style="padding-left: 10px;">
-		<a href="{PARENT_DIR_LINK}"><img src="{THEME_URL}/images/up_folder_16.png" border="0" class="{DISPLAY_UP_ARROW}" alt="^" /></a>
-	</td>
-	<td width="50">
-		<a href="{PARENT_DIR_LINK}" class="{DISPLAY_UP_ARROW}">{TEXT_UP}</a>
-	</td>
-	<td align="left">
-		<strong>{TEXT_CURRENT_FOLDER}: {MEDIA_DIRECTORY}{CURRENT_DIR}</strong>
-	</td>
-</tr>
-</table>
-
-<table cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
-<!-- BEGIN list_block -->
-<tr style="background-color: #{ROW_BG_COLOR};">
-	<td width="18" style="padding-left: 10px;">
-		<a href="{LINK}" target="{LINK_TARGET}"><img {MOUSEOVER} src="{FT_ICON}" class="{DISPLAY_ICON}" border="0" alt="" /></a>
-	</td>
-	<td>
-		<a {MOUSEOVER} href="{LINK}" target="{LINK_TARGET}">{NAME}</a>
-	</td>
-	<td width="190">
-		<small>{IMAGEDETAIL}<br />{DATE}</small>
-	</td>
-	<td width="60" align="right" class="{DISPLAY_RENAME}">
-		<a href="rename.php?dir={CURRENT_DIR}&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}&id={TEMP_ID}');"><img src="{THEME_URL}/images/delete_16.png" alt="{TEXT_DELETE}" border="0" /></a>&nbsp;&nbsp;
-	</td>
-</tr>
-<!-- END list_block -->
-</table>
-
-
-<font class="{DISPLAY_NONE_FOUND}"><br />&nbsp;&nbsp;{NONE_FOUND}</font>
-</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>Browse Media</title>
+<link href="{THEME_URL}/browse.css" rel="stylesheet" type="text/css" />
+<script type="text/javascript">
+function confirm_link(message, url) {
+	if(confirm(message)) location.href = url;
+}
+</script>
+<script type="text/javascript" src="overlib.js"></script>
+</head>
+<body onload="parent.document.create.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}'; parent.document.upload.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}';">
+
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" style="border-bottom: 1px solid #666; width: 100%;">
+<tr style="background-color: #DDD;">
+	<td width="16" align="center" style="padding-left: 10px;">
+		<a href="{PARENT_DIR_LINK}"><img src="{THEME_URL}/images/up_folder_16.png" border="0" class="{DISPLAY_UP_ARROW}" alt="^" /></a>
+	</td>
+	<td width="50">
+		<a href="{PARENT_DIR_LINK}" class="{DISPLAY_UP_ARROW}">{TEXT_UP}</a>
+	</td>
+	<td align="left">
+		<strong>{TEXT_CURRENT_FOLDER}: {MEDIA_DIRECTORY}{CURRENT_DIR}</strong>
+	</td>
+</tr>
+</table>
+
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
+<!-- BEGIN list_block -->
+<tr style="background-color: #{ROW_BG_COLOR};">
+	<td width="18" style="padding-left: 10px;">
+		<a href="{LINK}" target="{LINK_TARGET}"><img {MOUSEOVER} src="{FT_ICON}" class="{DISPLAY_ICON}" border="0" alt="" /></a>
+	</td>
+	<td>
+		<a {MOUSEOVER} href="{LINK}" target="{LINK_TARGET}">{NAME}</a>
+	</td>
+	<td width="190">
+		<small>{IMAGEDETAIL}<br />{DATE}</small>
+	</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;
+	</td>
+</tr>
+<!-- END list_block -->
+</table>
+
+
+<font class="{DISPLAY_NONE_FOUND}"><br />&nbsp;&nbsp;{NONE_FOUND}</font>
+</body>
+</html>
+
+
 <!-- END main_block -->
\ No newline at end of file
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 1426)
+++ branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt	(revision 1427)
@@ -1,279 +1,279 @@
-<!-- BEGIN main_block -->
-<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_GROUP}</h2>
-
-<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
-<input type="hidden" name="advanced" value="{ADVANCED}" />
-<input type="hidden" name="group_id" value="{GROUP_ID}" />
-{FTAN}
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td width="150">{TEXT_NAME}:</td>
-	<td>
-		<input type="text" name="group_name" maxlength="255" value="{GROUP_NAME}" style="width:98%" />
-	</td>
-</tr>
-</table>
-<table cellpadding="2" cellspacing="0" border="0" width="100%" style="{DISPLAY_BASIC}">
-<tr>
-	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td>
-		<table cellpadding="0" cellspacing="0" width="100%" border="0">
-		<tr>
-			<td>
-				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
-				<label for="pages">{SECTION_PAGES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
-				<label for="media">{SECTION_MEDIA}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
-				<label for="modules">{SECTION_MODULES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
-				<label for="templates">{SECTION_TEMPLATES}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
-				<label for="languages">{SECTION_LANGUAGES}</label>
-			</td>
-			<td>		
-				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
-				<label for="settings">{SECTION_SETTINGS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
-				<label for="users">{SECTION_USERS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
-				<label for="groups">{SECTION_GROUPS}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
-				<label for="admintools">{SECTION_ADMINTOOLS}</label>
-			</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-<table cellpadding="2" cellspacing="0" border="0" width="100%" style="{DISPLAY_ADVANCED}">
-<tr>
-	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td align="left">
-
-<table cellpadding="0" cellspacing="0" border="0" width="330">
-<tr>
-	<td colspan="4"><h3>{SECTION_PAGES}</h3></td>
-</tr>
-<tr>
-	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
-	<td><label for="pages_view">{TEXT_VIEW}</label></td>
-	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
-	<td>
-		<label for="pages_add">{TEXT_ADD}</label>
-		&nbsp;
-		(<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
-		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
-	</td>
-</tr>
-<tr>
-	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
-	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
-	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
-</tr>
-<tr>
-	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
-	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
-	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
-	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_MEDIA}</h3></td>
-</tr>
-<tr>
-	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
-	<td><label for="media_view">{TEXT_VIEW}</label></td>
-	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
-	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
-</tr>
-<tr>
-	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
-	<td><label for="media_rename">{TEXT_RENAME}</label></td>
-	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
-	<td><label for="media_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
-	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_MODULES}</h3></td>
-</tr>
-<tr>
-	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
-	<td><label for="modules_view">{TEXT_VIEW}</label></td>
-	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
-	<td><label for="modules_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
-	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_TEMPLATES}</h3></td>
-</tr>
-<tr>
-	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
-	<td><label for="templates_view">{TEXT_VIEW}</label></td>
-	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
-	<td><label for="templates_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
-	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_LANGUAGES}</h3></td>
-</tr>
-<tr>
-	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
-	<td><label for="languages_view">{TEXT_VIEW}</label></td>
-	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
-	<td><label for="languages_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
-	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_SETTINGS}</h3></td>
-</tr>
-<tr>
-	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
-	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
-	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
-	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_USERS}</h3></td>
-</tr>
-<tr>
-	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
-	<td><label for="users_view">{TEXT_VIEW}</label></td>
-	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
-	<td><label for="users_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
-	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
-	<td><label for="users_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_GROUPS}</h3></td>
-
-</tr>
-<tr>
-	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
-	<td><label for="groups_view">{TEXT_VIEW}</label></td>
-	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
-	<td><label for="groups_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
-	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
-	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_ADMINTOOLS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
-	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-</table>
-
-
-	</td>
-</tr>
-</table>
-
-<table 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">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN module_list_block -->
-			<li>
-				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="m_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END module_list_block -->
-		</ul>
-	</td>
-	<td valign="top" align="left" width="150">{TEXT_TEMPLATE_PERMISSIONS}:</td>
-	<td valign="top" align="left">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN template_list_block -->
-			<li>
-				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="t_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END template_list_block -->
-		</ul>
-	</td>
-</tr>
-<tr style="text-align:center;width:100%">
-    <td>&nbsp;</td>
-	<td style="text-align:right;">
-		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
-	</td>
-	<td style="text-align:left;">
-		<input type="reset" name="reset" value="{TEXT_RESET}" />
-	</td>
-    <td>&nbsp;</td>
-</tr>
-</table>
-</form>
-
-
-<form name="advanced" action="{ADVANCED_ACTION}" method="post">
-<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%">
-<tr>
-    <td>&nbsp;</td>
-	<td style="text-align:center;">
-		<input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
-	</td>
-    <td>&nbsp;</td>
-</tr>
-</table>
-</form>
+<!-- BEGIN main_block -->
+<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_GROUP}</h2>
+
+<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
+<input type="hidden" name="advanced" value="{ADVANCED}" />
+<input type="hidden" name="group_id" value="{GROUP_ID}" />
+{FTAN}
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="150">{TEXT_NAME}:</td>
+	<td>
+		<input type="text" name="group_name" maxlength="255" value="{GROUP_NAME}" style="width:98%" />
+	</td>
+</tr>
+</table>
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" style="{DISPLAY_BASIC}">
+<tr>
+	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td>
+		<table cellpadding="0" cellspacing="0" width="100%" border="0">
+		<tr>
+			<td>
+				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
+				<label for="pages">{SECTION_PAGES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
+				<label for="media">{SECTION_MEDIA}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
+				<label for="modules">{SECTION_MODULES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
+				<label for="templates">{SECTION_TEMPLATES}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
+				<label for="languages">{SECTION_LANGUAGES}</label>
+			</td>
+			<td>		
+				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
+				<label for="settings">{SECTION_SETTINGS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
+				<label for="users">{SECTION_USERS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
+				<label for="groups">{SECTION_GROUPS}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
+				<label for="admintools">{SECTION_ADMINTOOLS}</label>
+			</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" style="{DISPLAY_ADVANCED}">
+<tr>
+	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td align="left">
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="330">
+<tr>
+	<td colspan="4"><h3>{SECTION_PAGES}</h3></td>
+</tr>
+<tr>
+	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
+	<td><label for="pages_view">{TEXT_VIEW}</label></td>
+	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
+	<td>
+		<label for="pages_add">{TEXT_ADD}</label>
+		&nbsp;
+		(<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
+		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
+	</td>
+</tr>
+<tr>
+	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
+	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
+	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
+</tr>
+<tr>
+	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
+	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
+	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
+	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_MEDIA}</h3></td>
+</tr>
+<tr>
+	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
+	<td><label for="media_view">{TEXT_VIEW}</label></td>
+	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
+	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
+</tr>
+<tr>
+	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
+	<td><label for="media_rename">{TEXT_RENAME}</label></td>
+	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
+	<td><label for="media_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
+	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_MODULES}</h3></td>
+</tr>
+<tr>
+	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
+	<td><label for="modules_view">{TEXT_VIEW}</label></td>
+	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
+	<td><label for="modules_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
+	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_TEMPLATES}</h3></td>
+</tr>
+<tr>
+	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
+	<td><label for="templates_view">{TEXT_VIEW}</label></td>
+	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
+	<td><label for="templates_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
+	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_LANGUAGES}</h3></td>
+</tr>
+<tr>
+	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
+	<td><label for="languages_view">{TEXT_VIEW}</label></td>
+	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
+	<td><label for="languages_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
+	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_SETTINGS}</h3></td>
+</tr>
+<tr>
+	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
+	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
+	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
+	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_USERS}</h3></td>
+</tr>
+<tr>
+	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
+	<td><label for="users_view">{TEXT_VIEW}</label></td>
+	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
+	<td><label for="users_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
+	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
+	<td><label for="users_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_GROUPS}</h3></td>
+
+</tr>
+<tr>
+	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
+	<td><label for="groups_view">{TEXT_VIEW}</label></td>
+	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
+	<td><label for="groups_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
+	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
+	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_ADMINTOOLS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
+	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+
+	</td>
+</tr>
+</table>
+
+<table 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">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN module_list_block -->
+			<li>
+				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="m_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END module_list_block -->
+		</ul>
+	</td>
+	<td valign="top" align="left" width="150">{TEXT_TEMPLATE_PERMISSIONS}:</td>
+	<td valign="top" align="left">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN template_list_block -->
+			<li>
+				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="t_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END template_list_block -->
+		</ul>
+	</td>
+</tr>
+<tr style="text-align:center;width:100%">
+    <td>&nbsp;</td>
+	<td style="text-align:right;">
+		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
+	</td>
+	<td style="text-align:left;">
+		<input type="reset" name="reset" value="{TEXT_RESET}" />
+	</td>
+    <td>&nbsp;</td>
+</tr>
+</table>
+</form>
+
+
+<form name="advanced" action="{ADVANCED_ACTION}" method="post">
+<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%">
+<tr>
+    <td>&nbsp;</td>
+	<td style="text-align:center;">
+		<input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
+	</td>
+    <td>&nbsp;</td>
+</tr>
+</table>
+</form>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/media_rename.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/media_rename.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/argos_theme/templates/media_rename.htt	(revision 1427)
@@ -1,61 +1,61 @@
-<!-- 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>Rename Media</title>
-<link href="{THEME_URL}/media.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<!-- BEGIN main_block -->
-
-<style>
-.hide {display:none;}
-</style>
-
-<form name="rename" action="rename2.php" method="post">
-<input type="hidden" name="dir" value="{DIR}" />
-<input type="hidden" name="old_name" value="{FILENAME}" />
-<input type="hidden" name="id" value="{FILE_ID}" />
-{FTAN}
-<table cellpadding="5" cellspacing="0" border="0" width="400" align="center">
-<tr>
-	<td align="center" colspan="2">{TEXT_RENAME} '{FILENAME}' {TEXT_TO}:</td>
-</tr>
-<tr>
-	<td>
-		<input type="text" name="name" style="width: 100%;" />
-		<script type="text/javascript">
-		document.rename.name.focus();
-		</script>
-	</td>
-	<td width="50" class="{DISPlAY_EXTENSION}">
-		<input type="text" name="extension" style="width: 50px;" value="{EXTENSION}" />
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<input type="checkbox" name="overwrite" id="overwrite" value="yes" />
-		<label for="overwrite">
-		{TEXT_OVERWRITE_EXISTING} {TYPE}
-		</label>
-	</td>
-</tr>
-<tr>
-	<td colspan="2">
-		<input type="submit" name="submit" value="{TEXT_RENAME}" style="width: 49%;" />
-		<input type="button" name="cancel" value="{TEXT_CANCEL}" style="width: 49%;" onclick="javascript: window.location = 'browse.php';" />
-	</td>
-</tr>
-</table>
-
-</form>
-
-</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>Rename Media</title>
+<link href="{THEME_URL}/media.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<!-- BEGIN main_block -->
+
+<style>
+.hide {display:none;}
+</style>
+
+<form name="rename" action="rename2.php" method="post">
+<input type="hidden" name="dir" value="{DIR}" />
+<input type="hidden" name="old_name" value="{FILENAME}" />
+<input type="hidden" name="id" value="{FILE_ID}" />
+{FTAN}
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="400" align="center">
+<tr>
+	<td align="center" colspan="2">{TEXT_RENAME} '{FILENAME}' {TEXT_TO}:</td>
+</tr>
+<tr>
+	<td>
+		<input type="text" name="name" style="width: 100%;" />
+		<script type="text/javascript">
+		document.rename.name.focus();
+		</script>
+	</td>
+	<td width="50" class="{DISPlAY_EXTENSION}">
+		<input type="text" name="extension" style="width: 50px;" value="{EXTENSION}" />
+	</td>
+</tr>
+<tr>
+	<td colspan="2">
+		<input type="checkbox" name="overwrite" id="overwrite" value="yes" />
+		<label for="overwrite">
+		{TEXT_OVERWRITE_EXISTING} {TYPE}
+		</label>
+	</td>
+</tr>
+<tr>
+	<td colspan="2">
+		<input type="submit" name="submit" value="{TEXT_RENAME}" style="width: 49%;" />
+		<input type="button" name="cancel" value="{TEXT_CANCEL}" style="width: 49%;" onclick="javascript: window.location = 'browse.php';" />
+	</td>
+</tr>
+</table>
+
+</form>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/media.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/media.htt	(revision 1426)
+++ branches/2.8.x/wb/templates/argos_theme/templates/media.htt	(revision 1427)
@@ -1,123 +1,123 @@
-<!-- BEGIN main_block -->
-<script src="{THEME_URL}/jquery/toggle_zip.js" type="text/javascript"></script>
-
-<table cellpadding="0" cellspacing="0" border="0">
-  <tr>
-    <td width="300" valign="top" align="left">
-	<h2>{HEADING_UPLOAD_FILES}</h2>
-      <form name="upload" action="upload.php" method="post" enctype="multipart/form-data" class="{DISPLAY_UPLOAD}">
-		{FTAN}
-		<table cellpadding="3" cellspacing="0" border="0" width="100%">
-          <tr>
-            <td>{TEXT_TARGET_FOLDER}:<br />
-              <select name="target" style="width:100%;" 
-		   onchange="browse.location.href='browse.php?dir=' +
-		   	document.upload.target.value.substr(6,100);
-		   document.create.target.value = document.upload.target.value;">
-                <option value="{MEDIA_DIRECTORY}{HOME_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}{HOME_DIRECTORY}</option>
-                <!-- BEGIN dir_list_block -->
-                <option value="{NAME}">{NAME}</option>
-                <!-- END dir_list_block -->
-              </select>
-            </td>
-          </tr>
-        </table>
-        <table cellpadding="3" cellspacing="0" border="0" width="100%">
-          <tr>
-		  	<td valign="top">
-				<input type="checkbox" name="unzip" id="unzip"  onclick="toggle();" />
-				<label for="unzip">{TEXT_UNZIP_FILE}</label>
-				<span id="delzip" style="display: none;"><br />
-				<input type="checkbox" name="delzip" id="deletezip" />
-				<label for="deletezip">{TEXT_DELETE_ZIP}</label></span>
-			</td>
-          </tr>
-          <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file1" /> </td>
-          </tr>
-          <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file2" id="file2" style="visibility: visible;" /> </td>
-          </tr>
-          <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file3" id="file3" style="visibility: visible;" /> </td>
-          </tr>
-          <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file4" id="file4" style="visibility: visible;" /> </td>
-          </tr>
-          <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file5" id="file5" style="visibility: visible;" /> </td>
-          </tr>
-		  <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file6" id="file6" style="visibility: visible;" /> </td>
-          </tr>
-          <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file7" id="file7" style="visibility: visible;" /> </td>
-          </tr>
-          <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file8" id="file8" style="visibility: visible;" /> </td>
-          </tr>
-		  <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file9" id="file9" style="visibility: visible;" /> </td>
-          </tr>
-          <tr>
-            <td width="50%" align="left"><input type="file" size="33" name="file10" id="file10" style="visibility: visible;" /> </td>
-          </tr>
-        </table>
-
-        <table cellpadding="3" cellspacing="0" border="0" width="100%">
-          <tr>
-            <td colspan="2"><input type="checkbox" name="overwrite" id="overwrite" value="yes" />
-              <label for="overwrite">{TEXT_OVERWRITE_EXISTING} {TEXT_FILES}</label><br />
-              <input type="submit" name="submit" value="{TEXT_UPLOAD_FILES}" style="width:160px;margin-top:5px;" />
-            </td>
-          </tr>
-        </table>
-      </form>
-<!--
-If you want to HIDE the option of creating folders in the Media-folder (for your clients, for example),
-please set the class below to "hide", else to "show".
---> 
-      <div class="show">
-	  <br /><br />
-        <form name="create" action="create.php" method="post" class="{DISPLAY_CREATE}">
-		{FTAN}
-          <h2>{HEADING_CREATE_FOLDER}</h2>
-          <table cellpadding="3" cellspacing="0" border="0" width="100%">
-            <tr>
-              <td>{TEXT_NAME}:<br />
-              <input type="text" name="name" style="width:98%;" /></td>
-            </tr>
-          </table>
-          <table cellpadding="3" cellspacing="0" border="0" width="100%">
-            <tr>
-              <td>{TEXT_TARGET_FOLDER}:<br />
-                <select name="target" style="width:100%;">
-                  <option value="{MEDIA_DIRECTORY}{HOME_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}{HOME_DIRECTORY}</option>
-                  <!-- BEGIN dir_list_block -->
-                  <option value="{NAME}">{NAME} </option>
-                  <!-- END dir_list_block -->
-                </select>
-              </td>
-            </tr>
-          </table>
-          <table cellpadding="3" cellspacing="0" border="0" width="100%">
-            <tr>
-              <td><input type="submit" name="submit" value="{TEXT_CREATE_FOLDER}" style="width:160px;" />
-              </td>
-            </tr>
-          </table>
-        </form>
-      </div>
-      <!-- END main_block -->
-    </td>
-	<td width="10">&nbsp;</td>
-    <td width="580" valign="top" align="right">
-	<h2 style="padding-left:3px;">{HEADING_BROWSE_MEDIA}</h2>
-	<span class="{DISPLAY_SETTINGS}" style="margin-bottom:2px;">{OPTIONS}:&nbsp;
-	<a href="setparameter.php" target="browse">{CHANGE_SETTINGS}</a>&nbsp;&nbsp;|&nbsp;
-	<a href="browse.php?dir={CURRENT_DIR}" target="browse">{TEXT_RELOAD}</a>
-	</span>
-	<iframe name="browse" width="99%" height="550" src="browse.php" scrolling="yes" frameborder="0" style="border:1px solid #333;"></iframe>
-    </td>
-  </tr>
-</table>
+<!-- BEGIN main_block -->
+<script src="{THEME_URL}/jquery/toggle_zip.js" type="text/javascript"></script>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0">
+  <tr>
+    <td width="300" valign="top" align="left">
+	<h2>{HEADING_UPLOAD_FILES}</h2>
+      <form name="upload" action="upload.php" method="post" enctype="multipart/form-data" class="{DISPLAY_UPLOAD}">
+		{FTAN}
+		<table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+          <tr>
+            <td>{TEXT_TARGET_FOLDER}:<br />
+              <select name="target" style="width:100%;" 
+		   onchange="browse.location.href='browse.php?dir=' +
+		   	document.upload.target.value.substr(6,100);
+		   document.create.target.value = document.upload.target.value;">
+                <option value="{MEDIA_DIRECTORY}{HOME_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}{HOME_DIRECTORY}</option>
+                <!-- BEGIN dir_list_block -->
+                <option value="{NAME}">{NAME}</option>
+                <!-- END dir_list_block -->
+              </select>
+            </td>
+          </tr>
+        </table>
+        <table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+          <tr>
+		  	<td valign="top">
+				<input type="checkbox" name="unzip" id="unzip"  onclick="toggle();" />
+				<label for="unzip">{TEXT_UNZIP_FILE}</label>
+				<span id="delzip" style="display: none;"><br />
+				<input type="checkbox" name="delzip" id="deletezip" />
+				<label for="deletezip">{TEXT_DELETE_ZIP}</label></span>
+			</td>
+          </tr>
+          <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file1" /> </td>
+          </tr>
+          <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file2" id="file2" style="visibility: visible;" /> </td>
+          </tr>
+          <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file3" id="file3" style="visibility: visible;" /> </td>
+          </tr>
+          <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file4" id="file4" style="visibility: visible;" /> </td>
+          </tr>
+          <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file5" id="file5" style="visibility: visible;" /> </td>
+          </tr>
+		  <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file6" id="file6" style="visibility: visible;" /> </td>
+          </tr>
+          <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file7" id="file7" style="visibility: visible;" /> </td>
+          </tr>
+          <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file8" id="file8" style="visibility: visible;" /> </td>
+          </tr>
+		  <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file9" id="file9" style="visibility: visible;" /> </td>
+          </tr>
+          <tr>
+            <td width="50%" align="left"><input type="file" size="33" name="file10" id="file10" style="visibility: visible;" /> </td>
+          </tr>
+        </table>
+
+        <table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+          <tr>
+            <td colspan="2"><input type="checkbox" name="overwrite" id="overwrite" value="yes" />
+              <label for="overwrite">{TEXT_OVERWRITE_EXISTING} {TEXT_FILES}</label><br />
+              <input type="submit" name="submit" value="{TEXT_UPLOAD_FILES}" style="width:160px;margin-top:5px;" />
+            </td>
+          </tr>
+        </table>
+      </form>
+<!--
+If you want to HIDE the option of creating folders in the Media-folder (for your clients, for example),
+please set the class below to "hide", else to "show".
+--> 
+      <div class="show">
+	  <br /><br />
+        <form name="create" action="create.php" method="post" class="{DISPLAY_CREATE}">
+		{FTAN}
+          <h2>{HEADING_CREATE_FOLDER}</h2>
+          <table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+            <tr>
+              <td>{TEXT_NAME}:<br />
+              <input type="text" name="name" style="width:98%;" /></td>
+            </tr>
+          </table>
+          <table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+            <tr>
+              <td>{TEXT_TARGET_FOLDER}:<br />
+                <select name="target" style="width:100%;">
+                  <option value="{MEDIA_DIRECTORY}{HOME_DIRECTORY}" selected="selected">{MEDIA_DIRECTORY}{HOME_DIRECTORY}</option>
+                  <!-- BEGIN dir_list_block -->
+                  <option value="{NAME}">{NAME} </option>
+                  <!-- END dir_list_block -->
+                </select>
+              </td>
+            </tr>
+          </table>
+          <table summary="" cellpadding="3" cellspacing="0" border="0" width="100%">
+            <tr>
+              <td><input type="submit" name="submit" value="{TEXT_CREATE_FOLDER}" style="width:160px;" />
+              </td>
+            </tr>
+          </table>
+        </form>
+      </div>
+      <!-- END main_block -->
+    </td>
+	<td width="10">&nbsp;</td>
+    <td width="580" valign="top" align="right">
+	<h2 style="padding-left:3px;">{HEADING_BROWSE_MEDIA}</h2>
+	<span class="{DISPLAY_SETTINGS}" style="margin-bottom:2px;">{OPTIONS}:&nbsp;
+	<a href="setparameter.php" target="browse">{CHANGE_SETTINGS}</a>&nbsp;&nbsp;|&nbsp;
+	<a href="browse.php?dir={CURRENT_DIR}" target="browse">{TEXT_RELOAD}</a>
+	</span>
+	<iframe name="browse" width="99%" height="550" src="browse.php" scrolling="yes" frameborder="0" style="border:1px solid #333;"></iframe>
+    </td>
+  </tr>
+</table>
