Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1548)
+++ branches/2.8.x/CHANGELOG	(revision 1549)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
+19 Dez-2011 Build 1549 Dietmar Woellbrink (Luisehahne)
+! christmas time corrected wrong files
 19 Dez-2011 Build 1548 Dietmar Woellbrink (Luisehahne)
 - remove quickSkin /temp/folder/ for a later solution
 18 Dez-2011 Build 1547 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/themes/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/settings.htt	(revision 1548)
+++ branches/2.8.x/wb/admin/themes/templates/settings.htt	(revision 1549)
@@ -9,38 +9,38 @@
 	<td colspan="3"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
 </tr>
 <tr>
-	<td class="setting_name" width="200">{TEXT_WEBSITE_TITLE}:</td>
-	<td class="setting_value" colspan="3" width="700">
+	<td class="setting_name">{TEXT_WEBSITE_TITLE}:</td>
+	<td class="setting_value" colspan="2">
 		<input type="text" name="website_title" value="{WEBSITE_TITLE}" />
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_DESCRIPTION}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<textarea name="website_description" cols="50" rows="3">{WEBSITE_DESCRIPTION}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_KEYWORDS}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<textarea name="website_keywords" cols="50" rows="3" >{WEBSITE_KEYWORDS}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<textarea name="website_header" cols="50" rows="3">{WEBSITE_HEADER}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_FOOTER}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
-	<td class="setting_name" width="200">{TEXT_PAGE_LEVEL_LIMIT}:</td>
-	<td class="setting_value" colspan="3" width="700">
+	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
+	<td class="setting_value" colspan="2">
 		<select name="page_level_limit">
 		<!-- BEGIN page_level_limit_list_block -->
 			<option value="{NUMBER}"{SELECTED}>{NUMBER}</option>
@@ -50,7 +50,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="radio" name="page_trash" id="page_trash_disabled" style="width: 14px; height: 14px;" value="disabled"{PAGE_TRASH_DISABLED} />
 		<label for="page_trash_disabled">{TEXT_DISABLED}</label>
 		<input type="radio" name="page_trash" id="page_trash_inline" style="width: 14px; height: 14px;" value="inline"{PAGE_TRASH_INLINE} />
@@ -63,7 +63,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
         <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
-        <td class="setting_value" colspan="3">
+        <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} />
                 <label for="page_languages_true">{TEXT_ENABLED}</label>
                 <input type="radio" name="page_languages" id="page_languages_false" style="width: 14px; height: 14px;" value="false"{PAGE_LANGUAGES_DISABLED} />
@@ -72,7 +72,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
-	<td class="setting_value" colspan="3">
+	<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} />
 		<label for="multiple_menus_true">{TEXT_ENABLED}</label>
 		<input type="radio" name="multiple_menus" id="multiple_menus_false" style="width: 14px; height: 14px;" value="false"{MULTIPLE_MENUS_DISABLED} />
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="radio" name="home_folders" id="home_folders_true" style="width: 14px; height: 14px;" value="true"{HOME_FOLDERS_ENABLED} />
 		<label for="home_folders_true">{TEXT_ENABLED}</label>
 		<input type="radio" name="home_folders" id="home_folders_false" style="width: 14px; height: 14px;" value="false"{HOME_FOLDERS_DISABLED} />
@@ -90,7 +90,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
-	<td class="setting_value" colspan="3">
+	<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} />
 		<label for="manage_sections_true">{TEXT_ENABLED}</label>
 		<input type="radio" name="manage_sections" id="manage_sections_false" style="width: 14px; height: 14px;" value="false"{MANAGE_SECTIONS_DISABLED} />
@@ -99,7 +99,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
-	<td class="setting_value" colspan="3">
+	<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} />
 		<label for="section_blocks_true">{TEXT_ENABLED}</label>
 		<input type="radio" name="section_blocks" id="section_blocks_false" style="width: 14px; height: 14px;" value="false"{SECTION_BLOCKS_DISABLED} />
@@ -108,7 +108,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="radio" name="intro_page" id="intro_page_true" style="width: 14px; height: 14px;" value="true"{INTRO_PAGE_ENABLED} />
 		<label for="intro_page_true">{TEXT_ENABLED}</label>
 		<input type="radio" name="intro_page" id="intro_page_false" style="width: 14px; height: 14px;" value="false"{INTRO_PAGE_DISABLED} />
@@ -117,7 +117,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
-	<td class="setting_value" colspan="3">
+	<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} />
 		<label for="homepage_redirection_true">{TEXT_ENABLED}</label>
 		<input type="radio" name="homepage_redirection" id="homepage_redirection_false" style="width: 14px; height: 14px;" value="false"{HOMEPAGE_REDIRECTION_DISABLED} />
@@ -126,7 +126,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
-	<td class="setting_value" colspan="3">
+	<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} />
 		<label for="smart_login_true">{TEXT_ENABLED}</label>
 		<input type="radio" name="smart_login" id="smart_login_false" style="width: 14px; height: 14px;" value="false"{SMART_LOGIN_DISABLED} />
@@ -135,7 +135,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_LOGIN}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="radio" name="frontend_login" id="frontend_login_true" style="width: 14px; height: 14px;" value="true"{PRIVATE_ENABLED} />
 		<label for="frontend_login_true">{TEXT_ENABLED}</label>
 		<input type="radio" name="frontend_login" id="frontend_login_false" style="width: 14px; height: 14px;" value="false"{PRIVATE_DISABLED} />
@@ -144,7 +144,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" style="width:50%;" />
 		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
 	</td>
@@ -151,7 +151,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_SIGNUP}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="frontend_signup">
 			<option value="false">{TEXT_DISABLED}</option>
 			<!-- BEGIN group_list_block -->
@@ -162,7 +162,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="er_level">
 			<option value="">{TEXT_PLEASE_SELECT}...</option>
 			<!-- BEGIN error_reporting_list_block -->
@@ -173,11 +173,11 @@
 </tr>
 <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>
+	<td class="setting_value" colspan="2"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="wysiwyg_editor">
 		<!-- BEGIN editor_list_block -->
 			<option value="{FILE}"{SELECTED}>{NAME}</option>
@@ -186,12 +186,12 @@
 	</td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td>
+	<td class="setting_name">&nbsp;</td>
+	<td class="setting_value_permissions">
 		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
-	<td style="text-align: right;">
+	<td class="setting_value_permissions" style="text-align: right;">
 		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
@@ -200,7 +200,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_LANGUAGE}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="default_language">
 			<!-- BEGIN language_list_block -->
 			<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
@@ -210,7 +210,7 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_CHARSET}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="default_charset">
 			<option value="">{TEXT_PLEASE_SELECT}...</option>
 			<!-- BEGIN charset_list_block -->
@@ -221,7 +221,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_TIMEZONE}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="default_timezone">
 			<option value="0">{TEXT_PLEASE_SELECT}...</option>
 			<!-- BEGIN timezone_list_block -->
@@ -232,7 +232,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="default_date_format">
 			<option value="M d Y">{TEXT_PLEASE_SELECT}...</option>
 			<!-- BEGIN date_format_list_block -->
@@ -243,7 +243,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="default_time_format">
 			<option value="g:i A">{TEXT_PLEASE_SELECT}...</option>
 			<!-- BEGIN time_format_list_block -->
@@ -254,7 +254,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_TEMPLATE}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="default_template">
 		<!-- BEGIN template_list_block -->
 			<option value="{FILE}"{SELECTED}>{NAME}</option>
@@ -264,7 +264,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_THEME}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="default_theme">
 		<!-- BEGIN theme_list_block -->
 			<option value="{FILE}"{SELECTED}>{NAME}</option>
@@ -273,12 +273,12 @@
 	</td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td>
+	<td class="setting_name">&nbsp;</td>
+	<td class="setting_value_permissions">
 		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
-	<td style="text-align: right;">
+	<td class="setting_value_permissions" style="text-align: right;">
 		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
@@ -287,7 +287,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_VISIBILITY}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="search">
 			<option value="public">{TEXT_PUBLIC}</option>
 			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
@@ -298,7 +298,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_TEMPLATE}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<select name="search_template">
 		<!-- BEGIN search_template_list_block -->
 			<option value="{FILE}"{SELECTED}>{NAME}</option>
@@ -308,65 +308,65 @@
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_HEADER}:</td>
-	<td class="setting_value" colspan="3">
+	<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}>
 	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_FOOTER}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
 	</td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td>
+	<td class="setting_name">&nbsp;</td>
+	<td class="setting_value_permissions">
 		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
-	<td style="text-align: right;">
+	<td class="setting_value_permissions" style="text-align: right;">
 		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
@@ -375,7 +375,7 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="radio" name="operating_system" id="operating_system_linux" onclick="javascript: change_os('linux');" style="width: 14px; height: 14px;" value="linux"{LINUX_SELECTED} />
 		<label for="operating_system_linux" onclick="javascript: change_os('linux');">{TEXT_LINUX_UNIX_BASED}</label>
 		<input type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');" style="width: 14px; height: 14px;" value="windows"{WINDOWS_SELECTED} />
@@ -384,7 +384,7 @@
 </tr>
 <tr>
 	<td class="setting_name"><div id="{BASIC_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">&nbsp;</div></td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<div id="{BASIC_FILE_PERMS_ID}2" style="margin: 0; padding: 0;">
 			<input type="checkbox" name="world_writeable" id="world_writeable" style="width: 14px; height: 14px;" value="true"{WORLD_WRITEABLE_SELECTED} />
 			<label for="world_writeable">
@@ -398,8 +398,8 @@
 
 <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 summary="" cellpadding="2" cellspacing="0" border="0" width="90%" style="border-right: 1px solid #ddd;" id="{ADVANCED_FILE_PERMS_ID}2">
+	<td class="setting_value_permissions" id="file_mode">
+		<table summary="" cellpadding="2" cellspacing="0" width="90%" border="0" style="border-right: 1px solid #ddd;" id="{ADVANCED_FILE_PERMS_ID}2">
 		<tr>
 			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_FILES}: {STRING_FILE_MODE}</td>
 		</tr>
@@ -442,8 +442,8 @@
 		</tr>
 		</table>
 	</td>
-	<td class="setting_value" id="dir_mode" style="text-align: right;">
-		<table summary="" cellpadding="2" cellspacing="0" border="0" width="90%" id="{ADVANCED_FILE_PERMS_ID}3">
+	<td class="setting_value_permissions" id="dir_mode" style="text-align: right;">
+		<table summary="" cellpadding="2" cellspacing="0" width="90%" border="0" id="{ADVANCED_FILE_PERMS_ID}3">
 		<tr>
 			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_DIRECTORIES}: {STRING_DIR_MODE}</td>
 		</tr>
@@ -489,31 +489,31 @@
 </tr>
 <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>
+	<td class="setting_value" colspan="2"><input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" /></td>
 </tr>
 <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>
+	<td class="setting_value" colspan="2"><input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" /></td>
 </tr>
 <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>
+	<td class="setting_value" colspan="2"><input type="text" name="page_extension" value="{PAGE_EXTENSION}" /></td>
 </tr>
 <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>
+	<td class="setting_value" colspan="2"><input type="text" name="page_spacer" value="{PAGE_SPACER}" /></td>
 </tr>
 <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>
+	<td class="setting_value" colspan="2"><input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" /></td>
 </tr>
 <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>
+	<td class="setting_value" colspan="2"><input type="text" name="app_name" value="{APP_NAME}" /></td>
 </tr>
 <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>
+	<td class="setting_value" colspan="2"><input type="text" name="sec_anchor" value="{SEC_ANCHOR}" /></td>
 </tr>
 <!-- BASIC MAILER SETTINGS -->
 <tr>
@@ -524,15 +524,15 @@
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:</td>
-	<td class="setting_value" colspan="3"><input type="text" style="width: 250px" name="server_email" value="{SERVER_EMAIL}" /></td>
+	<td class="setting_value" colspan="2"><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="3"><input type="text" style="width: 250px" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" /></td>
+	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" /></td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');" style="width: 14px; height: 14px;" value="phpmail"{PHPMAIL_SELECTED} />
 		<label for="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');">{TEXT_WBMAILER_PHP}</label>
 		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');" style="width: 14px; height: 14px;" value="smtp"{SMTPMAIL_SELECTED} />
@@ -545,11 +545,11 @@
 </tr>
 <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>
+	<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"{SMTP_VISIBILITY}>
 	<td class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</td>
-	<td class="setting_value" colspan="3">
+	<td class="setting_value" colspan="2">
 		<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} />
 		<label for="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth(this.value);">({TEXT_WBMAILER_SMTP_AUTH_NOTICE})</label>
 	</td>
@@ -556,19 +556,19 @@
 </tr>
 <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>
+	<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"{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>
+	<td class="setting_value" colspan="2"><input type="password" style="width: 250px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" /></td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td>
+	<td class="setting_name">&nbsp;</td>
+	<td class="setting_value_permissions">
 		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
 		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
 	</td>
-	<td style="text-align: right;">
+	<td class="setting_value_permissions" style="text-align: right;">
 		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
 	</td>
 </tr>
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1548)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1549)
@@ -52,5 +52,5 @@
 
 // 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');
-if(!defined('REVISION')) define('REVISION', '1548');
+if(!defined('REVISION')) define('REVISION', '1549');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/framework/class.database.php
===================================================================
--- branches/2.8.x/wb/framework/class.database.php	(revision 1548)
+++ branches/2.8.x/wb/framework/class.database.php	(revision 1549)
@@ -305,6 +305,9 @@
 
 } /// end of class database
 
+define('MYSQL_SEEK_FIRST', 0);
+define('MYSQL_SEEK_LAST', -1);
+
 class mysql {
 
 	// Run a query
@@ -324,6 +327,18 @@
 		return mysql_fetch_array($this->result, $typ);
 	}
 
+	function rewind()
+	{
+		return $this->seekRow();
+	}
+
+	function seekRow( $position = MYSQL_SEEK_FIRST )
+	{
+		$pmax = $this->numRows() - 1;
+		$p = (($position < 0 || $position > $pmax) ? $pmax : $position);
+		return mysql_data_seek($this->result, $p);
+	}
+
 	// Get error
 	function error() {
 		if(isset($this->error)) {
Index: branches/2.8.x/wb/templates/wb_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1548)
+++ branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1549)
@@ -45,8 +45,9 @@
 .section { margin-top :10px; padding :0px; border :1px solid #999999; font-size :1em; width :100%; background-color :#fdfdfd; height :75px; }
 .sections_header { width :100%; margin-bottom :10px; border :none; background-color :#f0f0f0; height :50px; }
 .sections_header td { padding :5px; }
-.setting_name { width :20%; }
-.setting_value { width :30%; }
+.setting_name { width :20%; min-width :200px;  }
+.setting_value { width :80%; }
+.setting_value_permissions { width :50%; min-width :400px; }
 .setting_value textarea { height :50px; }
 .title { width :90%; padding :3px 5px 0px 0px; color :#003366; font-weight :bold; font-size :14px; text-align :left; height :16px; }
 .tool_table ul { margin :0; padding :0; margin-left :20px; margin-bottom :2px; }
Index: branches/2.8.x/wb/templates/argos_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/theme.css	(revision 1548)
+++ branches/2.8.x/wb/templates/argos_theme/theme.css	(revision 1549)
@@ -58,7 +58,8 @@
 .modify_link { padding :4px 0 0 7px; }
 .settings_table td { vertical-align :top; text-align :left; padding :5px; }
 .setting_name { width :10%; min-width :180px; }
-.setting_value { width :50%; }
+.setting_value { width :90%; }
+.setting_value_permissions { width :50%; min-width :400px; }
 .setting_value input, .setting_value select, .setting_value textarea { width :100%; }
 .setting_value textarea { height :50px; }
 #admintools ul { padding :0; margin :0; }
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php	(revision 1548)
+++ branches/2.8.x/wb/install/save.php	(revision 1549)
@@ -493,7 +493,7 @@
 	." ('string_file_mode', '$file_mode'),"
 	." ('string_dir_mode', '$dir_mode'),"
 	." ('wbmailer_routine', 'phpmail'),"
-	." ('server_email', 'admin@yourdomain.com'),"		// avoid that mail provider (e.g. mail.com) reject mails like yourname@mail.com
+	." ('server_email', '$admin_email'),"		// avoid that mail provider (e.g. mail.com) reject mails like yourname@mail.com
 	." ('wbmailer_default_sendername', 'WB Mailer'),"
 	." ('wbmailer_smtp_host', ''),"
 	." ('wbmailer_smtp_auth', ''),"