Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1259)
+++ branches/2.8.x/CHANGELOG	(revision 1260)
@@ -12,6 +12,8 @@
  
 ------------------------------------- 2.8.1 -------------------------------------
 21-Jan-2010 Dietmar Woellbrink (Luisehahne)
+#	fix more small css-errors in WB Backend (thanks to Ruebenwurzel)
+21-Jan-2010 Dietmar Woellbrink (Luisehahne)
 !	update header info
 !	change unknown user to guest in all languages
 21-Jan-2010 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1259)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1260)
@@ -55,6 +55,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.1');
-if(!defined('REVISION')) define('REVISION', '1259');
+if(!defined('REVISION')) define('REVISION', '1260');
 
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/settings/index.php
===================================================================
--- branches/2.8.x/wb/admin/settings/index.php	(revision 1259)
+++ branches/2.8.x/wb/admin/settings/index.php	(revision 1260)
@@ -288,7 +288,7 @@
 
 // Insert WYSIWYG modules
 $template->set_block('main_block', 'editor_list_block', 'editor_list');
-$file='none';  
+$file='none';
 $module_name=$TEXT['NONE'];  
 $template->set_var('FILE', $file);  
 $template->set_var('NAME', $module_name);  
@@ -340,7 +340,8 @@
 // Insert default error reporting values
 require(ADMIN_PATH.'/interface/er_levels.php');
 $template->set_block('main_block', 'error_reporting_list_block', 'error_reporting_list');
-foreach($ER_LEVELS AS $value => $title) {
+foreach($ER_LEVELS AS $value => $title)
+{
 	$template->set_var('VALUE', $value);
 	$template->set_var('NAME', $title);
     $selected = (ER_LEVEL == $value) ? ' selected="selected"' : '';
@@ -350,7 +351,8 @@
 }
 
 // Insert permissions values
-if($admin->get_permission('settings_advanced') != true) {
+if($admin->get_permission('settings_advanced') != true)
+{
 	$template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide');
 }
 
@@ -369,7 +371,8 @@
 }
 
 // Work-out if multiple menus feature is enabled
-if(defined('MULTIPLE_MENUS') AND MULTIPLE_MENUS == true) {
+if(defined('MULTIPLE_MENUS') AND MULTIPLE_MENUS == true)
+{
 	$template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"');
 } else {
 	$template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"');
@@ -376,7 +379,8 @@
 }
 
 // Work-out if page languages feature is enabled
-if(defined('PAGE_LANGUAGES') AND PAGE_LANGUAGES == true) {
+if(defined('PAGE_LANGUAGES') AND PAGE_LANGUAGES == true)
+{
         $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"');
 } else {
         $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"');
@@ -383,20 +387,24 @@
 }
 
 // Work-out if smart login feature is enabled
-if(defined('SMART_LOGIN') AND SMART_LOGIN == true) {
+if(defined('SMART_LOGIN') AND SMART_LOGIN == true)
+{
 	$template->set_var('SMART_LOGIN_ENABLED', ' checked="checked"');
 } else {
 	$template->set_var('SMART_LOGIN_DISABLED', ' checked="checked"');
 }
 
-if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */
+/* Make's sure GD library is installed */
+if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg'))
+{
 	$template->set_var('GD_EXTENSION_ENABLED', '');
 } else {
-	$template->set_var('GD_EXTENSION_ENABLED', 'none');
+	$template->set_var('GD_EXTENSION_ENABLED', ' style="display: none;"');
 }
 
 // Work-out if section blocks feature is enabled
-if(defined('SECTION_BLOCKS') AND SECTION_BLOCKS == true) {
+if(defined('SECTION_BLOCKS') AND SECTION_BLOCKS == true)
+{
 	$template->set_var('SECTION_BLOCKS_ENABLED', ' checked="checked"');
 } else {
 	$template->set_var('SECTION_BLOCKS_DISABLED', ' checked="checked"');
@@ -403,7 +411,8 @@
 }
 
 // Work-out if homepage redirection feature is enabled
-if(defined('HOMEPAGE_REDIRECTION') AND HOMEPAGE_REDIRECTION == true) {
+if(defined('HOMEPAGE_REDIRECTION') AND HOMEPAGE_REDIRECTION == true)
+{
 	$template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked="checked"');
 } else {
 	$template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked="checked"');
@@ -410,7 +419,8 @@
 }
 
 // Work-out which server os should be checked
-if(OPERATING_SYSTEM == 'linux') {
+if(OPERATING_SYSTEM == 'linux')
+{
 	$template->set_var('LINUX_SELECTED', ' checked="checked"');
 } elseif(OPERATING_SYSTEM == 'windows') {
 	$template->set_var('WINDOWS_SELECTED', ' checked="checked"');
@@ -417,7 +427,8 @@
 }
 
 // Work-out if manage sections feature is enabled
-if(MANAGE_SECTIONS) {
+if(MANAGE_SECTIONS)
+{
 	$template->set_var('MANAGE_SECTIONS_ENABLED', ' checked="checked"');
 } else {
 	$template->set_var('MANAGE_SECTIONS_DISABLED', ' checked="checked"');
@@ -424,29 +435,34 @@
 }
 
 // Work-out which wbmailer routine should be checked
-if(WBMAILER_ROUTINE == 'phpmail') {
+if(WBMAILER_ROUTINE == 'phpmail')
+{
 	$template->set_var('PHPMAIL_SELECTED', ' checked="checked"');
-	$template->set_var('SMTP_VISIBILITY', 'none');
-	$template->set_var('SMTP_VISIBILITY_AUTH', 'none');
-} elseif(WBMAILER_ROUTINE == 'smtp') {
+	$template->set_var('SMTP_VISIBILITY', ' style="display: none;"');
+	$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
+} elseif(WBMAILER_ROUTINE == 'smtp')
+{
 	$template->set_var('SMTPMAIL_SELECTED', ' checked="checked"');
 	$template->set_var('SMTP_VISIBILITY', '');
 }
 
 // Work-out if SMTP authentification should be checked
-if(WBMAILER_SMTP_AUTH) {
+if(WBMAILER_SMTP_AUTH)
+{
 	$template->set_var('SMTP_AUTH_SELECTED', ' checked="checked"');
-	if(WBMAILER_ROUTINE == 'smtp') {
+	if(WBMAILER_ROUTINE == 'smtp')
+    {
 		$template->set_var('SMTP_VISIBILITY_AUTH', '');
 	} else {
-		$template->set_var('SMTP_VISIBILITY_AUTH', 'none');
+		$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
 	}
 } else {
-	$template->set_var('SMTP_VISIBILITY_AUTH', 'none');
+	$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
 }
 
 // Work-out if intro feature is enabled
-if(INTRO_PAGE) {
+if(INTRO_PAGE)
+{
 	$template->set_var('INTRO_PAGE_ENABLED', ' checked="checked"');
 } else {
 	$template->set_var('INTRO_PAGE_DISABLED', ' checked="checked"');
@@ -453,7 +469,8 @@
 }
 
 // Work-out if frontend login feature is enabled
-if(FRONTEND_LOGIN) {
+if(FRONTEND_LOGIN)
+{
 	$template->set_var('PRIVATE_ENABLED', ' checked="checked"');
 } else {
 	$template->set_var('PRIVATE_DISABLED', ' checked="checked"');
@@ -460,19 +477,23 @@
 }
 
 // Work-out if page trash feature is disabled, in-line, or separate
-if(PAGE_TRASH == 'disabled') {
+if(PAGE_TRASH == 'disabled')
+{
 	$template->set_var('PAGE_TRASH_DISABLED', ' checked="checked"');
-	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: none;');
-} elseif(PAGE_TRASH == 'inline') {
+	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;');
+} elseif(PAGE_TRASH == 'inline')
+{
 	$template->set_var('PAGE_TRASH_INLINE', ' checked="checked"');
-	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: none;');
-} elseif(PAGE_TRASH == 'separate') {
+	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;');
+} elseif(PAGE_TRASH == 'separate')
+{
 	$template->set_var('PAGE_TRASH_SEPARATE', ' checked="checked"');
-	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', ' display: inline;');
+	$template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: inline;');
 }
 
 // Work-out if media home folde feature is enabled
-if(HOME_FOLDERS) {
+if(HOME_FOLDERS)
+{
 	$template->set_var('HOME_FOLDERS_ENABLED', ' checked="checked"');
 } else {
 	$template->set_var('HOME_FOLDERS_DISABLED', ' checked="checked"');
@@ -479,7 +500,8 @@
 }
 
 // Insert search select
-if(SEARCH == 'private') {
+if(SEARCH == 'private')
+{
 	$template->set_var('PRIVATE_SEARCH', ' selected="selected"');
 } elseif(SEARCH == 'registered') {
 	$template->set_var('REGISTERED_SEARCH', ' selected="selected"');
@@ -488,64 +510,83 @@
 }
 
 // Work-out if 777 permissions are set
-if(STRING_FILE_MODE == '0777' AND STRING_DIR_MODE == '0777') {
+if(STRING_FILE_MODE == '0777' AND STRING_DIR_MODE == '0777')
+{
 	$template->set_var('WORLD_WRITEABLE_SELECTED', ' checked="checked"');
 }
 
 // Work-out which file mode boxes are checked
-if(extract_permission(STRING_FILE_MODE, 'u', 'r')) {
+if(extract_permission(STRING_FILE_MODE, 'u', 'r'))
+{
 	$template->set_var('FILE_U_R_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_FILE_MODE, 'u', 'w')) {
+if(extract_permission(STRING_FILE_MODE, 'u', 'w'))
+{
 	$template->set_var('FILE_U_W_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_FILE_MODE, 'u', 'e')) {
+if(extract_permission(STRING_FILE_MODE, 'u', 'e'))
+{
 	$template->set_var('FILE_U_E_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_FILE_MODE, 'g', 'r')) {
+if(extract_permission(STRING_FILE_MODE, 'g', 'r'))
+{
 	$template->set_var('FILE_G_R_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_FILE_MODE, 'g', 'w')) {
+if(extract_permission(STRING_FILE_MODE, 'g', 'w'))
+{
 	$template->set_var('FILE_G_W_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_FILE_MODE, 'g', 'e')) {
+if(extract_permission(STRING_FILE_MODE, 'g', 'e'))
+{
 	$template->set_var('FILE_G_E_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_FILE_MODE, 'o', 'r')) {
+if(extract_permission(STRING_FILE_MODE, 'o', 'r'))
+{
 	$template->set_var('FILE_O_R_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_FILE_MODE, 'o', 'w')) {
+if(extract_permission(STRING_FILE_MODE, 'o', 'w'))
+{
 	$template->set_var('FILE_O_W_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_FILE_MODE, 'o', 'e')) {
+if(extract_permission(STRING_FILE_MODE, 'o', 'e'))
+{
 	$template->set_var('FILE_O_E_CHECKED', ' checked="checked"');
 }
 // Work-out which dir mode boxes are checked
-if(extract_permission(STRING_DIR_MODE, 'u', 'r')) {
+if(extract_permission(STRING_DIR_MODE, 'u', 'r'))
+{
 	$template->set_var('DIR_U_R_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_DIR_MODE, 'u', 'w')) {
+if(extract_permission(STRING_DIR_MODE, 'u', 'w'))
+{
 	$template->set_var('DIR_U_W_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_DIR_MODE, 'u', 'e')) {
+if(extract_permission(STRING_DIR_MODE, 'u', 'e'))
+{
 	$template->set_var('DIR_U_E_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_DIR_MODE, 'g', 'r')) {
+if(extract_permission(STRING_DIR_MODE, 'g', 'r'))
+{
 	$template->set_var('DIR_G_R_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_DIR_MODE, 'g', 'w')) {
+if(extract_permission(STRING_DIR_MODE, 'g', 'w'))
+{
 	$template->set_var('DIR_G_W_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_DIR_MODE, 'g', 'e')) {
+if(extract_permission(STRING_DIR_MODE, 'g', 'e'))
+{
 	$template->set_var('DIR_G_E_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_DIR_MODE, 'o', 'r')) {
+if(extract_permission(STRING_DIR_MODE, 'o', 'r'))
+{
 	$template->set_var('DIR_O_R_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_DIR_MODE, 'o', 'w')) {
+if(extract_permission(STRING_DIR_MODE, 'o', 'w'))
+{
 	$template->set_var('DIR_O_W_CHECKED', ' checked="checked"');
 }
-if(extract_permission(STRING_DIR_MODE, 'o', 'e')) {
+if(extract_permission(STRING_DIR_MODE, 'o', 'e'))
+{
 	$template->set_var('DIR_O_E_CHECKED', ' checked="checked"');
 }
 
@@ -555,11 +596,14 @@
 // Insert groups into signup list
 $template->set_block('main_block', 'group_list_block', 'group_list');
 $results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
-if($results->numRows() > 0) {
-	while($group = $results->fetchRow()) {
+if($results->numRows() > 0)
+{
+	while($group = $results->fetchRow())
+    {
 		$template->set_var('ID', $group['group_id']);
 		$template->set_var('NAME', $group['name']);
-		if(FRONTEND_SIGNUP == $group['group_id']) {
+		if(FRONTEND_SIGNUP == $group['group_id'])
+        {
 			$template->set_var('SELECTED', ' selected="selected"');
 		} else {
 			$template->set_var('SELECTED', '');
@@ -691,4 +735,4 @@
 
 $admin->print_footer();
 
-?>
+?>
\ No newline at end of file
Index: branches/2.8.x/wb/templates/classic_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/classic_theme/templates/settings.htt	(revision 1259)
+++ branches/2.8.x/wb/templates/classic_theme/templates/settings.htt	(revision 1260)
@@ -39,7 +39,7 @@
 		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="page_level_limit">
@@ -62,7 +62,7 @@
 		</div>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
         <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
         <td class="setting_value" colspan="2">
                 <input type="radio" name="page_languages" id="page_languages_true" style="width: 14px; height: 14px;" value="true"{PAGE_LANGUAGES_ENABLED} />
@@ -71,7 +71,7 @@
                 <label for="page_languages_false">{TEXT_DISABLED}</label>
 		</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="multiple_menus" id="multiple_menus_true" style="width: 14px; height: 14px;" value="true"{MULTIPLE_MENUS_ENABLED} />
@@ -89,7 +89,7 @@
 		<label for="home_folders_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="manage_sections" id="manage_sections_true" style="width: 14px; height: 14px;" value="true"{MANAGE_SECTIONS_ENABLED} />
@@ -98,7 +98,7 @@
 		<label for="manage_sections_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="section_blocks" id="section_blocks_true" style="width: 14px; height: 14px;" value="true"{SECTION_BLOCKS_ENABLED} />
@@ -116,7 +116,7 @@
 		<label for="intro_page_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="homepage_redirection" id="homepage_redirection_true" style="width: 14px; height: 14px;" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
@@ -125,7 +125,7 @@
 		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} />
@@ -143,7 +143,7 @@
 		<label for="frontend_login_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" />
@@ -160,7 +160,7 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="er_level">
@@ -171,13 +171,13 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="wysiwyg_editor">
@@ -212,7 +212,7 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_CHARSET}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="default_charset">
@@ -312,55 +312,55 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HEADER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_header" style="height: 100px;" cols="50" rows="3">{SEARCH_HEADER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
@@ -404,7 +404,7 @@
 		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<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">
@@ -499,43 +499,43 @@
 		</table>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGES_DIRECTORY}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MEDIA_DIRECTORY}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="page_extension" value="{PAGE_EXTENSION}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="page_spacer" value="{PAGE_SPACER}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SESSION_IDENTIFIER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="app_name" value="{APP_NAME}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="sec_anchor" value="{SEC_ANCHOR}" />
@@ -570,18 +570,18 @@
 	</td>
 </tr>
 <!-- MORE ADVANCED SMTP MAILER SETTINGS -->
-<tr id="row_wbmailer_smtp_settings" style="display:{SMTP_VISIBILITY};">
+<tr id="row_wbmailer_smtp_settings"{SMTP_VISIBILITY}>
 	<td colspan="3" style="padding-top: 10px;">
 			<p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p>
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_host" style="display:{SMTP_VISIBILITY};">
+<tr id="row_wbmailer_smtp_host"{SMTP_VISIBILITY}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_HOST}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" style="width: 250px" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" />
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_auth_mode" style="display:{SMTP_VISIBILITY};">
+<tr id="row_wbmailer_smtp_auth_mode"{SMTP_VISIBILITY}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="checkbox" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth();" style="width: 14px; height: 14px;" value="true"{SMTP_AUTH_SELECTED} />
@@ -588,13 +588,13 @@
 		<label for="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth(this.value);">({TEXT_WBMAILER_SMTP_AUTH_NOTICE})</label>
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_username" style="display:{SMTP_VISIBILITY_AUTH};">
+<tr id="row_wbmailer_smtp_username"{SMTP_VISIBILITY_AUTH}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_USERNAME}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" style="width: 250px" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" />
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_password" style="display:{SMTP_VISIBILITY_AUTH};">
+<tr id="row_wbmailer_smtp_password"{SMTP_VISIBILITY_AUTH}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_PASSWORD}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="password" style="width: 250px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" />
Index: branches/2.8.x/wb/templates/wb_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1259)
+++ branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1260)
@@ -39,7 +39,7 @@
 		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="page_level_limit">
@@ -62,7 +62,7 @@
 		</div>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
         <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
         <td class="setting_value" colspan="2">
                 <input type="radio" name="page_languages" id="page_languages_true" style="width: 14px; height: 14px;" value="true"{PAGE_LANGUAGES_ENABLED} />
@@ -71,7 +71,7 @@
                 <label for="page_languages_false">{TEXT_DISABLED}</label>
 		</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="multiple_menus" id="multiple_menus_true" style="width: 14px; height: 14px;" value="true"{MULTIPLE_MENUS_ENABLED} />
@@ -89,7 +89,7 @@
 		<label for="home_folders_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="manage_sections" id="manage_sections_true" style="width: 14px; height: 14px;" value="true"{MANAGE_SECTIONS_ENABLED} />
@@ -98,7 +98,7 @@
 		<label for="manage_sections_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="section_blocks" id="section_blocks_true" style="width: 14px; height: 14px;" value="true"{SECTION_BLOCKS_ENABLED} />
@@ -116,7 +116,7 @@
 		<label for="intro_page_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="homepage_redirection" id="homepage_redirection_true" style="width: 14px; height: 14px;" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
@@ -125,7 +125,7 @@
 		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} />
@@ -143,7 +143,7 @@
 		<label for="frontend_login_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" />
@@ -160,7 +160,7 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="er_level">
@@ -171,13 +171,13 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="wysiwyg_editor">
@@ -212,7 +212,7 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_CHARSET}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="default_charset">
@@ -312,55 +312,55 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HEADER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_header" style="height: 100px;" cols="50" rows="3">{SEARCH_HEADER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
 		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
@@ -404,7 +404,7 @@
 		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<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">
@@ -499,43 +499,43 @@
 		</table>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGES_DIRECTORY}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MEDIA_DIRECTORY}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="page_extension" value="{PAGE_EXTENSION}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="page_spacer" value="{PAGE_SPACER}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SESSION_IDENTIFIER}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="app_name" value="{APP_NAME}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" name="sec_anchor" value="{SEC_ANCHOR}" />
@@ -551,13 +551,13 @@
 <tr>
 	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:</td>
 	<td class="setting_value" colspan="2">
-		<input type="text" style="width: 250px" name="server_email" value="{SERVER_EMAIL}" />
+		<input type="text" style="width: 250px;" name="server_email" value="{SERVER_EMAIL}" />
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_NAME}:</td>
 	<td class="setting_value" colspan="2">
-		<input type="text" style="width: 250px" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" />
+		<input type="text" style="width: 250px;" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" />
 	</td>
 </tr>
 <tr>
@@ -570,18 +570,18 @@
 	</td>
 </tr>
 <!-- MORE ADVANCED SMTP MAILER SETTINGS -->
-<tr id="row_wbmailer_smtp_settings" style="display:{SMTP_VISIBILITY}">
+<tr id="row_wbmailer_smtp_settings"{SMTP_VISIBILITY}>
 	<td colspan="3" style="padding-top: 10px;">
 			<p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p>
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_host" style="display:{SMTP_VISIBILITY}">
+<tr id="row_wbmailer_smtp_host"{SMTP_VISIBILITY}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_HOST}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="text" style="width: 250px" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" />
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_auth_mode" style="display:{SMTP_VISIBILITY}">
+<tr id="row_wbmailer_smtp_auth_mode"{SMTP_VISIBILITY}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="checkbox" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth();" style="width: 14px; height: 14px;" value="true"{SMTP_AUTH_SELECTED} />
@@ -588,16 +588,16 @@
 		<label for="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth(this.value);">({TEXT_WBMAILER_SMTP_AUTH_NOTICE})</label>
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_username" style="display:{SMTP_VISIBILITY_AUTH}">
+<tr id="row_wbmailer_smtp_username"{SMTP_VISIBILITY_AUTH}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_USERNAME}:</td>
 	<td class="setting_value" colspan="2">
-		<input type="text" style="width: 250px" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" />
+		<input type="text" style="width: 250px;" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" />
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_password" style="display:{SMTP_VISIBILITY_AUTH}">
+<tr id="row_wbmailer_smtp_password"{SMTP_VISIBILITY_AUTH}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_PASSWORD}:</td>
 	<td class="setting_value" colspan="2">
-		<input type="password" style="width: 250px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" />
+		<input type="password" style="width: 250px;" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" />
 	</td>
 </tr>
 <tr>
Index: branches/2.8.x/wb/templates/argos_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1259)
+++ branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1260)
@@ -37,7 +37,7 @@
 		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name" width="200">{TEXT_PAGE_LEVEL_LIMIT}:</td>
 	<td class="setting_value" colspan="3" width="700">
 		<select name="page_level_limit">
@@ -60,7 +60,7 @@
 		</div>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
         <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
         <td class="setting_value" colspan="3">
                 <input type="radio" name="page_languages" id="page_languages_true" style="width: 14px; height: 14px;" value="true"{PAGE_LANGUAGES_ENABLED} />
@@ -69,7 +69,7 @@
                 <label for="page_languages_false">{TEXT_DISABLED}</label>
 		</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="radio" name="multiple_menus" id="multiple_menus_true" style="width: 14px; height: 14px;" value="true"{MULTIPLE_MENUS_ENABLED} />
@@ -87,7 +87,7 @@
 		<label for="home_folders_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="radio" name="manage_sections" id="manage_sections_true" style="width: 14px; height: 14px;" value="true"{MANAGE_SECTIONS_ENABLED} />
@@ -96,7 +96,7 @@
 		<label for="manage_sections_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="radio" name="section_blocks" id="section_blocks_true" style="width: 14px; height: 14px;" value="true"{SECTION_BLOCKS_ENABLED} />
@@ -114,7 +114,7 @@
 		<label for="intro_page_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="radio" name="homepage_redirection" id="homepage_redirection_true" style="width: 14px; height: 14px;" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
@@ -123,7 +123,7 @@
 		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} />
@@ -141,7 +141,7 @@
 		<label for="frontend_login_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" />
@@ -158,7 +158,7 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
 	<td class="setting_value" colspan="3">
 		<select name="er_level">
@@ -169,11 +169,11 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
 	<td class="setting_value" colspan="3"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
 	<td class="setting_value" colspan="3">
 		<select name="wysiwyg_editor">
@@ -206,7 +206,7 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_CHARSET}:</td>
 	<td class="setting_value" colspan="3">
 		<select name="default_charset">
@@ -304,55 +304,55 @@
 		</select>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HEADER}:</td>
 	<td class="setting_value" colspan="3">
 		<textarea name="search_header" style="height: 100px;" cols="50" rows="3">{SEARCH_HEADER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
 	<td class="setting_value" colspan="3">
 		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
 	<td class="setting_value" colspan="3">
 		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
 	<td class="setting_value" colspan="3">
 		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_FOOTER}:</td>
 	<td class="setting_value" colspan="3">
 		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
@@ -395,7 +395,7 @@
 	</td>
 </tr>
 
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name"><div id="{ADVANCED_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">{TEXT_FILESYSTEM_PERMISSIONS}:</div></td>
 	<td class="setting_value" id="file_mode" align="left">
 		<table cellpadding="2" cellspacing="0" border="0" width="90%" style="border-right: 1px solid #ddd;" id="{ADVANCED_FILE_PERMS_ID}2">
@@ -486,31 +486,31 @@
 		</table>
 	</td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGES_DIRECTORY}:</td>
 	<td class="setting_value" colspan="3"><input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" /></td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MEDIA_DIRECTORY}:</td>
 	<td class="setting_value" colspan="3"><input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" /></td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
 	<td class="setting_value" colspan="3"><input type="text" name="page_extension" value="{PAGE_EXTENSION}" /></td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
 	<td class="setting_value" colspan="3"><input type="text" name="page_spacer" value="{PAGE_SPACER}" /></td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</td>
 	<td class="setting_value" colspan="3"><input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" /></td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SESSION_IDENTIFIER}:</td>
 	<td class="setting_value" colspan="3"><input type="text" name="app_name" value="{APP_NAME}" /></td>
 </tr>
-<tr {DISPLAY_ADVANCED}>
+<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
 	<td class="setting_value" colspan="3"><input type="text" name="sec_anchor" value="{SEC_ANCHOR}" /></td>
 </tr>
@@ -539,14 +539,14 @@
 	</td>
 </tr>
 <!-- MORE ADVANCED SMTP MAILER SETTINGS -->
-<tr id="row_wbmailer_smtp_settings" style="display:{SMTP_VISIBILITY};">
+<tr id="row_wbmailer_smtp_settings"{SMTP_VISIBILITY}>
 	<td colspan="3" style="padding-top: 10px;"><p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p></td>
 </tr>
-<tr id="row_wbmailer_smtp_host" style="display:{SMTP_VISIBILITY};">
+<tr id="row_wbmailer_smtp_host"{SMTP_VISIBILITY}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_HOST}:</td>
 	<td class="setting_value" colspan="3"><input type="text" style="width: 250px" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" /></td>
 </tr>
-<tr id="row_wbmailer_smtp_auth_mode" style="display:{SMTP_VISIBILITY};">
+<tr id="row_wbmailer_smtp_auth_mode"{SMTP_VISIBILITY}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</td>
 	<td class="setting_value" colspan="3">
 		<input type="checkbox" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth();" style="width: 14px; height: 14px;" value="true"{SMTP_AUTH_SELECTED} />
@@ -553,11 +553,11 @@
 		<label for="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth(this.value);">({TEXT_WBMAILER_SMTP_AUTH_NOTICE})</label>
 	</td>
 </tr>
-<tr id="row_wbmailer_smtp_username" style="display:{SMTP_VISIBILITY_AUTH};">
+<tr id="row_wbmailer_smtp_username"{SMTP_VISIBILITY_AUTH}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_USERNAME}:</td>
 	<td class="setting_value" colspan="3"><input type="text" style="width: 250px" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" /></td>
 </tr>
-<tr id="row_wbmailer_smtp_password" style="display:{SMTP_VISIBILITY_AUTH};">
+<tr id="row_wbmailer_smtp_password"{SMTP_VISIBILITY_AUTH}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_PASSWORD}:</td>
 	<td class="setting_value" colspan="3"><input type="password" style="width: 250px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" /></td>
 </tr>