Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1528)
+++ branches/2.8.x/CHANGELOG	(revision 1529)
@@ -11,7 +11,8 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
-
+25 Nov-2011 Build 1529 Dietmar Woellbrink (Luisehahne)
++ add new backend theme handling (Tks to Stefek)
 ----------------------------------- Fixes 2.8.2 --------------------------------
 23 Nov-2011 Build 1528 Dietmar Woellbrink (Luisehahne)
 ! rework login and show_menu in templates allcss and round 
Index: branches/2.8.x/wb/warten.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/warten.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 1528)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 1529)
@@ -64,6 +64,64 @@
 			'[ADMIN]/preferences/email.php',
 			'[ADMIN]/preferences/password.php',
 
+			'[TEMPLATE]/argos_theme/templates/access.htt',
+			'[TEMPLATE]/argos_theme/templates/addons.htt',
+			'[TEMPLATE]/argos_theme/templates/admintools.htt',
+			'[TEMPLATE]/argos_theme/templates/error.htt',
+			'[TEMPLATE]/argos_theme/templates/groups.htt',
+			'[TEMPLATE]/argos_theme/templates/groups_form.htt',
+			'[TEMPLATE]/argos_theme/templates/languages.htt',
+			'[TEMPLATE]/argos_theme/templates/languages_details.htt',
+			'[TEMPLATE]/argos_theme/templates/login.htt',
+			'[TEMPLATE]/argos_theme/templates/login_forgot.htt',
+			'[TEMPLATE]/argos_theme/templates/media.htt',
+			'[TEMPLATE]/argos_theme/templates/media_browse.htt',
+			'[TEMPLATE]/argos_theme/templates/media_rename.htt',
+			'[TEMPLATE]/argos_theme/templates/modules.htt',
+			'[TEMPLATE]/argos_theme/templates/modules_details.htt',
+			'[TEMPLATE]/argos_theme/templates/pages.htt',
+			'[TEMPLATE]/argos_theme/templates/pages_modify.htt',
+			'[TEMPLATE]/argos_theme/templates/pages_sections.htt',
+			'[TEMPLATE]/argos_theme/templates/pages_settings.htt',
+			'[TEMPLATE]/argos_theme/templates/preferences.htt',
+			'[TEMPLATE]/argos_theme/templates/setparameter.htt',
+			'[TEMPLATE]/argos_theme/templates/settings.htt',
+			'[TEMPLATE]/argos_theme/templates/start.htt',
+			'[TEMPLATE]/argos_theme/templates/success.htt',
+			'[TEMPLATE]/argos_theme/templates/templates.htt',
+			'[TEMPLATE]/argos_theme/templates/templates_details.htt',
+			'[TEMPLATE]/argos_theme/templates/users.htt',
+			'[TEMPLATE]/argos_theme/templates/users_form.htt',
+
+			'[TEMPLATE]/wb_theme/templates/access.htt',
+			'[TEMPLATE]/wb_theme/templates/addons.htt',
+			'[TEMPLATE]/wb_theme/templates/admintools.htt',
+			'[TEMPLATE]/wb_theme/templates/error.htt',
+			'[TEMPLATE]/wb_theme/templates/groups.htt',
+			'[TEMPLATE]/wb_theme/templates/groups_form.htt',
+			'[TEMPLATE]/wb_theme/templates/languages.htt',
+			'[TEMPLATE]/wb_theme/templates/languages_details.htt',
+			'[TEMPLATE]/wb_theme/templates/login.htt',
+			'[TEMPLATE]/wb_theme/templates/login_forgot.htt',
+			'[TEMPLATE]/wb_theme/templates/media.htt',
+			'[TEMPLATE]/wb_theme/templates/media_browse.htt',
+			'[TEMPLATE]/wb_theme/templates/media_rename.htt',
+			'[TEMPLATE]/wb_theme/templates/modules.htt',
+			'[TEMPLATE]/wb_theme/templates/modules_details.htt',
+			'[TEMPLATE]/wb_theme/templates/pages.htt',
+			'[TEMPLATE]/wb_theme/templates/pages_modify.htt',
+			'[TEMPLATE]/wb_theme/templates/pages_sections.htt',
+			'[TEMPLATE]/wb_theme/templates/pages_settings.htt',
+			'[TEMPLATE]/wb_theme/templates/preferences.htt',
+			'[TEMPLATE]/wb_theme/templates/setparameter.htt',
+			'[TEMPLATE]/wb_theme/templates/settings.htt',
+			'[TEMPLATE]/wb_theme/templates/start.htt',
+			'[TEMPLATE]/wb_theme/templates/success.htt',
+			'[TEMPLATE]/wb_theme/templates/templates.htt',
+			'[TEMPLATE]/wb_theme/templates/templates_details.htt',
+			'[TEMPLATE]/wb_theme/templates/users.htt',
+			'[TEMPLATE]/wb_theme/templates/users_form.htt',
+
 		 );
 
 
@@ -200,7 +258,7 @@
 <h1>WebsiteBaker Upgrade</h1>
 <?php
 	if( version_compare( WB_VERSION, '2.7', '<' )) {
-		status_msg('<strong>Warning:</strong><br />It is not possible to upgrade from WebsiteBaker Versions before 2.7.0.<br />For upgrading to version '.VERSION.' you must upgrade first to v.2.7 at least!!!', 'warning', 'div');
+		status_msg('<strong>Warning:</strong><br />It is not possible to upgrade from WebsiteBaker Versions before 2.7.<br />For upgrading to version '.VERSION.' you must upgrade first to v.2.7 at least!!!', 'warning', 'div');
 		echo '<br /><br />';
 		echo "</div>
 		</body>
Index: branches/2.8.x/wb/media/index.php
===================================================================
--- branches/2.8.x/wb/media/index.php	(revision 1528)
+++ branches/2.8.x/wb/media/index.php	(revision 1529)
@@ -1,26 +1,9 @@
 <?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-header('Location: ../index.php');
+// *** This file is generated by WebsiteBaker Ver.2.8.2
+// *** Creation date: 2011-11-09T20:06:57+00:00
+// *** Do not modify this file manually
+// *** WB will rebuild this file from time to time!!
+// *************************************************
+	header('HTTP/1.1 301 Moved Permanently');
+	header('Location: http://wb282.wdsnet/2.8.x/wb/index.php');
+// *************************************************
Index: branches/2.8.x/wb/admin/groups/get_permissions.php
===================================================================
--- branches/2.8.x/wb/admin/groups/get_permissions.php	(revision 1528)
+++ branches/2.8.x/wb/admin/groups/get_permissions.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         groups
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
Index: branches/2.8.x/wb/admin/groups/groups.php
===================================================================
--- branches/2.8.x/wb/admin/groups/groups.php	(revision 1528)
+++ branches/2.8.x/wb/admin/groups/groups.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         groups
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -46,8 +45,11 @@
 			// Get existing values
 			$results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id = '".$group_id."'");
 			$group = $results->fetchRow();
-			// Setup template object
-			$template = new Template(THEME_PATH.'/templates');
+			// Setup template object, parse vars to it, then parse it
+			$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('groups_form.htt'));
+			// Create new template object
+			$template = new Template($ThemePath);
+			// $template->debug = true;
 			$template->set_file('page', 'groups_form.htt');
 			$template->set_block('page', 'main_block', 'main');
 			$template->set_var(	array(
Index: branches/2.8.x/wb/admin/groups/index.php
===================================================================
--- branches/2.8.x/wb/admin/groups/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/groups/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         groups
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -22,8 +21,11 @@
 $admin = new admin('Access', 'groups');
 $ftan = $admin->getFTAN();
 
-// Create new template object for the modify/remove menu
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('groups.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'groups.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_block('main_block', 'manage_users_block', 'users');
@@ -93,8 +95,11 @@
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');
 
-// Setup template for add group form
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('groups_form.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'groups_form.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_var('DISPLAY_EXTRA', 'display:none;');
Index: branches/2.8.x/wb/admin/media/setparameter.php
===================================================================
--- branches/2.8.x/wb/admin/media/setparameter.php	(revision 1528)
+++ branches/2.8.x/wb/admin/media/setparameter.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         media
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -75,7 +74,10 @@
 // Read data to display
 $caller = "setparameter";
 
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('setparameter.htt'));
+// Create new template object
+$template = new Template($ThemePath);
 $template->set_file('page', 'setparameter.htt');
 $template->set_block('page', 'main_block', 'main');
 if ($_SESSION['GROUP_ID'] != 1) {
Index: branches/2.8.x/wb/admin/media/browse.php
===================================================================
--- branches/2.8.x/wb/admin/media/browse.php	(revision 1528)
+++ branches/2.8.x/wb/admin/media/browse.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         media
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -82,8 +81,10 @@
    return round($size/pow(1024, ($i = floor(log($size, 1024)))), 1) . $filesizename[$i];
 }
 
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('media_browse.htt'));
+// Create new template object
+$template = new Template($ThemePath);
 $template->set_file('page', 'media_browse.htt');
 $template->set_block('page', 'main_block', 'main');
 
Index: branches/2.8.x/wb/admin/media/parameters.php
===================================================================
--- branches/2.8.x/wb/admin/media/parameters.php	(revision 1528)
+++ branches/2.8.x/wb/admin/media/parameters.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         media
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
Index: branches/2.8.x/wb/admin/media/index.php
===================================================================
--- branches/2.8.x/wb/admin/media/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/media/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         admintools
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -25,8 +24,10 @@
 $starttime = $starttime[0]+$starttime[1];
 include ('parameters.php');
 
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('media.htt'));
+// Create new template object
+$template = new Template($ThemePath);
 $template->set_file('page', 'media.htt');
 $template->set_block('page', 'main_block', 'main');
 
Index: branches/2.8.x/wb/admin/media/rename.php
===================================================================
--- branches/2.8.x/wb/admin/media/rename.php	(revision 1528)
+++ branches/2.8.x/wb/admin/media/rename.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         media
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -95,8 +94,10 @@
 	$admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], $dirlink, false);
 }
 
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('media_rename.htt'));
+// Create new template object
+$template = new Template($ThemePath);
 $template->set_file('page', 'media_rename.htt');
 $template->set_block('page', 'main_block', 'main');
 //echo WB_PATH.'/media/'.$directory.'/'.$rename_file;
Index: branches/2.8.x/wb/admin/themes/templates/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/login_forgot.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/login_forgot.htt	(revision 1529)
@@ -0,0 +1,70 @@
+<!-- BEGIN main_block -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>Retrieve Login Details</title>
+<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
+<meta http-equiv="content-language" content="{LANGUAGE}" />
+<meta name="description" content="Retrieve Login Details" />
+<meta name="keywords" content="Retrieve Login Details" />
+<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
+</head>
+<body onload="document.forgot_pass.email.focus();">
+
+<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
+	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
+	{SECTION_FORGOT}
+</div> 
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
+<tr>
+	<td class="content">
+	
+	<form name="forgot_pass" action="{ACTION_URL}" method="post">
+	<input type="hidden" name="url" value="{URL}" />
+		<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
+		<tr>
+			<td height="40" align="center" style="color: #{MESSAGE_COLOR};" colspan="2">{MESSAGE}</td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td height="10" colspan="2"></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td width="165" height="30" align="right">{TEXT_EMAIL}:</td>
+			<td><input type="text" maxlength="255" name="email" value="{EMAIL}" style="width: 180px;" /></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}" height="30">
+			<td>&nbsp;</td>
+			<td><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;"></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td height="10" colspan="2"></td>
+		</tr>
+		</table>
+	</form>
+	
+	<center>
+		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>
+		<br />
+		<br />
+		<a href="{WB_URL}/">{TEXT_HOME}</a>
+	</center>
+
+	</td>
+</tr>
+</table>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0px 10px 0px;">
+<tr>
+	<td style="font-size:12px;text-align:center;">
+      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
+      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+	</td>
+</tr>
+</table>
+
+</body>
+</html>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/error.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/error.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/error.htt	(revision 1529)
@@ -0,0 +1,6 @@
+<!-- BEGIN main_block -->
+<div class="error-box rounded">
+	<p>{MESSAGE}</p>
+<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{LINK}';" />
+</div>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/footer.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/footer.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/footer.htt	(revision 1529)
@@ -0,0 +1,19 @@
+<!-- BEGIN footer_block -->
+
+</div>
+</div>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0;">
+  <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>
+{BACKEND_BODY_MODULE_JS}
+</body>
+</html>
+<!-- END footer_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/pages.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/pages.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/pages.htt	(revision 1529)
@@ -0,0 +1,90 @@
+<!-- BEGIN main_block -->
+<div class="{DISPLAY_ADD}">
+<h2>{HEADING_ADD_PAGE}</h2>
+<form name="add" action="add.php" method="post">
+{FTAN}
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
+  <tr>
+	<td width="70" height="20">{TEXT_TITLE}:</td>
+	<td width="240" height="20"><input type="text" name="title" style="width: 232px;" /></td>
+	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">{TEXT_ADMINISTRATORS}:
+		<ul style="list-style-type: none; margin: 0; padding: 0;">
+			<!-- BEGIN group_list_block -->
+			<li>
+			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+			<label for="admin_group_{TOGGLE}">{NAME}</label>
+			</li>
+			<!-- END group_list_block -->
+		</ul>
+	</td>
+	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
+		<div id="viewers" style="display: none;">{TEXT_REGISTERED_VIEWERS}:
+			<ul style="list-style-type: none; margin: 0; padding: 0;">
+				<!-- BEGIN group_list_block2 -->
+				<li>
+				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
+				</li>
+				<!-- END group_list_block2 -->
+			</ul>
+		</div>
+	</td>
+  </tr>
+  <tr>
+	<td width="70">{TEXT_TYPE}:</td>
+	<td width="240">
+		<select name="type" style="width: 240px;">
+			<!-- BEGIN module_list_block -->
+				<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END module_list_block -->
+		</select>
+	</td>
+  </tr>
+  <tr>
+	<td width="70">{TEXT_PARENT}:</td>
+	<td width="240">
+		<select  name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
+			<!-- BEGIN page_list_block2 -->
+			<option value="{ID}"{DISABLED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
+			<!-- END page_list_block2 -->
+		</select>
+	</td>
+  </tr>
+  <tr>
+	<td width="70">{TEXT_VISIBILITY}:</td>
+	<td width="240">
+		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
+			<option value="public"{SELECTED}>{TEXT_PUBLIC}</option>
+			<option value="private">{TEXT_PRIVATE}</option>
+			<option value="registered">{TEXT_REGISTERED}</option>
+			<option value="hidden">{TEXT_HIDDEN}</option>
+			<option value="none">{TEXT_NONE}</option>
+		</select>
+	</td>
+  </tr>
+  <tr>
+	<td width="70">&nbsp;</td>
+	<td colspan="4">
+		<input type="submit" name="submit" value="{TEXT_ADD}" style="width: 117px;" />
+		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
+	</td>
+  </tr>
+  <tr>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+  </tr>
+</table>
+</form>
+</div>
+<div class="{DISPLAY_INTRO}" style="padding-top: 10px;">
+<br />
+<h2>{HEADING_MODIFY_INTRO_PAGE}</h2>
+<a href="intro.php">{INTRO_LINK}</a>
+</div>
+<!-- Addition for remembering expanded state of pages -->
+<script type="text/javascript">
+var THEME_URL = '{THEME_URL}';
+var WB_URL = '{WB_URL}';
+</script>
+<script src="{ADMIN_URL}/pages/page_index.js" type="text/javascript"></script>
+<!-- END main_block -->
Index: branches/2.8.x/wb/admin/themes/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/settings.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/settings.htt	(revision 1529)
@@ -0,0 +1,585 @@
+<!-- BEGIN main_block -->
+
+<form name="settings" action="save.php" method="post">
+<input type="hidden" name="advanced" value="{ADVANCED}" />
+{FTAN}
+
+<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
+<tr>
+	<td colspan="3"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
+</tr>
+<tr>
+	<td class="setting_name" width="200">{TEXT_WEBSITE_TITLE}:</td>
+	<td class="setting_value" colspan="3" width="700">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<select name="page_level_limit">
+		<!-- BEGIN page_level_limit_list_block -->
+			<option value="{NUMBER}"{SELECTED}>{NUMBER}</option>
+		<!-- END page_level_limit_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="page_trash_inline">{TEXT_INLINE}</label>
+		<div style="margin: 0; padding: 0;{DISPLAY_PAGE_TRASH_SEPARATE}">
+			<input type="radio" name="page_trash" id="page_trash_separate" style="width: 14px; height: 14px;" value="separate"{PAGE_TRASH_SEPARATE} />
+			<label for="page_trash_separate">{TEXT_SEPARATE}</label>
+		</div>
+	</td>
+</tr>
+<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} />
+                <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} />
+                <label for="page_languages_false">{TEXT_DISABLED}</label>
+		</td>
+</tr>
+<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} />
+		<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} />
+		<label for="multiple_menus_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="home_folders_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="manage_sections_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="section_blocks_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="intro_page_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="smart_login_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_LOGIN}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="frontend_login_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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}" style="width:50%;" />
+		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_SIGNUP}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="frontend_signup">
+			<option value="false">{TEXT_DISABLED}</option>
+			<!-- BEGIN group_list_block -->
+				<option value="{ID}" {SELECTED}>{NAME}</option>
+			<!-- END group_list_block -->
+		</select>
+	</td>
+</tr>
+<tr{DISPLAY_ADVANCED}>
+	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="er_level">
+			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN error_reporting_list_block -->
+				<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END error_reporting_list_block -->
+		</select>
+	</td>
+</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>
+</tr>
+<tr{DISPLAY_ADVANCED}>
+	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="wysiwyg_editor">
+		<!-- BEGIN editor_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END editor_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_DEFAULT_SETTINGS}</h2></td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_LANGUAGE}:</td>
+	<td class="setting_value" colspan="3">
+		<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>
+			<!-- END language_list_block -->
+		</select>
+	</td>
+</tr>
+<tr{DISPLAY_ADVANCED}>
+	<td class="setting_name">{TEXT_CHARSET}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_charset">
+			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN charset_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END charset_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TIMEZONE}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_timezone">
+			<option value="0">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN timezone_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END timezone_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_date_format">
+			<option value="M d Y">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN date_format_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END date_format_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_time_format">
+			<option value="g:i A">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN time_format_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END time_format_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TEMPLATE}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_template">
+		<!-- BEGIN template_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END template_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_THEME}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_theme">
+		<!-- BEGIN theme_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END theme_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SEARCH_SETTINGS}</h2></td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_VISIBILITY}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="search">
+			<option value="public">{TEXT_PUBLIC}</option>
+			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
+			<option value="registered" {REGISTERED_SEARCH}>{TEXT_REGISTERED}</option>
+			<option value="none" {NONE_SEARCH}>{TEXT_NONE}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TEMPLATE}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="search_template">
+		<!-- BEGIN search_template_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END search_template_list_block -->
+		</select>
+	</td>
+</tr>
+<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}" />
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SERVER_SETTINGS}</h2></td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="operating_system_windows" onclick="javascript: change_os('windows');">{TEXT_WINDOWS}</label>
+	</td>
+</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">
+		<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">
+				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
+			</label>
+			<span class="warning">({WORLD_WRITEABLE_WARNING})</span>
+		</div>
+		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
+	</td>
+</tr>
+
+<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">
+		<tr>
+			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_FILES}:</td>
+		</tr>
+		<tr>
+			<td>{TEXT_USER}:</td>
+			<td>{TEXT_GROUP}:</td>
+			<td>{TEXT_OTHERS}:</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="file_u_r" id="file_u_r" value="true"{FILE_U_R_CHECKED} />
+				<label for="file_u_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_u_w" id="file_u_w" value="true"{FILE_U_W_CHECKED} />
+				<label for="file_u_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_u_e" id="file_u_e" value="true"{FILE_U_E_CHECKED} />
+				<label for="file_u_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="file_g_r" id="file_g_r" value="true"{FILE_G_R_CHECKED} />
+				<label for="file_g_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_g_w" id="file_g_w" value="true"{FILE_G_W_CHECKED} />
+				<label for="file_g_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_g_e" id="file_g_e" value="true"{FILE_G_E_CHECKED} />
+				<label for="file_g_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="file_o_r" id="file_o_r" value="true"{FILE_O_R_CHECKED} />
+				<label for="file_o_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_o_w" id="file_o_w" value="true"{FILE_O_W_CHECKED} />
+				<label for="file_o_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_o_e" id="file_o_e" value="true"{FILE_O_E_CHECKED} />
+				<label for="file_o_e">{TEXT_EXECUTE}</label>
+			</td>
+		</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">
+		<tr>
+			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_DIRECTORIES}:</td>
+		</tr>
+		<tr>
+			<td>{TEXT_USER}:</td>
+			<td>{TEXT_GROUP}:</td>
+			<td>{TEXT_OTHERS}:</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="dir_u_r" id="dir_u_r" value="true"{DIR_U_R_CHECKED} />
+				<label for="dir_u_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_u_w" id="dir_u_w" value="true"{DIR_U_W_CHECKED} />
+				<label for="dir_u_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_u_e" id="dir_u_e" value="true"{DIR_U_E_CHECKED} />
+				<label for="dir_u_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="dir_g_r" id="dir_g_r" value="true"{DIR_G_R_CHECKED} />
+				<label for="dir_g_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_g_w" id="dir_g_w" value="true"{DIR_G_W_CHECKED} />
+				<label for="dir_g_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_g_e" id="dir_g_e" value="true"{DIR_G_E_CHECKED} />
+				<label for="dir_g_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="dir_o_r" id="dir_o_r" value="true"{DIR_O_R_CHECKED} />
+				<label for="dir_o_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_o_w" id="dir_o_w" value="true"{DIR_O_W_CHECKED} />
+				<label for="dir_o_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_o_e" id="dir_o_e" value="true"{DIR_O_E_CHECKED} />
+				<label for="dir_o_e">{TEXT_EXECUTE}</label>
+			</td>
+		</tr>
+		</table>
+	</td>
+</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>
+</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>
+</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>
+</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>
+</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>
+</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>
+</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>
+</tr>
+<!-- BASIC MAILER SETTINGS -->
+<tr>
+	<td colspan="3" style="padding-top: 10px;">
+		<h2>{HEADING_WBMAILER_SETTINGS}</h2>
+		<p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}</p>
+	</td>
+</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>
+</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>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');">{TEXT_WBMAILER_SMTP}</label>
+	</td>
+</tr>
+<!-- MORE ADVANCED SMTP MAILER SETTINGS -->
+<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"{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"{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} />
+		<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"{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"{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>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+</table>
+
+</form>
+
+<hr size="1" />
+
+<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+<br />
+<font class="{DISPLAY_ADVANCED_BUTTON}">{MODE_SWITCH_WARNING}</font>
+<script src="{ADMIN_URL}/settings/setting.js" type="text/javascript"></script>
+<!-- END main_block -->
Index: branches/2.8.x/wb/admin/themes/templates/users.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/users.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/users.htt	(revision 1529)
@@ -0,0 +1,32 @@
+<!-- BEGIN main_block -->
+
+<form name="users" action="users.php" method="post">
+<input type="hidden" name="userstatus" value="{USER_STATUS}" />
+{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_USER}</h2></td>
+		<td align="right">
+		<!-- BEGIN manage_groups_block -->
+		<a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a>
+		<!-- END manage_groups_block -->
+		</td>
+     </tr>
+</table>
+<button type="button" name="status" title="{TEXT_USERS}" style="width: 30px; background: {STATUS_ICON} no-repeat center" value="{USER_STATUS}" onclick="javascript: window.location = 'index.php?status={USER_STATUS}';" class="status {DISPLAY_MODIFY}" >&nbsp;</button>
+<select name="user_id" style="width: 500px;">
+<!-- BEGIN list_block -->
+	<option value="{VALUE}" {STATUS}>{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 style="margin-top: 20px;" class="{DISPLAY_ADD}">{HEADING_ADD_USER}</h2>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/access.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/access.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/access.htt	(revision 1529)
@@ -0,0 +1,33 @@
+<!-- BEGIN main_block -->
+<h2>{ACCESS}</h2>
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+	<tr>
+		<td align="center" valign="top">
+			<!-- BEGIN users_block -->	
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_USERS} >
+				<tr>
+					<td class="graphic" align="center" valign="top" rowspan="2">
+						<a href="{ADMIN_URL}/users/index.php"><img src="{THEME_URL}/icons/users.png" alt="{USERS}" /></a>
+					</td>
+					<td class="description" valign="top">
+						<a href="{ADMIN_URL}/users/index.php"><span class="title">{USERS}</span></a><p>{USERS_OVERVIEW}</p>
+					</td>
+				</tr>
+			</table>	
+			<!-- END users_block -->
+			<!-- BEGIN groups_block -->		
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
+				<tr>
+					<td class="graphic" align="center" valign="top" rowspan="2">
+						<a href="{ADMIN_URL}/groups/index.php"><img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" /></a>
+					</td>
+					<td class="description" valign="top">
+						<a href="{ADMIN_URL}/groups/index.php"><span class="title">{GROUPS}</span></a><p>{GROUPS_OVERVIEW}</p>
+					</td>
+				</tr>
+			</table>
+			<!-- END groups_block -->
+		</td>
+	</tr>
+</table>
+<!-- END main_block -->
Index: branches/2.8.x/wb/admin/themes/templates/templates_details.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/templates_details.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/templates_details.htt	(revision 1529)
@@ -0,0 +1,32 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_TEMPLATE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+<tr>
+	<td valign="top">{TEXT_DESCRIPTION}:</td>
+	<td style="text-align: justify;">{DESCRIPTION}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/pages_modify.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/pages_modify.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/pages_modify.htt	(revision 1529)
@@ -0,0 +1,25 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+<tr style="background:#f0f0f0;">
+	<td valign="middle" align="left"><h2>{HEADING_MODIFY_PAGE}</h2></td>
+	<td align="left" width="20%">ID: {PAGE_ID}</td>
+	<td align="right">
+		{TEXT_CURRENT_PAGE}:
+		<b>{PAGE_TITLE}</b>
+		- 
+		<a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}">{TEXT_CHANGE_SETTINGS}</a>
+<!-- BEGIN show_section_block -->
+		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
+		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
+<!-- END show_section_block -->
+		<font style="color:#999;" class="{CLASS_DISPLAY_MODIFIED}"><br />
+<!-- BEGIN show_modify_block -->
+		{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
+<!-- END show_modify_block -->
+		</font>
+	</td>
+</tr>
+</table>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/success.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/success.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/success.htt	(revision 1529)
@@ -0,0 +1,11 @@
+<!-- BEGIN main_block -->
+<div class="msg-box rounded">
+	<p>{MESSAGE}</p>
+<!-- BEGIN show_redirect_block -->
+ <script type="text/javascript">
+  setTimeout("location.href='{REDIRECT}'", {REDIRECT_TIMER});
+ </script>
+<!-- END show_redirect_block -->
+<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{REDIRECT}';" />
+</div>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/modules.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/modules.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/modules.htt	(revision 1529)
@@ -0,0 +1,136 @@
+<!-- BEGIN main_block -->
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="right">
+			{URL_TEMPLATES}
+			-
+			{URL_LANGUAGES}
+			-
+			{URL_ADVANCED}
+		</td>
+     </tr>
+</table>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
+  <h2>{HEADING_INSTALL_MODULE}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td valign="middle">
+        <input type="file" name="userfile" size="97" />
+        <script type="text/javascript">
+		document.install.userfile.focus();
+		</script><br />
+        <input type="checkbox" name="overwrite" value="false"  />
+		<span>{OVERWRITE_NEWER_FILES}</span>
+      </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_MODULE}</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 module_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+          <!-- END module_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_MODULE_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 module_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+          <!-- END module_list_block -->
+        </select>
+      </td>
+      <td width="110">
+        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
+      </td>
+    </tr>
+  </table>
+  <br />
+</form>
+<div class="{DISPLAY_MANUAL_INSTALL}">
+  <h2>{HEADING_INVOKE_MODULE_FILES}</h2>
+  <p>{TEXT_MANUAL_INSTALLATION}</p>
+  <form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
+{FTAN}
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
+	  <tr>
+		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "install.php"</td>
+		<td valign="middle">
+			<input type="hidden" name="action" value="install" />
+			<select name="file" style="width: 250px;">
+	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN install_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+			<!-- END install_list_block -->
+			</select>
+			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
+		</td>
+	  </tr>
+  </table>
+  </form>
+  
+  <form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
+{FTAN}
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
+	  <tr>
+		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "upgrade.php"</td>
+		<td valign="middle" >
+			<input type="hidden" name="action" value="upgrade" />
+			<select name="file" style="width: 250px;">
+	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN install_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+			<!-- END install_list_block -->
+			</select>
+			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
+		</td>
+	  </tr>
+  </table>
+  </form>
+
+  <form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
+{FTAN}
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
+	  <tr>
+		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "uninstall.php"</td>
+		<td valign="middle">
+			<input type="hidden" name="action" value="uninstall" />
+			<select name="file" style="width: 250px;">
+	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN install_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+			<!-- END install_list_block -->
+			</select>
+			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
+			</td>
+	  </tr>
+  </table>
+  </form>
+
+  <p style="color:red;">{TEXT_MANUAL_INSTALLATION_WARNING}</p>
+</div>
+<!-- END main_block -->
Index: branches/2.8.x/wb/admin/themes/templates/addons.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/addons.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/addons.htt	(revision 1529)
@@ -0,0 +1,60 @@
+<!-- BEGIN main_block -->
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td valign="middle" align="left"><h2>{ADDONS_OVERVIEW}</h2></td>
+		<td align="right">{URL_ADVANCED}</td>
+	</tr>
+</table>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+	<tr>
+		<td align="center" valign="top">
+			<!-- BEGIN modules_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_MODULES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/modules/index.php"><img src="{THEME_URL}/icons/modules.png" alt="0" /> </a> </td>
+					<td class="description" valign="top"><a href="{ADMIN_URL}/modules/index.php"><span class="title">{MODULES}</span></a><p>{MODULES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END modules_block -->
+			<!-- BEGIN templates_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_TEMPLATES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/templates/index.php"><img src="{THEME_URL}/icons/templates.png" alt="{TEMPLATES}" /> </a> </td>
+					<td class="description" valign="top"><a href="{ADMIN_URL}/templates/index.php"><span class="title">{TEMPLATES}</span></a><p>{TEMPLATES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END templates_block -->
+			<!-- BEGIN languages_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_LANGUAGES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/languages/index.php"><img src="{THEME_URL}/icons/languages.png" alt="{LANGUAGES}" /> </a> </td>
+					<td class="description" valign="top"> <a href="{ADMIN_URL}/languages/index.php"><span class="title">{LANGUAGES}</span></a><p>{LANGUAGES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END languages_block -->
+			<!-- BEGIN reload_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_RELOAD} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><img src="{THEME_URL}/icons/admintools.png" alt="{TXT_ADMIN_SETTINGS}" /> </td>
+					<td class="description" valign="top"><span class="title">{TXT_ADMIN_SETTINGS}</span>
+						<form action="{RELOAD_URL}" method="post">
+						{FTAN}
+							{MESSAGE_RELOAD_ADDONS}
+							<br style="margin-bottom: 0.5em" />
+							<input {DISPLAY_MODULES} type="checkbox" name="reload_modules" id="reload_modules" value="true" />
+							<label {DISPLAY_MODULES} for="reload_modules">{MODULES}</label>
+							<input {DISPLAY_TEMPLATES} type="checkbox" name="reload_templates" id="reload_templates" value="true" />
+							<label {DISPLAY_TEMPLATES} for="reload_templates">{TEMPLATES}</label>
+							<input {DISPLAY_LANGUAGES} type="checkbox" name="reload_languages" id="reload_languages" value="true" />
+							<label {DISPLAY_LANGUAGES} for="reload_languages">{LANGUAGES}</label>
+							<input type="submit" name="submit" value="{TEXT_RELOAD}" />
+						</form>
+					</td>
+				</tr>
+			</table>
+			<!-- END reload_block -->
+		</td>
+	</tr>
+</table>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/login.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/login.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/login.htt	(revision 1529)
@@ -0,0 +1,83 @@
+<!-- BEGIN mainBlock -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>{TEXT_LOGIN}</title>
+<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
+<meta http-equiv="content-language" content="{LANGUAGE}" />
+<meta name="description" content="{TEXT_LOGIN}" />
+<meta name="keywords" content="{TEXT_LOGIN}" />
+<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
+</head>
+<body onload="document.login.{USERNAME_FIELDNAME}.focus();">
+<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
+	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
+	{TEXT_LOGIN}
+</div> 
+<table class="container" summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
+  <tr>
+    <td class="content">
+      <form name="login" class="login" action="{ACTION_URL}" method="post">
+        <input type="hidden" name="url" value="{URL}" />
+        <input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
+        <input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
+        <table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
+          <tr>
+            <td height="40" align="center" colspan="2">{MESSAGE}</td>
+          </tr>
+          <tr>
+            <td height="10" colspan="2"></td>
+          </tr>
+          <tr>
+            <td width="170" height="30" align="right">{TEXT_USERNAME}:</td>
+            <td>
+              <input type="text" maxlength="{MAX_USERNAME_LEN}" name="{USERNAME_FIELDNAME}" value="{USERNAME}" style="width: 180px;" />
+            </td>
+          </tr>
+          <tr>
+            <td width="170" height="30" align="right">{TEXT_PASSWORD}:</td>
+            <td>
+              <input type="password" maxlength="{MAX_PASSWORD_LEN}" name="{PASSWORD_FIELDNAME}" style="width: 180px;" />
+            </td>
+          </tr>
+          <tr style="{DISPLAY_REMEMBER_ME}">
+            <td>&nbsp;</td>
+            <td>
+              <input type="checkbox" name="remember" id="remember" value="true" />
+              <label for="remember">{TEXT_REMEMBER_ME}</label>
+            </td>
+          </tr>
+          <tr>
+            <td>&nbsp;</td>
+            <td>
+              <input type="submit" name="submit" value="{TEXT_LOGIN}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" />
+            </td>
+          </tr>
+          <tr>
+            <td height="10" colspan="2"></td>
+          </tr>
+        </table>
+      </form>
+      <center>
+        <a href="{FORGOTTEN_DETAILS_APP}">{TEXT_FORGOTTEN_DETAILS}</a> 
+		<br />
+        <br />
+        <br />
+        <a href="{WB_URL}/">{TEXT_HOME}</a>
+      </center>
+    </td>
+  </tr>
+</table>
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding:10px 0;">
+  <tr>
+    <td style="font-size:10px;text-align:center;">
+      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
+      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+<!-- END mainBlock -->
Index: branches/2.8.x/wb/admin/themes/templates/admintools.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/admintools.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/admintools.htt	(revision 1529)
@@ -0,0 +1,22 @@
+<!-- BEGIN main_block -->
+<h2>{HEADING_ADMINISTRATION_TOOLS} </h2>
+<div id="admintools">
+	<ul>
+	<!-- BEGIN tool_list_block -->
+	<li>
+		<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" alt="{TOOL_NAME}" align="left" /></a>
+			</td>
+			<td class="description" valign="top">
+				<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}"><span class="title">{TOOL_NAME}</span></a>{TOOL_DESCRIPTION}
+			</td>
+		</tr>
+		</table>
+	</li>
+	<!-- END tool_list_block -->
+	</ul>
+	{TOOL_LIST}
+</div>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/warning.html
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/warning.html	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/warning.html	(revision 1529)
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>Maximum Invalid Login Attemps Exceeded</title>
+<style type="text/css"><!--
+body,td,th {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000000;
+}
+body {
+	margin: 0px;
+  background: #A8BCCB url(../images/background.png) ;
+  background-repeat:repeat-x;
+}
+a:link, a:visited, a:active {
+	color: #003366;
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: underline;
+	color: #336699;
+}
+h1 {
+	text-align: center;
+	font-size: 18px;
+	color: #000;
+	text-transform: uppercase;
+}
+hr {
+	height: 1px;
+	color: #336699;
+	background-color: #336699;
+	border: 0;
+}
+div#message {
+	text-align: center;
+}
+--></style></head>
+<body>
+
+<div id='message'>
+	<h1>Excessive Invalid Logins</h1>
+	You have attempted to login too many times
+</div>
+
+</body>
+</html>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/themes/templates/warning.html
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Index: branches/2.8.x/wb/admin/themes/templates/languages_details.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/languages_details.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/languages_details.htt	(revision 1529)
@@ -0,0 +1,32 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_LANGUAGE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_CODE}:</td>
+	<td>{CODE}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/groups.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/groups.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/groups.htt	(revision 1529)
@@ -0,0 +1,30 @@
+<!-- BEGIN main_block -->
+
+<form name="groups" action="groups.php" method="post">
+ {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/admin/themes/templates/users_form.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/users_form.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/users_form.htt	(revision 1529)
@@ -0,0 +1,95 @@
+<!-- BEGIN main_block -->
+
+<script type="text/javascript">
+function toggle_radio(radio_on, radio_off) {
+	document.getElementById(radio_on).checked = true;
+	document.getElementById(radio_off).checked = true;
+}
+</script>
+
+<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_USER}</h2>
+
+<form name="user" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
+<input type="hidden" name="user_id" value="{USER_ID}" />
+<input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
+{FTAN}
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="150">{TEXT_USERNAME}:</td>
+	<td class="value_input">
+		<input type="text" name="{USERNAME_FIELDNAME}" maxlength="30" value="{USERNAME}" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_PASSWORD}:</td>
+	<td class="value_input">
+		<input type="password" name="password" maxlength="30" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_RETYPE_PASSWORD}:</td>
+	<td class="value_input">
+		<input type="password" name="password2" maxlength="30" />
+	</td>
+</tr>
+<tr style="{DISPLAY_EXTRA}">
+	<td>&nbsp;</td>
+	<td style="font-size: 10px;">
+		{CHANGING_PASSWORD}
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_DISPLAY_NAME}:</td>
+	<td class="value_input">
+		<input type="text" name="display_name" maxlength="255" value="{DISPLAY_NAME}" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_EMAIL}:</td>
+	<td class="value_input">
+		<input type="text" name="email" maxlength="255" value="{EMAIL}" />
+	</td>
+</tr>
+<tr style="{DISPLAY_HOME_FOLDERS}">
+	<td>{TEXT_HOME_FOLDER}:</td>
+	<td class="value_input">
+		<select name="home_folder">
+			<option value="">{TEXT_NONE}</option>
+			<!-- BEGIN folder_list_block -->
+			<option value="{FOLDER}"{SELECTED}>{NAME}</option>
+			<!-- END folder_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_GROUP}:</td>
+	<td class="value_input">
+		<select name="groups[]" multiple="multiple" size="5">
+		<!-- BEGIN group_list_block -->
+			<option value="{ID}" {SELECTED}>{NAME}</option>
+		<!-- END group_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="radio" name="active[]" id="active" value="1" {ACTIVE_CHECKED} />
+		<label for="active">{TEXT_ACTIVE}</label>
+		<input type="radio" name="active[]" id="disabled" value="0" {DISABLED_CHECKED} />
+		<label for="disabled">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
+		<input type="reset" name="reset" value="{TEXT_RESET}" />
+		<input type="button" style="width: 100px; margin-top: 5px;" onclick="javascript: window.location = 'index.php';" value="{TEXT_CANCEL}">
+	</td>
+</tr>
+</table>
+
+</form>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/header.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/header.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/header.htt	(revision 1529)
@@ -0,0 +1,59 @@
+<!-- BEGIN header_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>{WEBSITE_TITLE}&raquo;{TEXT_ADMINISTRATION}-{SECTION_NAME}</title>
+<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
+<meta http-equiv="content-language" content="{LANGUAGE}" />
+<meta name="description" content="{TEXT_ADMINISTRATION}" />
+<meta name="keywords" content="{TEXT_ADMINISTRATION}" />
+<meta name="author" content="WebsiteBaker Org e.V." />
+<meta http-equiv="Content-Encoding" content="gzip" />
+<meta http-equiv="Accept-Encoding" content="gzip, deflate" />
+<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
+{BACKEND_MODULE_CSS}
+<script type="text/javascript">
+var WB_URL = '{WB_URL}';
+var THEME_URL = '{THEME_URL}';
+var ADMIN_URL = '{ADMIN_URL}';
+</script>
+<script src="{WB_URL}/include/jquery/jquery-min.js" type="text/javascript"></script>
+<script src="{WB_URL}/include/jquery/jquery-insert.js" type="text/javascript"></script>
+<script src="{WB_URL}/include/jquery/jquery-include.js" type="text/javascript"></script>
+<!--[if lt IE 7]><script type="text/javascript" src="{WB_URL}/include/jquery/plugins/jquery-pngFix.js"></script><![endif]-->
+<script src="{THEME_URL}/jquery/jquery-plugins.js" type="text/javascript"></script>
+<script type="text/javascript">
+function confirm_link(message, url) {
+	if(confirm(message)) location.href = url;
+}
+</script>
+{BACKEND_MODULE_JS}
+</head>
+<body>
+<div id="content_container">
+	<div id="admin_header">
+	  <div id="header_top">
+	    <div id="topmenu"> <a href="{ADMIN_URL}" title="{TITLE_START}">Home</a>| <a href="{URL_VIEW}" target="_blank" title="{TITLE_VIEW}">{TITLE_VIEW}</a>| <a href="{ADMIN_URL}/logout/" title="{TITLE_LOGOUT}">{TITLE_LOGOUT}</a>
+		  <br />
+	      <br />
+	      <span class="version">CMS Version  {VERSION}</span><br/>
+	      <span class="version">Revision {REVISION}</span><br/>
+	      <span class="version">{ADMIN_VERSION}</span>
+		 </div>
+		<div>
+	    <a href="{ADMIN_URL}" title="{TITLE_START}" id="website_title">
+	    {WEBSITE_TITLE} - {TEXT_ADMINISTRATION}
+	    <!-- <img src="{THEME_URL}/images/logo.png" border="0" alt="Logo" /> -->
+	    </a>
+		</div>
+		</div>
+	  <div class="menu">
+	    <ul>
+	      <!-- BEGIN linkBlock -->
+	      <li class="{CLASS}"><a href="{LINK}" target="{TARGET}"><span>{TITLE}</span></a></li>
+	      <!-- END linkBlock -->
+	    </ul>
+	  </div>
+	</div>
+	<div class="content">
+<!-- END header_block -->
Index: branches/2.8.x/wb/admin/themes/templates/setparameter.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/setparameter.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/setparameter.htt	(revision 1529)
@@ -0,0 +1,64 @@
+<!-- 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>Set Upload Parameters</title>
+
+
+<style type="text/css">
+body,td,th,input,textarea {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+body {
+	background-color: #FFF;
+	margin: 0px;
+}
+hr {
+	margin: 0px;
+	color: #003366;
+	height: 1px;
+}
+.hide {
+	display: none;
+}
+a:link, a:visited, a:active {
+	color: #003366;
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: none;
+	color: #336699;
+}
+</style>
+</head>
+<body>
+
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" style="border-bottom: 1px solid #666; width: 100%;">
+<tr style="background-color: #DDD;">
+	<td align="center">{TEXT_HEADER}</td>
+</tr>
+</table>
+<form method="post" action="{ADMIN_URL}/media/setparameter.php">
+	{FTAN}
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
+	<tr><td>{SETTINGS}</td><td><input type="checkbox" name="show_thumbs" {NO_SHOW_THUMBS_SELECTED}> {NO_SHOW_THUMBS}</td></tr>
+	<tr class="{DISPLAY_ADMIN}"><td></td>&nbsp;<td><input type="checkbox" name="admin_only" {ADMIN_ONLY_SELECTED}> {ADMIN_ONLY}</td></tr>
+	<tr><td colspan="2" style="border-bottom: 1px solid #666; line-height: 1px;">&nbsp;</td></tr>
+<!-- BEGIN list_block -->
+	<tr style="background-color: #{ROW_BG_COLOR};">
+		<td>{PATH_NAME}</td>
+		<td>{WIDTH} <input size="5" type="text" name="{FIELD_NAME_W}" value="{CUR_WIDTH}"> {HEIGHT} <input size="5" type="text" name="{FIELD_NAME_H}" value="{CUR_HEIGHT}"></td>
+	</tr>
+<!-- END list_block -->
+	<tr>
+		<td><input type="button" onclick="javascript: window.location = 'browse.php'" value="{BACK}"></td>
+		<td><input type="submit" name="save" value="{SAVE_TEXT}"></td>
+	</tr>
+</table>
+</form>
+</body>
+</html>
+
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/start.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/start.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/start.htt	(revision 1529)
@@ -0,0 +1,75 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+  <tr>
+    <td colspan="3">{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}. </td>
+  </tr>
+  <tr style="{DISPLAY_WARNING};">
+    <td colspan="3" align="center" style="color: #FF0000; font-weight: bold;">{WARNING}</td>
+  </tr>
+  <tr>
+    <td align="center" valign="top" width="49%">
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_PAGES};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/pages/index.php"> <img src="{THEME_URL}/icons/pages.png" border="0" alt="{PAGES}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/pages/index.php"><span class="title">{PAGES}</span></a>
+		  {PAGES_OVERVIEW}
+		  </td>
+        </tr>
+
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADDONS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/addons/index.php"> <img src="{THEME_URL}/icons/addons.png" border="0" alt="{ADDONS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/addons/index.php"><span class="title">{ADDONS}</span></a>
+		  {ADDONS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_SETTINGS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/settings/index.php"> <img src="{THEME_URL}/icons/settings.png" border="0" alt="{SETTINGS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/settings/index.php"><span class="title">{SETTINGS}</span></a>
+		  {SETTINGS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ACCESS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/access/index.php"> <img src="{THEME_URL}/icons/access.png" border="0" alt="{ACCESS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/access/index.php"><span class="title">{ACCESS}</span></a>
+		  {ACCESS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+    </td>
+    <td width="10">&nbsp; </td>
+    <td align="center" valign="top">
+	  <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_MEDIA};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/media/index.php"> <img src="{THEME_URL}/icons/media.png" border="0" alt="{MEDIA}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/media/index.php"><span class="title">{MEDIA}</span></a>
+		  {MEDIA_OVERVIEW}
+		  </td>
+        </tr>
+      </table>	  
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/preferences/index.php"> <img src="{THEME_URL}/icons/preferences.png" border="0" alt="{PREFERENCES}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/preferences/index.php"><span class="title">{PREFERENCES}</span></a>
+		  {PREFERENCES_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADMINTOOLS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/admintools/index.php"> <img src="{THEME_URL}/icons/admintools.png" border="0" alt="{ADMINTOOLS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/admintools/index.php"><span class="title">{ADMINTOOLS}</span></a>
+		  {ADMINTOOLS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/templates.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/templates.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/templates.htt	(revision 1529)
@@ -0,0 +1,88 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
+		<td align="right">
+			{URL_MODULES}
+			-
+			{URL_LANGUAGES}
+			-
+			{URL_ADVANCED}
+		</td>
+     </tr>
+</table>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
+
+<h2>{HEADING_INSTALL_TEMPLATE}</h2>
+
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td>
+		<input type="file" name="userfile" size="82" />
+		<script type="text/javascript">
+		document.install.userfile.focus();
+		</script><br /><br />
+	</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/admin/themes/templates/index.php
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/index.php	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/index.php	(revision 1529)
@@ -0,0 +1,32 @@
+<?php
+/**
+ * $Id$
+ * Website Baker theme: argos_theme
+ * This theme is the default WB backend Theme
+ * Feel free to modify or build up on this template.
+ *
+ * This file defines the template variables required by Website Baker.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    1.1
+ * @platform   Website Baker 2.8
+ *
+ * Website Baker is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Website Baker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+*/
+
+// prevent directory listing
+header('Location: ../../../index.php');
+
+?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/themes/templates/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision Id HeadURL
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/admin/themes/templates/media_browse.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/media_browse.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/media_browse.htt	(revision 1529)
@@ -0,0 +1,59 @@
+<!-- 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="120">
+		<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}&amp;id={TEMP_ID}');"><img src="{THEME_URL}/images/delete_16.png" alt="{TEXT_DELETE}" border="0" /></a>&nbsp;&nbsp;
+	</td>
+   <td width="16" align="right" class="">
+	   <img src="{THEME_URL}/images/{IMAGE_EXIST}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" />
+   </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/admin/themes/templates/preferences.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/preferences.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/preferences.htt	(revision 1529)
@@ -0,0 +1,114 @@
+<!-- BEGIN main_block -->
+<h2>{HEADING_MY_SETTINGS}</h2>
+<div class="content_box">
+	<form name="{FORM_NAME}" id="{FORM_NAME}" action="{ACTION_URL}" method="post">
+		{FTAN}
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_USERNAME}:</label><br />
+				</div>
+				<div class="c60l">
+					<div id="username">{USERNAME}</div><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_DISPLAY_NAME}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="text" id="display_name" name="display_name" value="{DISPLAY_NAME}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_LANGUAGE}:</label><br />
+				</div>
+				<div class="c60l">
+				<select name="language" id="language">
+					<!-- BEGIN language_list_block -->
+						<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
+					<!-- END language_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_TIMEZONE}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="timezone" id="timezone">
+						<!-- BEGIN timezone_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END timezone_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_DATE_FORMAT}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="date_format" id="date_format">
+						<!-- BEGIN date_format_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END date_format_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_TIME_FORMAT}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="time_format" id="time_format">
+						<!-- BEGIN time_format_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END time_format_list_block -->
+					</select>
+				</div>
+			</div>
+
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_EMAIL}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="text" id="email" name="email" value="{EMAIL}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_NEW_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="new_password_1" name="new_password_1" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_RETYPE_NEW_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<hr />
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_NEED_CURRENT_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="current_password" name="current_password" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns save_section">
+				<div class="c60l">
+					<input type="submit" id="submit" name="submit" value="{TEXT_SAVE}" />
+					<input type="reset" id="reset" name="reset" value="{TEXT_RESET}" />
+				</div>
+				<div class="c25l">&nbsp;</div>
+			</div>
+	</form>
+</div>
+
+<!-- END main_block -->
Index: branches/2.8.x/wb/admin/themes/templates/groups_form.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/groups_form.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/groups_form.htt	(revision 1529)
@@ -0,0 +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 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 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="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 summary="" cellpadding="2" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
+<tr>
+	<td valign="top" align="left" width="150">{TEXT_MODULE_PERMISSIONS}:</td>
+	<td valign="top" align="left">
+		<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="save" 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_LINK}" method="post">
+<input type="hidden" name="group_id" value="{GROUP_ID}" />
+<input type="hidden" name="action" value="modify" />
+{FTAN}
+<table summary="" 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/admin/themes/templates/media_rename.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/media_rename.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/media_rename.htt	(revision 1529)
@@ -0,0 +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 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/admin/themes/templates/languages.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/languages.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/languages.htt	(revision 1529)
@@ -0,0 +1,74 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
+		<td align="right">
+			{URL_MODULES}
+			-
+			{URL_TEMPLATES}
+			-
+			{URL_ADVANCED}
+		</td>
+     </tr>
+</table>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
+  <h2>{HEADING_INSTALL_LANGUAGE}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td>
+        <input type="file" name="userfile" size="97" />
+        <script type="text/javascript">
+		document.install.userfile.focus();
+		</script><br /><br />
+      </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_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}">
+{FTAN}
+  <h2>{HEADING_LANGUAGE_DETAILS}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td>
+        <select name="code" style="width: 97%;">
+		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN language_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+          <!-- END language_list_block -->
+        </select>
+      </td>
+      <td width="110">
+        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
+      </td>
+    </tr>
+  </table>
+  <br />
+</form>
+<!-- END main_block -->
Index: branches/2.8.x/wb/admin/themes/templates/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/pages_sections.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/pages_sections.htt	(revision 1529)
@@ -0,0 +1,115 @@
+<!-- BEGIN main_block -->
+<div class="jsadmin jcalendar hide"></div>
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td valign="middle" align="left"><h2>{HEADING_MANAGE_SECTIONS}</h2></td>
+		<td align="left" width="20%">ID: {PAGE_ID}</td>
+		<td align="right">{TEXT_CURRENT_PAGE}: <b>{PAGE_TITLE}</b>
+			-
+			<a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{HEADING_MODIFY_PAGE}</a>
+			-
+			<a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}">{TEXT_CHANGE_SETTINGS}</a>
+		</td>
+     </tr>
+</table>
+
+        <form name="section_properties" action="{ADMIN_URL}/pages/sections_save.php?page_id={PAGE_IDKEY}" method="post">
+		{FTAN}
+		
+        <table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" class="img_noborder">
+			<tr class="sections_list">
+				<td class="header_list_type">{TEXT_TYPE}</td>
+				<td class="header_list_block"><span {STYLE_DISPLAY_SECTION_BLOCK}>{TEXT_BLOCK}&nbsp;</span></td>
+				<td class="header_list_pubdate_start">{TEXT_PUBL_START_DATE}</td>
+				<td class="header_list_pubdate_end">{TEXT_PUBL_END_DATE}</td>
+				<td class="header_list_sections_actions" colspan="3">{TEXT_ACTIONS}</td>
+				<td class="header_list_section_id">ID</td>
+				<td {DISPLAY_DEBUG}>{TEXT_PID}</td>
+			</tr>
+<!-- BEGIN section_block -->
+            	<tr class="sectionrow">
+    				<td align="right" style="display:none;">
+                      <input type="hidden" name="page_id" value="{PAGE_IDKEY}"  />
+                      <input type="hidden" name="section_id" value="{VAR_SECTION_ID}"  />
+                      {VAR_SECTION_ID}
+                    </td>
+					
+                    <td>{LINK_MODIFY_URL_VAR_MODUL_NAME}</td>
+					
+                    <td class="{INPUT_ATTRIBUTE}"><span {STYLE_DISPLAY_SECTION_BLOCK}>
+                    	<select name="block{VAR_SECTION_ID}" class="input_normal">
+                        {SET_NONE_DISPLAY_OPTION}
+                    	<!-- BEGIN block_block -->
+                    		<option value="{VALUE}"{SELECTED}>{NAME}</option>
+                    	<!-- END block_block -->
+                    	</select></span>&nbsp;
+                    </td>
+					
+                    <td class="list_pubdate_start"><input type="text" id="start_date{VAR_SECTION_ID}" name="start_date{VAR_SECTION_ID}" value="{VALUE_PUBL_START}" class="input_normal" />
+                        <img src="{THEME_URL}/images/calendar_16.png" id="trigger_start{VAR_SECTION_ID}" style="cursor:pointer;" title="{TEXT_CALENDAR}" alt="{TEXT_CALENDAR}"  />
+                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor:pointer;" alt="{TEXT_DELETE_DATE}" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.start_date{VAR_SECTION_ID}.value=''" />
+                    </td>
+					
+                    <td class="list_pubdate_end"><input type="text" id="end_date{VAR_SECTION_ID}" name="end_date{VAR_SECTION_ID}" value="{VALUE_PUBL_END}" class="input_normal" />
+                        <img src="{THEME_URL}/images/calendar_16.png" id="trigger_stop{VAR_SECTION_ID}" alt="{TEXT_CALENDAR}" style="cursor: pointer;" title="{TEXT_CALENDAR}"  />
+                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor:pointer;" alt="{TEXT_DELETE_DATE}" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.end_date{VAR_SECTION_ID}.value=''" />
+                    </td>
+
+					<td>{VAR_MOVE_UP_URL}</td>
+					
+                    <td>{VAR_MOVE_DOWN_URL}</td>
+
+                    <td>
+                        <a href="#" onclick="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_IDKEY}');">
+                        <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="{TEXT_DELETE}" border="0" />
+                        </a>
+                    </td>
+
+                    <td class="list_section_id">{VAR_SECTION_ID}</td>
+
+                    <td {DISPLAY_DEBUG}>{POSITION}</td>
+                </tr>
+<!-- END section_block -->
+                <tr>
+                    <td align="left" colspan="{DEBUG_COLSPAN_SIZE}">
+					<br />
+					<input type="submit" name="save" value="{TEXT_SAVE}" class="input_medium" />
+					</td>
+    	        </tr>
+	    </table>
+    </form>
+<br />
+	<h2>{TEXT_ADD_SECTION}</h2>
+	<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 summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%">
+    	<tr>
+    		<td width="50%" valign="middle">
+    			<select name="module" class="input_large">
+                <!-- BEGIN module_block -->
+    			 <option value="{VALUE}"{SELECTED}>{NAME}</option>
+                 <!-- END module_block -->
+    			</select>
+				&nbsp;&nbsp;
+				<input type="submit" name="submit" value="{TEXT_ADD}" class="input_medium" />
+   		  </td>
+    	</tr>
+   	  </table>
+	</form>
+    <!-- BEGIN calendar_block -->
+    <script type="text/javascript" >
+         var section_id = '{VAR_SECTION_ID}';
+         var start_date = '{start_date}';
+         var end_date = '{end_date}';
+         var trigger_start = '{trigger_start}';
+         var trigger_end = '{trigger_end}';
+         var jscal_today = '{jscal_today}';
+         var jscal_ifformat = '{jscal_ifformat}';
+         var jscal_firstday = {jscal_firstday};
+         var showsTime = {showsTime};
+         var timeFormat = {timeFormat};
+    </script>
+    <script type="text/javascript" src="{ADMIN_URL}/pages/page_calendar.js" ></script>
+    <!-- END calendar_block -->
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/modules_details.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/modules_details.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/modules_details.htt	(revision 1529)
@@ -0,0 +1,36 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_MODULE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_TYPE}:</td>
+	<td>{TYPE}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+<tr>
+	<td valign="top">{TEXT_DESCRIPTION}:</td>
+	<td style="text-align: justify;">{DESCRIPTION}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/themes/templates/media.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/media.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/media.htt	(revision 1529)
@@ -0,0 +1,123 @@
+<!-- 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>
Index: branches/2.8.x/wb/admin/themes/templates/pages_settings.htt
===================================================================
--- branches/2.8.x/wb/admin/themes/templates/pages_settings.htt	(nonexistent)
+++ branches/2.8.x/wb/admin/themes/templates/pages_settings.htt	(revision 1529)
@@ -0,0 +1,178 @@
+<!-- BEGIN main_block -->
+
+<script src="{ADMIN_URL}/pages/page_settings.js" type="text/javascript"></script>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+  <tr style="background:#f0f0f0;">
+	<td valign="middle" align="left"><h2>{HEADING_MODIFY_PAGE_SETTINGS}</h2></td>
+	<td nowrap="nowrap">ID: {PAGE_ID}</td>
+	<td align="right">
+		{TEXT_CURRENT_PAGE}:
+		<b>{PAGE_TITLE}</b>
+		-
+		<a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{TEXT_MODIFY_PAGE}</a>
+		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
+		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
+		<br />
+		<font style="color:#999;" class="{DISPLAY_MODIFIED}">
+			{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
+		</font>
+	</td>
+  </tr>
+</table>
+
+<form name="settings" action="settings2.php" method="post">
+{FTAN}
+<input type="hidden" name="page_id" value="{PAGE_ID}" />
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
+<tr>
+	<td width="100" height="20">{TEXT_PAGE_TITLE}:</td>
+	<td width="240" height="20">
+		<input type="text" name="page_title" value="{PAGE_TITLE}" style="width: 232px;" />
+	</td>
+	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
+		{TEXT_ADMINISTRATORS}:
+		<ul style="list-style-type: none; margin: 0; padding: 0;">
+			<!-- BEGIN group_list_block -->
+			<li>
+			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+			<label for="admin_group_{TOGGLE}">{NAME}</label>
+			</li>
+			<!-- END group_list_block -->
+		</ul>
+	</td>
+	<td rowspan="10" valign="top" style="padding:8px 0 0 20px;">
+		<div id="allowed_viewers" style="{DISPLAY_VIEWERS}">
+			{TEXT_ALLOWED_VIEWERS}:
+			<ul style="list-style-type:none;margin:0;padding:0;">
+				<!-- BEGIN group_list_block2 -->
+				<li>
+				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
+				</li>
+				<!-- END group_list_block2 -->
+			</ul>
+		</div>
+	</td>
+</tr>
+<tr>
+	<td width="100" height="20">{TEXT_MENU_TITLE}:</td>
+	<td width="240" height="20">
+		<input type="text" name="menu_title" value="{MENU_TITLE}" style="width: 232px;" />
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_PARENT}:</td>
+	<td width="240">
+		<select name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
+			<!-- BEGIN page_list_block2 -->
+			<option value="{ID}"{SELECTED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
+			<!-- END page_list_block2 -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_VISIBILITY}:</td>
+	<td width="240">
+		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
+			<option value="public"{PUBLIC_SELECTED}>{TEXT_PUBLIC}</option>
+			<option value="private"{PRIVATE_SELECTED}>{TEXT_PRIVATE}</option>
+			<option value="registered"{REGISTERED_SELECTED}>{TEXT_REGISTERED}</option>
+			<option value="hidden"{HIDDEN_SELECTED}>{TEXT_HIDDEN}</option>
+			<option value="none"{NO_VIS_SELECTED}>{TEXT_NONE}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100" valign="top">{TEXT_DESCRIPTION}:</td>
+	<td>
+		<textarea name="description" rows="10" cols="1" style="width:236px;height:50px;">{DESCRIPTION}</textarea>
+	</td>
+</tr>
+<tr>
+	<td width="100" valign="top">{TEXT_KEYWORDS}:</td>
+	<td>
+		<textarea name="keywords" rows="10" cols="1" style="width:236px;height:50px;">{KEYWORDS}</textarea>
+	</td>
+</tr>
+<tr>
+	<td>
+		{TEXT_TARGET}:
+	</td>
+	<td>
+		<select name="target" style="width: 240px;" ><!--  value="{TARGET}" -->
+			<option value="_blank"{BLANK_SELECTED}>{TEXT_NEW_WINDOW}</option>
+			<option value="_self"{SELF_SELECTED}>{TEXT_SAME_WINDOW}</option>
+			<option value="_top"{TOP_SELECTED}>{TEXT_TOP_FRAME}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_TEMPLATE}:</td>
+	<td width="240">
+		<select name="template" style="width: 240px;">
+			<option value="">{TEXT_SYSTEM_DEFAULT}</option>
+			<option value="">----------------------</option>
+			<!-- BEGIN template_list_block -->
+			<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END template_list_block -->
+		</select>
+	</td>
+</tr>
+<tr style="{DISPLAY_MENU_LIST}">
+	<td width="100">{TEXT_MENU}:</td>
+	<td width="240">
+		<select name="menu" style="width: 240px;">
+			<!-- BEGIN menu_list_block -->
+			<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END menu_list_block -->
+		</select>
+	</td>
+</tr>
+<tr style="{DISPLAY_LANGUAGE_LIST}">
+	<td width="100">{TEXT_LANGUAGE}:</td>
+	<td width="240">
+		<select name="language" style="width: 240px;">
+			<!-- BEGIN language_list_block -->
+			<option value="{VALUE}"{SELECTED} style="background: {FLAG_LANG_ICONS} no-repeat center left; padding-left: 20px;">{NAME}</option>
+			<!-- END language_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- insert page_code 20090904-->
+<tr{DISPLAY_CODE_PAGE_LIST}>
+	<td width="100">{TEXT_PAGE_CODE}:</td>
+	<td class="list_page_code">
+		<select name="page_code" class="value_page_code">
+			<!-- BEGIN page_code_list_block -->
+			<option value="{VALUE}"{SELECTED} style="background: {FLAG_CODE_ICON} no-repeat center left; padding-left: 20px;">&nbsp;{PAGE_VALUE}</option>
+			<!-- END page_code_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- page code -->
+<tr>
+	<td width="100">{TEXT_SEARCHING}:</td>
+	<td width="240">
+		<select name="searching" style="width: 240px;">
+			<option value="1">{TEXT_ENABLED}</option>
+			<option value="0"{SEARCHING_DISABLED}>{TEXT_DISABLED}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">&nbsp;</td>
+	<td colspan="4">
+		<input type="submit" name="submit" value="{TEXT_SAVE} {SECTION_SETTINGS}" style="width: 117px;" />
+		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+</form>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/admin/index.php
===================================================================
--- branches/2.8.x/wb/admin/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/index.php	(revision 1529)
@@ -34,5 +34,3 @@
 } else {
 	header('Location: '.ADMIN_URL.'/start/index.php');
 }
-
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/start/index.php
===================================================================
--- branches/2.8.x/wb/admin/start/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/start/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         start
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -52,8 +51,10 @@
 	$database->query($sql);
 }
 // ---------------------------------------
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('start.htt'));
+// Create new template object
+$template = new Template($ThemePath);
 $template->set_file('page', 'start.htt');
 $template->set_block('page', 'main_block', 'main');
 
Index: branches/2.8.x/wb/admin/templates/details.php
===================================================================
--- branches/2.8.x/wb/admin/templates/details.php	(revision 1528)
+++ branches/2.8.x/wb/admin/templates/details.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         templates
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -45,8 +44,11 @@
 // Print admin header
 $admin = new admin('Addons', 'templates_view');
 
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('templates_details.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'templates_details.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_var('FTAN', $admin->getFTAN());
Index: branches/2.8.x/wb/admin/templates/index.php
===================================================================
--- branches/2.8.x/wb/admin/templates/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/templates/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         templates
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -21,8 +20,11 @@
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Addons', 'templates');
 
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('templates.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'templates.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_var('FTAN', $admin->getFTAN());
@@ -70,8 +72,7 @@
 		'<a href="' . ADMIN_URL . '/modules/index.php">' . $MENU['MODULES'] . '</a>' : '',
 	'URL_LANGUAGES' => $admin->get_permission('languages') ?
 		'<a href="' . ADMIN_URL . '/languages/index.php">' . $MENU['LANGUAGES'] . '</a>' : '',
-	'URL_ADVANCED' => $admin->get_permission('admintools') ? 
-	'<a href="' . ADMIN_URL . '/modules/index.php?advanced">' . $TEXT['ADVANCED'] . '</a>' : '',
+	'URL_ADVANCED' => '&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;',
 	'TEXT_INSTALL' => $TEXT['INSTALL'],
 	'TEXT_UNINSTALL' => $TEXT['UNINSTALL'],
 	'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'],
Index: branches/2.8.x/wb/admin/pages/settings.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings.php	(revision 1528)
+++ branches/2.8.x/wb/admin/pages/settings.php	(revision 1529)
@@ -90,7 +90,10 @@
 }
 
 // Setup template object, parse vars to it, then parse it
-$template = new Template(THEME_PATH.'/templates');
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('pages_settings.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'pages_settings.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_var('FTAN', $admin->getFTAN());
Index: branches/2.8.x/wb/admin/pages/index.php
===================================================================
--- branches/2.8.x/wb/admin/pages/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/pages/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         pages
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -352,8 +351,11 @@
 	</div>
 	<?php
 }
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('pages.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'pages.htt');
 $template->set_block('page', 'main_block', 'main');
 // Insert values into the add page form
Index: branches/2.8.x/wb/admin/pages/modify.php
===================================================================
--- branches/2.8.x/wb/admin/pages/modify.php	(revision 1528)
+++ branches/2.8.x/wb/admin/pages/modify.php	(revision 1529)
@@ -57,8 +57,11 @@
         ? $modified_ts = date(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE)
         : 'Unknown';
 // $ftan_module = $GLOBALS['ftan_module'];
-// Include page info script
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('pages_modify.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'pages_modify.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_var('FTAN', $admin->getFTAN() );
Index: branches/2.8.x/wb/admin/pages/sections.php
===================================================================
--- branches/2.8.x/wb/admin/pages/sections.php	(revision 1528)
+++ branches/2.8.x/wb/admin/pages/sections.php	(revision 1529)
@@ -197,8 +197,11 @@
 		$jscal_use_time = true; // whether to use a clock, too
 		require_once(WB_PATH."/include/jscalendar/wb-setup.php");
 
-		// Setup template object
-		$tpl = new Template(THEME_PATH.'/templates');
+		// Setup template object, parse vars to it, then parse it
+		$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('pages_sections.htt'));
+		// Create new template object
+		$tpl = new Template($ThemePath);
+		// $template->debug = true;
 		$tpl->set_file('page', 'pages_sections.htt');
 		$tpl->set_block('page', 'main_block', 'main');
 		$tpl->set_block('main_block', 'module_block', 'module_list');
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1528)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1529)
@@ -52,4 +52,4 @@
 
 // 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', '1528');
+if(!defined('REVISION')) define('REVISION', '1529');
Index: branches/2.8.x/wb/admin/settings/index.php
===================================================================
--- branches/2.8.x/wb/admin/settings/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/settings/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         settings
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -29,10 +28,11 @@
 require_once(WB_PATH.'/framework/functions.php');
 require_once(WB_PATH.'/framework/functions-utf8.php');
 
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('settings.htt'));
 // Create new template object
-$template = new Template(THEME_PATH.'/templates');
+$template = new Template($ThemePath);
 // $template->debug = true;
-
 $template->set_file('page',        'settings.htt');
 $template->set_block('page',       'main_block', 'main');
 $template->set_var('FTAN', $admin->getFTAN());
Index: branches/2.8.x/wb/admin/users/users.php
===================================================================
--- branches/2.8.x/wb/admin/users/users.php	(revision 1528)
+++ branches/2.8.x/wb/admin/users/users.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         users
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -43,8 +42,11 @@
 			$results = $database->query("SELECT * FROM `".TABLE_PREFIX."users` WHERE `user_id` = '".$user_id."'");
 			$user = $results->fetchRow();
 
-			// Setup template object
-			$template = new Template(THEME_PATH.'/templates');
+			// Setup template object, parse vars to it, then parse it
+			$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('users_form.htt'));
+			// Create new template object
+			$template = new Template($ThemePath);
+			// $template->debug = true;
 			$template->set_file('page', 'users_form.htt');
 			$template->set_block('page', 'main_block', 'main');
 			$template->set_var(	array(
Index: branches/2.8.x/wb/admin/users/index.php
===================================================================
--- branches/2.8.x/wb/admin/users/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/users/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         users
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -24,8 +23,12 @@
 $iUserStatus = ( ( $admin->get_get('status')==1 ) ? 0 : $iUserStatus );
 unset($_GET);
 
-// Create new template object for the modify/remove menu
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('users.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+
 $template->set_file('page', 'users.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_block("main_block", "manage_groups_block", "groups");
@@ -114,8 +117,11 @@
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');
 
-// Setup template for add user form
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('users_form.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'users_form.htt');
 $template->set_block('page', 'main_block', 'main');
 $template->set_var('DISPLAY_EXTRA', 'display:none;');
Index: branches/2.8.x/wb/admin/users/add.php
===================================================================
--- branches/2.8.x/wb/admin/users/add.php	(revision 1528)
+++ branches/2.8.x/wb/admin/users/add.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         users
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
Index: branches/2.8.x/wb/admin/access/index.php
===================================================================
--- branches/2.8.x/wb/admin/access/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/access/index.php	(revision 1529)
@@ -1,68 +1,70 @@
-<?php
-/**
- *
- * @category        admin
- * @package         access
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
- *
- *
- */
- 
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Access', 'access');
-
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'access.htt');
-
-$template->set_block('page', 'main_block', 'main');
-$template->set_block('main_block', 'users_block', 'user');
-$template->set_block('main_block', 'groups_block', 'group');
-
-// Insert values into the template object
-$template->set_var(array(
-		'ADMIN_URL' => ADMIN_URL,
-		'THEME_URL' => THEME_URL,
-		'WB_URL' => WB_URL
-	)
-);
-
-/**
- *	Insert permission values into the template object
- *	Deprecated - as we are using blocks.
- */
-$display_none = "style=\"display: none;\"";
-if($admin->get_permission('users') != true)	$template->set_var('DISPLAY_USERS', $display_none);
-if($admin->get_permission('groups') != true) $template->set_var('DISPLAY_GROUPS', $display_none);
-
-// Insert section names and descriptions
-$template->set_var(array(
-		'USERS' => $MENU['USERS'],
-		'GROUPS' => $MENU['GROUPS'],
-		'ACCESS' => $MENU['ACCESS'],
-		'USERS_OVERVIEW' => $OVERVIEW['USERS'],
-		'GROUPS_OVERVIEW' => $OVERVIEW['GROUPS'],
-	)
-);
-
-if ( $admin->get_permission('users') == true )	$template->parse('main_block', "users_block", true);
-if ( $admin->get_permission('groups') == true )	$template->parse('main_block', "groups_block", true);
-
-// Parse template object
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-// Print admin footer
-$admin->print_footer();
-
+<?php
+/**
+ *
+ * @category        admin
+ * @package         access
+ * @author          Ryan Djurovich, WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL:  $
+ * @lastmodified    $Date:  $
+ *
+ *
+ */
+ 
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Access', 'access');
+
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('access.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
+$template->set_file('page', 'access.htt');
+
+$template->set_block('page', 'main_block', 'main');
+$template->set_block('main_block', 'users_block', 'user');
+$template->set_block('main_block', 'groups_block', 'group');
+
+// Insert values into the template object
+$template->set_var(array(
+		'ADMIN_URL' => ADMIN_URL,
+		'THEME_URL' => THEME_URL,
+		'WB_URL' => WB_URL
+	)
+);
+
+/**
+ *	Insert permission values into the template object
+ *	Deprecated - as we are using blocks.
+ */
+$display_none = "style=\"display: none;\"";
+if($admin->get_permission('users') != true)	$template->set_var('DISPLAY_USERS', $display_none);
+if($admin->get_permission('groups') != true) $template->set_var('DISPLAY_GROUPS', $display_none);
+
+// Insert section names and descriptions
+$template->set_var(array(
+		'USERS' => $MENU['USERS'],
+		'GROUPS' => $MENU['GROUPS'],
+		'ACCESS' => $MENU['ACCESS'],
+		'USERS_OVERVIEW' => $OVERVIEW['USERS'],
+		'GROUPS_OVERVIEW' => $OVERVIEW['GROUPS'],
+	)
+);
+
+if ( $admin->get_permission('users') == true )	$template->parse('main_block', "users_block", true);
+if ( $admin->get_permission('groups') == true )	$template->parse('main_block', "groups_block", true);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();
+
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/preferences/index.php
===================================================================
--- branches/2.8.x/wb/admin/preferences/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/preferences/index.php	(revision 1529)
@@ -3,9 +3,7 @@
  *
  * @category        admin
  * @package         preferences
- * @author          Independend-Software-Team
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -26,8 +24,10 @@
 {
 	global $HEADING, $TEXT;
 	include_once(WB_PATH.'/framework/functions-utf8.php');
-// Create new template object, assign template file, start main-block
-	$template = new Template( THEME_PATH.'/templates' );
+	// Setup template object, parse vars to it, then parse it
+	$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('preferences.htt'));
+	// Create new template object
+	$template = new Template($ThemePath);
 	$template->set_file( 'page', 'preferences.htt' );
 	$template->set_block( 'page', 'main_block', 'main' );
 // read user-info from table users and assign it to template
Index: branches/2.8.x/wb/admin/languages/details.php
===================================================================
--- branches/2.8.x/wb/admin/languages/details.php	(revision 1528)
+++ branches/2.8.x/wb/admin/languages/details.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         languages
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -50,8 +49,11 @@
 	exit(0);
 }
 
-// Setup language object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('languages_details.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'languages_details.htt');
 $template->set_block('page', 'main_block', 'main');
 
Index: branches/2.8.x/wb/admin/languages/index.php
===================================================================
--- branches/2.8.x/wb/admin/languages/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/languages/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         languages
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -22,8 +21,11 @@
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Addons', 'languages');
 
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('languages.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'languages.htt');
 $template->set_block('page', 'main_block', 'main');
 
@@ -51,25 +53,24 @@
 
 // Insert language headings
 $template->set_var(array(
-								'HEADING_INSTALL_LANGUAGE' => $HEADING['INSTALL_LANGUAGE'],
-								'HEADING_UNINSTALL_LANGUAGE' => $HEADING['UNINSTALL_LANGUAGE'],
-								'HEADING_LANGUAGE_DETAILS' => $HEADING['LANGUAGE_DETAILS']
-								)
-						);
+				'HEADING_INSTALL_LANGUAGE' => $HEADING['INSTALL_LANGUAGE'],
+				'HEADING_UNINSTALL_LANGUAGE' => $HEADING['UNINSTALL_LANGUAGE'],
+				'HEADING_LANGUAGE_DETAILS' => $HEADING['LANGUAGE_DETAILS']
+			)
+		);
 // insert urls
 $template->set_var(array(
-					'ADMIN_URL' => ADMIN_URL,
-					'WB_URL' => WB_URL,
-					'THEME_URL' => THEME_URL,
-					'FTAN' => $admin->getFTAN()
-				)
-			);
+				'ADMIN_URL' => ADMIN_URL,
+				'WB_URL' => WB_URL,
+				'THEME_URL' => THEME_URL,
+				'FTAN' => $admin->getFTAN()
+			)
+		);
 // Insert language text and messages
 $template->set_var(array(
 	'URL_MODULES' => $admin->get_permission('modules') ?
 		'<a href="' . ADMIN_URL . '/modules/index.php">' . $MENU['MODULES'] . '</a>' : '',
-	'URL_ADVANCED' => $admin->get_permission('admintools') ?
-		'<a href="' . ADMIN_URL . '/modules/index.php?advanced">' . $TEXT['ADVANCED'] . '</a>' : '',
+	'URL_ADVANCED' => '&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;',
 	'URL_TEMPLATES' => $admin->get_permission('templates') ?
 		'<a href="' . ADMIN_URL . '/templates/index.php">' . $MENU['TEMPLATES'] . '</a>' : '',
 	'TEXT_INSTALL' => $TEXT['INSTALL'],
Index: branches/2.8.x/wb/admin/login/forgot/index.php
===================================================================
--- branches/2.8.x/wb/admin/login/forgot/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/login/forgot/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         login
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -112,8 +111,10 @@
 	$message_color = 'FF0000';
 }
 	
-// Setup the template
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('login_forgot.htt'));
+// Create new template object
+$template = new Template($ThemePath);
 $template->set_file('page', 'login_forgot.htt');
 $template->set_block('page', 'main_block', 'main');
 if(defined('FRONTEND')) {
@@ -159,5 +160,3 @@
 
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');
-
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/login/index.php
===================================================================
--- branches/2.8.x/wb/admin/login/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/login/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         login
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -38,9 +37,14 @@
 	$password_fieldname = 'password';
 }
 
+$admin = new admin('Start', '', false, false);
+$ThemeUrl = WB_URL.$admin->correct_theme_source('warning.html');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('login.htt'));
+
 $thisApp = new Login( array(
 						'MAX_ATTEMPS' => "3",
-						'WARNING_URL' => THEME_URL."/templates/warning.html",
+						'WARNING_URL' => $ThemeUrl.'/warning.html',
 						'USERNAME_FIELDNAME' => $username_fieldname,
 						'PASSWORD_FIELDNAME' => $password_fieldname,
 						'REMEMBER_ME_OPTION' => SMART_LOGIN,
@@ -50,7 +54,7 @@
 						'MAX_PASSWORD_LEN' => "30",
 						'LOGIN_URL' => ADMIN_URL."/login/index.php",
 						'DEFAULT_URL' => ADMIN_URL."/start/index.php",
-						'TEMPLATE_DIR' => THEME_PATH."/templates",
+						'TEMPLATE_DIR' => $ThemePath,
 						'TEMPLATE_FILE' => "login.htt",
 						'FRONTEND' => false,
 						'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php",
Index: branches/2.8.x/wb/admin/modules/manual_install.php
===================================================================
--- branches/2.8.x/wb/admin/modules/manual_install.php	(revision 1528)
+++ branches/2.8.x/wb/admin/modules/manual_install.php	(revision 1529)
@@ -3,9 +3,7 @@
  *
  * @category        admin
  * @package         modules
- * @author          Christian Sommer
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, Christian Sommer, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
Index: branches/2.8.x/wb/admin/modules/details.php
===================================================================
--- branches/2.8.x/wb/admin/modules/details.php	(revision 1528)
+++ branches/2.8.x/wb/admin/modules/details.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         modules
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -47,8 +46,11 @@
 	exit(0);
 }
 
-// Setup module object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('modules_details.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'modules_details.htt');
 $template->set_block('page', 'main_block', 'main');
 
Index: branches/2.8.x/wb/admin/modules/index.php
===================================================================
--- branches/2.8.x/wb/admin/modules/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/modules/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         modules
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -21,8 +20,11 @@
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Addons', 'modules');
 
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('modules.htt'));
+// Create new template object
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'modules.htt');
 $template->set_block('page', 'main_block', 'main');
 
Index: branches/2.8.x/wb/admin/addons/index.php
===================================================================
--- branches/2.8.x/wb/admin/addons/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/addons/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         addons
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -20,8 +19,10 @@
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Addons', 'addons');
 
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('addons.htt'));
+// Create new template object
+$template = new Template($ThemePath);
 $template->set_file('page', 'addons.htt');
 $template->set_block('page', 'main_block', 'main');
 
Index: branches/2.8.x/wb/admin/logout/index.php
===================================================================
--- branches/2.8.x/wb/admin/logout/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/logout/index.php	(revision 1529)
@@ -3,8 +3,7 @@
  *
  * @category        admin
  * @package         logout
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
Index: branches/2.8.x/wb/admin/admintools/index.php
===================================================================
--- branches/2.8.x/wb/admin/admintools/index.php	(revision 1528)
+++ branches/2.8.x/wb/admin/admintools/index.php	(revision 1529)
@@ -22,8 +22,11 @@
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('admintools.htt'));
 // Create new template object
-$template = new Template(THEME_PATH.'/templates');
+$template = new Template($ThemePath);
+// $template->debug = true;
 $template->set_file('page', 'admintools.htt');
 $template->set_block('page', 'main_block', 'main');
 
Index: branches/2.8.x/wb/account/login.php
===================================================================
--- branches/2.8.x/wb/account/login.php	(revision 1528)
+++ branches/2.8.x/wb/account/login.php	(revision 1529)
@@ -48,14 +48,28 @@
 define('PAGE_CONTENT', WB_PATH.'/account/login_form.php');
 
 require_once(WB_PATH.'/framework/class.login.php');
+require_once(WB_PATH.'/framework/class.frontend.php');
 
+// Create new frontend object
+$wb = new frontend();
+
 // Create new login app
 $requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
-$redirect = strip_tags(isset(${$requestMethod}['redirect']) ? ${$requestMethod}['redirect'] : '');
+$redirect  = strip_tags(isset(${$requestMethod}['redirect']) ? ${$requestMethod}['redirect'] : '');
+$redirect = ((isset($_SERVER['HTTP_REFERER']) && empty($redirect)) ?  $_SERVER['HTTP_REFERER'] : $redirect);
+$_SESSION['HTTP_REFERER'] = str_replace(WB_URL,'',$redirect);
+
+$loginUrl  = WB_URL.'/account/login.php';
+$loginUrl .= (!empty($redirect) ? '?redirect=' .$_SESSION['HTTP_REFERER'] : '');
+
+$ThemeUrl  = WB_URL.$wb->correct_theme_source('warning.html');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$wb->correct_theme_source('login.htt'));
+
 $thisApp = new Login(
 				array(
 						"MAX_ATTEMPS" => "3",
-						"WARNING_URL" => THEME_URL."/templates/warning.html",
+						"WARNING_URL" => $ThemeUrl."/warning.html",
 						"USERNAME_FIELDNAME" => 'username',
 						"PASSWORD_FIELDNAME" => 'password',
 						"REMEMBER_ME_OPTION" => SMART_LOGIN,
@@ -63,9 +77,9 @@
 						"MIN_PASSWORD_LEN" => "2",
 						"MAX_USERNAME_LEN" => "30",
 						"MAX_PASSWORD_LEN" => "30",
-						"LOGIN_URL" => WB_URL."/account/login.php?redirect=" .$redirect,
+						"LOGIN_URL" => $loginUrl,
 						"DEFAULT_URL" => WB_URL.PAGES_DIRECTORY."/index.php",
-						"TEMPLATE_DIR" => THEME_PATH."/templates",
+						"TEMPLATE_DIR" => $ThemePath,
 						"TEMPLATE_FILE" => "login.htt",
 						"FRONTEND" => true,
 						"FORGOTTEN_DETAILS_APP" => WB_URL."/account/forgot.php",
Index: branches/2.8.x/wb/account/logout.php
===================================================================
--- branches/2.8.x/wb/account/logout.php	(revision 1528)
+++ branches/2.8.x/wb/account/logout.php	(revision 1529)
@@ -31,9 +31,12 @@
 $_SESSION['PAGE_PERMISSIONS'] = null;
 $_SESSION['SYSTEM_PERMISSIONS'] = null;
 $_SESSION = array();
+
+session_start();
 session_unset();
 unset($_COOKIE[session_name()]);
 session_destroy();
+$_SESSION = array();
 
 if(INTRO_PAGE) {
 	header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
Index: branches/2.8.x/wb/framework/class.admin.php
===================================================================
--- branches/2.8.x/wb/framework/class.admin.php	(revision 1528)
+++ branches/2.8.x/wb/framework/class.admin.php	(revision 1529)
@@ -1,10 +1,9 @@
 <?php
 /**
  *
- * @category        frontend
- * @package         account
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @category        framewotk
+ * @package         backend admin
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -101,7 +100,9 @@
 		$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'website_title\'';
 		$get_title = $database->query($sql);
 		$title = $get_title->fetchRow();
-		$header_template = new Template(THEME_PATH.'/templates');
+		// Setup template object, parse vars to it, then parse it
+		$ThemePath = realpath(WB_PATH.$this->correct_theme_source('header.htt'));
+		$header_template = new Template($ThemePath);
 		$header_template->set_file('page', 'header.htt');
 		$header_template->set_block('page', 'header_block', 'header');
 		if(defined('DEFAULT_CHARSET')) {
@@ -192,7 +193,9 @@
 			}
 		}
 
-		$footer_template = new Template(THEME_PATH.'/templates');
+		// Setup template object, parse vars to it, then parse it
+		$ThemePath = realpath(WB_PATH.$this->correct_theme_source('footer.htt'));
+		$footer_template = new Template($ThemePath);
 		$footer_template->set_file('page', 'footer.htt');
 		$footer_template->set_block('page', 'footer_block', 'header');
 		$footer_template->set_var(array(
Index: branches/2.8.x/wb/framework/class.login.php
===================================================================
--- branches/2.8.x/wb/framework/class.login.php	(revision 1528)
+++ branches/2.8.x/wb/framework/class.login.php	(revision 1529)
@@ -1,10 +1,9 @@
 <?php
 /**
  *
- * @category        backend
- * @package         login
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @category        framework
+ * @package         backend login
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -65,7 +64,7 @@
 		$this->url = $this->get_post('url');
 		if ($this->redirect_url!='') {
 			$this->url = $this->redirect_url;
-		}		
+		}
 		if(strlen($this->url) < 2) {
 			$this->url = $config_array['DEFAULT_URL'];
 		}
@@ -340,7 +339,10 @@
 		// Show the login form
 		if($this->frontend != true) {
 			require_once(WB_PATH.'/include/phplib/template.inc');
-			$template = new Template($this->template_dir);
+			// $template = new Template($this->template_dir);
+			// Setup template object, parse vars to it, then parse it
+			$ThemePath = realpath(WB_PATH.$this->correct_theme_source($this->template_file));
+			$template = new Template($ThemePath);
 			$template->set_file('page', $this->template_file);
 			$template->set_block('page', 'mainBlock', 'main');
 			if($this->remember_me_option != true) {
@@ -381,8 +383,7 @@
 			}
 			
 			$template->set_var('CHARSET', $charset);	
-									
-									
+
 			$template->parse('main', 'mainBlock', false);
 			$template->pparse('output', 'page');
 		}
Index: branches/2.8.x/wb/framework/class.wb.php
===================================================================
--- branches/2.8.x/wb/framework/class.wb.php	(revision 1528)
+++ branches/2.8.x/wb/framework/class.wb.php	(revision 1529)
@@ -1,10 +1,9 @@
 <?php
 /**
  *
- * @category        frontend
- * @package         framework
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @category        framework
+ * @package         frontend 
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -337,20 +336,6 @@
 		return (($value & $bits2test) == $bits2test);
 	}
 
-/*
-	// Validate supplied email address
-	function validate_email($email) {
-		if(function_exists('idn_to_ascii')){ // use pear if available
-			$email = idn_to_ascii($email);
-		}else {
-			require_once(WB_PATH.'/include/idna_convert/idna_convert.class.php');
-			$IDN = new idna_convert();
-			$email = $IDN->encode($email);
-			unset($IDN);
-		}
-		return !(filter_var($email, FILTER_VALIDATE_EMAIL) == false);
-	}
-*/
 	// Print a success message which then automatically redirects the user to another page
 	function print_success( $message, $redirect = 'index.php' ) {
 	    global $TEXT;
@@ -360,7 +345,9 @@
 	    // fetch redirect timer for sucess messages from settings table
 	    $redirect_timer = ((defined( 'REDIRECT_TIMER' )) && (REDIRECT_TIMER <= 10000)) ? REDIRECT_TIMER : 0;
 	    // add template variables
-	    $tpl = new Template( THEME_PATH.'/templates' );
+		// Setup template object, parse vars to it, then parse it
+		$ThemePath = realpath(WB_PATH.$this->correct_theme_source('success.htt'));
+		$tpl = new Template($ThemePath);
 	    $tpl->set_file( 'page', 'success.htt' );
 	    $tpl->set_block( 'page', 'main_block', 'main' );
 	    $tpl->set_block( 'main_block', 'show_redirect_block', 'show_redirect' );
@@ -385,7 +372,9 @@
         if(is_array($message)) {
            $message = implode ('<br />',$message);
         }
-		$success_template = new Template(THEME_PATH.'/templates');
+		// Setup template object, parse vars to it, then parse it
+		$ThemePath = realpath(WB_PATH.$this->correct_theme_source('error.htt'));
+		$success_template = new Template($ThemePath);
 		$success_template->set_file('page', 'error.htt');
 		$success_template->set_block('page', 'main_block', 'main');
 		$success_template->set_var('MESSAGE', $message);
@@ -440,4 +429,55 @@
 		}
 	}
 
+	/**
+	 * checks if there is an alternative Theme template
+	 *
+	 * @access public
+	 * @param string : set the template.htt
+	 * @return string: the relative theme path
+	 *
+	 */
+	function correct_theme_source($sThemeFile = 'start.htt'){
+		$sThemePath = ADMIN_URL.'/themes/templates';
+		if ( file_exists( THEME_PATH.'/templates/'.$sThemeFile ) ){
+			$sThemePath = THEME_URL.'/templates';
+	}
+		return str_replace(WB_URL,'',$sThemePath);
+	}
+
+	/**
+	 * Check if a foldername doesn't have invalid characters
+	 *
+	 * @param String $str to check
+	 * @return Bool
+	 */
+	function checkFolderName($str){
+		return !( preg_match('#\^|\\\|\/|\.|\?|\*|"|\'|\<|\>|\:|\|#i', $str) ? TRUE : FALSE );
+	}
+
+	/**
+	 * Check the given path to make sure current path is within given basedir
+	 * normally document root
+	 *
+	 * @param String $sCurrentPath
+	 * @param String $sBaseDir
+	 * @return $sCurrentPath or FALSE
+	 */
+	function checkpath($sCurrentPath, $sBaseDir = WB_PATH){
+		// Clean the cuurent path
+        $sCurrentPath = rawurldecode($sCurrentPath);
+        $sCurrentPath = realpath($sCurrentPath);
+        $sBaseDir = realpath($sBaseDir);
+		// $sBaseDir needs to exist in the $sCurrentPath
+		$pos = stripos ($sCurrentPath, $sBaseDir );
+
+		if ( $pos === FALSE ){
+			return false;
+		} elseif( $pos == 0 ) {
+			return $sCurrentPath;
+		} else {
+			return false;
+		}
+	}
+
 }
Index: branches/2.8.x/wb/framework/class.order.php
===================================================================
--- branches/2.8.x/wb/framework/class.order.php	(revision 1528)
+++ branches/2.8.x/wb/framework/class.order.php	(revision 1529)
@@ -2,8 +2,8 @@
 /**
  * @category        WebsiteBaker
  * @package         WebsiteBaker_core
- * @author          Werner v.d.Decken
- * @copyright       WebsiteBaker.org e.V.
+ * @author          Ryan Djurovich, WebsiteBaker Project, Werner v.d.Decken
+ * @copyright       2009-2011, Website Baker Org. e.V.
  * @link            http://websitebaker2.org
  * @license         http://www.gnu.org/licenses/gpl.html
  * @version         $Id$
Index: branches/2.8.x/wb/framework/class.frontend.php
===================================================================
--- branches/2.8.x/wb/framework/class.frontend.php	(revision 1528)
+++ branches/2.8.x/wb/framework/class.frontend.php	(revision 1529)
@@ -1,10 +1,9 @@
 <?php
 /**
  *
- * @category        frontend
- * @package         framework
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
+ * @category        framework
+ * @package         frontend
+ * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
Index: branches/2.8.x/wb/framework/frontend.functions.php
===================================================================
--- branches/2.8.x/wb/framework/frontend.functions.php	(revision 1528)
+++ branches/2.8.x/wb/framework/frontend.functions.php	(revision 1529)
@@ -271,7 +271,7 @@
             // set to new value if page_id changed and not 0
             if(($page_id != 0) && ($_SESSION['PAGE_ID'] <> $page_id))
             {
-            $_SESSION['PAGE_ID'] = $page_id;
+	            $_SESSION['PAGE_ID'] = $page_id;
             }
 		// First get all sections for this page
 			$sql  = 'SELECT `section_id`, `module`, `publ_start`, `publ_end` ';
@@ -481,7 +481,6 @@
     return $jquery_links;
 }
 
-
 // Function to add optional module Javascript into the <body> section of the frontend
 if(!function_exists('register_frontend_modfiles_body'))
 {
Index: branches/2.8.x/wb/templates/wb_theme/images/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/wb_theme/images/image.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/image.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/newfolder.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/newfolder.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/resize_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/resize_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/tabl.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/tabl.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/calendar_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/calendar_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/files/csv.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/files/csv.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/tabr.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/tabr.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/unzip.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/unzip.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/file.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/file.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/Image3.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/Image3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/flags/none.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/flags/none.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/wb_theme/images/edit_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/edit_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/languages/NL.php
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/languages/NL.php	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/languages/NL.php	(revision 1529)
@@ -0,0 +1,32 @@
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+//Modul Description
+$template_description 	= 'Geavanceerde admin-template voor Website Baker 2.8.';
+
+//Texts
+$TEXT['ADMIN_ONLY'] = 'Instellingen alleen beschikbaar voor administrator';
+$TEXT['NO_SHOW_THUMBS'] = 'Thumbnails niet weergeven';
+$TEXT['TEXT_HEADER'] = 'Stel de maximale grootte voor \'resized\' afbeeldingen in per folder</b><br><small><i>(NB: werkt alleen bij nieuwe uploads)</i></small>';

Property changes on: branches/2.8.x/wb/templates/wb_theme/languages/NL.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision Id HeadURL
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/languages/NO.php
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/languages/NO.php	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/languages/NO.php	(revision 1529)
@@ -1,29 +1,32 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-//Modul Description
-$template_description 	= 'Standard design mal for Admin sidene i Website Baker 2.8.';
-
-?>
\ No newline at end of file
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+//Modul Description
+$template_description 	= 'Standard design mal for Admin sidene i Website Baker 2.8.';
+
+//Texts
+$TEXT['ADMIN_ONLY'] = 'Settings for administrator only';
+$TEXT['NO_SHOW_THUMBS'] = 'Hide thumbnails';
+$TEXT['TEXT_HEADER'] = 'Set maximum imagesize for a folder</b><br><small><i>(resizing on new uploads only)</i></small>';
Index: branches/2.8.x/wb/templates/wb_theme/languages/EN.php
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/languages/EN.php	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/languages/EN.php	(revision 1529)
@@ -26,4 +26,7 @@
 //Modul Description
 $template_description 	= 'Default backend theme for Website Baker 2.8.';
 
-?>
\ No newline at end of file
+//Texts
+$TEXT['ADMIN_ONLY'] = 'Settings for administrator only';
+$TEXT['NO_SHOW_THUMBS'] = 'Hide thumbnails';
+$TEXT['TEXT_HEADER'] = 'Set maximum imagesize for a folder</b><br><small><i>(resizing on new uploads only)</i></small>';
Index: branches/2.8.x/wb/templates/wb_theme/languages/FR.php
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/languages/FR.php	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/languages/FR.php	(revision 1529)
@@ -1,33 +1,32 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-//Modul Description
-$template_description 	= 'Default backend theme for Website Baker 2.8.';
-
-//Texts
-$TEXT['ADMIN_ONLY'] = 'Seul l&apos;administrateur peut modifier ces r&eacute;glages';
-$TEXT['NO_SHOW_THUMBS'] = 'Cacher les vignettes';
-$TEXT['TEXT_HEADER'] = 'D&eacute;finir la taille des images par dossier</b><br><small><i>(Redimensionnement seulement lors d&apos;un nouvel upload)</i></small>';
-?>
\ No newline at end of file
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+//Modul Description
+$template_description 	= 'Default backend theme for Website Baker 2.8.';
+
+//Texts
+$TEXT['ADMIN_ONLY'] = 'Seul l&apos;administrateur peut modifier ces r&eacute;glages';
+$TEXT['NO_SHOW_THUMBS'] = 'Cacher les vignettes';
+$TEXT['TEXT_HEADER'] = 'D&eacute;finir la taille des images par dossier</b><br><small><i>(Redimensionnement seulement lors d&apos;un nouvel upload)</i></small>';
Index: branches/2.8.x/wb/templates/wb_theme/languages/DE.php
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/languages/DE.php	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/languages/DE.php	(revision 1529)
@@ -26,4 +26,7 @@
 //Modul Description
 $template_description 	= 'Das Standard-Backend-Theme von Websitebaker 2.8';
 
-?>
\ No newline at end of file
+//Texts
+$TEXT['ADMIN_ONLY'] = 'diese Optionen nur Administratoren zug&auml;nglich machen';
+$TEXT['NO_SHOW_THUMBS'] = 'Vorschaubilder verstecken';
+$TEXT['TEXT_HEADER'] = 'Maximale Bildergr&ouml;&szlig;e f&uuml;r Ordner festlegen</b><br><small><i>(&Auml;nderung nur beim Hochladen)</i></small>';
Index: branches/2.8.x/wb/templates/wb_theme/browse.css
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/browse.css	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/browse.css	(revision 1529)
@@ -0,0 +1,6 @@
+body,td,th,input,textarea {font-family:Arial,Helvetica,sans-serif;font-size:12px;}
+body {background-color:#fff;margin:0;}
+hr {margin:0;color:#003366;height:1px;}
+.hide {display:none;}
+a:link, a:visited, a:active {color:#003366;text-decoration:none;}
+a:hover {text-decoration:none;color:#336699;}
\ No newline at end of file

Property changes on: branches/2.8.x/wb/templates/wb_theme/browse.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/css
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1529)
@@ -1,154 +1,133 @@
-* html div{ height :1em; /* Workaround gegen den 3-Pixel-Bug des Internet Explorers 6 *//* Workaround gegen den 3-Pixel-Bug des Internet Explorers 6 */ }
+* html div{ height :1em; /* Workaround gegen den 3-Pixel-Bug des Internet Explorers 6 */ }
 html{ font-family :Verdana, "Trebuchet MS", Arial, Helvetica, sans-serif; font-size :100.1%; font-weight :normal; color :#404040; overflow :-moz-scrollbars-vertical; }
 body{ margin :0 auto; padding :0px; background :#a8bccb; text-align :left; font-size :0.8em; }
 body { background-color :#a8bccb; background-repeat :repeat-x; }
-
-td,th,input,textarea {
-   color :#000000;
-   font-size :1.0em;
-   font-family :Verdana, Arial, Helvetica, sans-serif;
-}
+td,th,input,textarea { color :#000000; font-size :1.0em; font-family :Verdana, Arial, Helvetica, sans-serif; }
 textarea { font-size :1em; }
-img { border: 0px; }
-form { margin: 0; }
-hr { margin: 1em auto; color: #003366; height: 1px; }
-h1 { color: #000000; font-size: 1.8em; text-align: center; text-transform: uppercase; }
-h2 { margin: 0.5em 0px 0.5em 0px; color: #336699; font-size: 1.5em; }
+img { border :0px; }
+form { margin :0; }
+hr { margin :1em auto; color :#003366; height :1px; }
+h1 { color :#000000; font-size :1.8em; text-align :center; text-transform :uppercase; }
+h2 { margin :0.5em 0px 0.5em 0px; color :#336699; font-size :1.5em; }
 h2 { font-family :arial,sans-serif; letter-spacing :-1px; margin :0.5em 0; text-align :left; }
-h4 { margin: 0; border-bottom: 1px solid #DDD; padding-bottom: 5px; }
-a h3 { margin: 0; font-size :1.1em; padding-bottom: 2px; }
-li p { margin: 0.5em 0; }
-a:link, a:visited, a:active { color: #003366; text-decoration: none; }
-a:hover { color: #336699; text-decoration: none; }
-ul, li { margin: 0; padding: 0; list-style: none; }
-.current a, .current a:link, .current a:active, .current a:visited { background: #fff url(images/menuo.png); background-repeat: repeat-x; color: #fff; }
-label { cursor: pointer; }
-input:focus, input:active, select:focus, textarea:focus { background: #F1F8FD; }
-iframe { border: 1px solid #35373a; }
-div.box { width: 100%; margin: -10px 0 0 0; font-size: small; text-align: right; }
-.header { width: 900px; margin: 0 auto; }
-.container { width: 85%; margin: 0 auto; background: #fff url(images/bgtitle.png); background-repeat: repeat-x; }
-.content { padding: 1.6em; margin: 0 auto; min-height: 300px;  vertical-align: top; }
-
-#content_container {text-align:center;width:900px;clear:both;margin:0 auto;}
-
-.description { width: 240px; padding: 0px 0px 0px 3px; text-align: left; vertical-align: top; }
-.graphic { width: 50px; border: 4px solid #FDFDFD; padding-left: 3px; height: 50px; }
-.graphic img { padding: 3px 12px 3px 3px; margin-right: 12px; border-right: 3px solid silver; background-color: #FFFFFF; vertical-align: middle; }
-.menu { margin: 0; padding: 0; padding-top: 8px; padding-bottom: 10px; padding-left: 8px; background: #000 url(images/menu.png); background-repeat: repeat-x; }
-.menu li { padding-right: 1px; list-style-type: none; display: inline; }
-.menu a, .menu a:link, .menu a:active, .menu a:visited { border-bottom: 0; padding: 7px 11px 9px 11px; color: #fff; }
-.menu a:hover { color: #fff; background: #fff url(images/menuo.png); background-repeat: repeat-x; text-decoration: none; }
-.note { color: #666666; font-size: 10px; }
-div .pages_list {
-   width :100%;
-   font-size :0.7em;
-}
-.pages_list .icon_col td img { border-style: none; float: left; padding-right: 7px; display: block; }
-.pages_list table { width: 100%; margin: 0 auto; background-color: #DCDCDC; }
-.pages_list ul { margin: 0; padding: 0px; font-weight: normal; }
-.pages_list ul li { margin: 2px 0; padding: 0px; list-style-type: none; }
-.page_list_show li { display: block; }
-img.page_list_rights { border: none; margin-right: 5px; float: left; margin-top: 2px; margin-bottom: 2px; }
-.content input { font-size: 12px; }
-
-.section { margin-top :10px; padding :0px; 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: 90%; }
-.setting_value textarea { height: 50px; }
-.title { width: 90%; padding: 4px 0px 0px 3px; 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; }
-.tool_table li { padding: 1px; list-style-type: disc; }
+h4 { margin :0; border-bottom :1px solid #dddddd; padding-bottom :5px; }
+a h3 { margin :0; font-size :1.1em; padding-bottom :2px; }
+li p { margin :0.5em 0; }
+a:link, a:visited, a:active { color :#003366; text-decoration :none; }
+a:hover { color :#336699; text-decoration :none; }
+ul, li { margin :0; padding :0; list-style :none; }
+.current a, .current a:link, .current a:active, .current a:visited { background :url(images/menuo.png) #ffffff; background-repeat :repeat-x; color :#ffffff; }
+label { cursor :pointer; }
+input:focus, input:active, select:focus, textarea:focus { background :#f1f8fd; }
+iframe { border :1px solid #35373a; }
+div.box { width :100%; margin :-10px 0 0 0; font-size :small; text-align :right; }
+.header { width :900px; margin :0 auto; }
+.container { width :85%; margin :0 auto; background :url(images/bgtitle.png) #ffffff; background-repeat :repeat-x; }
+.content { padding :1.6em; margin :0 auto; min-height :300px; vertical-align :top; }
+#content_container { text-align :center; width :900px; clear :both; margin :0 auto; }
+#admintools li { display :inline; float :left; list-style-type :none; margin :0 10px 0 0; width :48%; }
+.description { padding :4px 4px 0 4px; text-align :left; vertical-align :top; }
+.graphic { border :4px solid #fdfdfd; height :50px; padding-left :3px; width :50px; }
+.graphic img { background-color :#ffffff; border :1px solid #d0d0d0; padding :4px; vertical-align :middle; }
+.menu { margin :0; padding :0; padding-top :8px; padding-bottom :10px; padding-left :8px; background :url(images/menu.png) #000000; background-repeat :repeat-x; }
+.menu li { padding-right :1px; list-style-type :none; display :inline; }
+.menu a, .menu a:link, .menu a:active, .menu a:visited { border-bottom :0; padding :7px 11px 9px 11px; color :#ffffff; }
+.menu a:hover { color :#ffffff; background :url(images/menuo.png) #ffffff; background-repeat :repeat-x; text-decoration :none; }
+.note { color :#666666; font-size :10px; }
+div .pages_list { width :100%; font-size :0.7em; }
+.pages_list .icon_col td img { border-style :none; float :left; padding-right :7px; display :block; }
+.pages_list table { width :100%; margin :0 auto; background-color :#dcdcdc; }
+.pages_list ul { margin :0; padding :0px; font-weight :normal; }
+.pages_list ul li { margin :2px 0; padding :0px; list-style-type :none; }
+.page_list_show li { display :block; }
+img.page_list_rights { border :none; margin-right :5px; float :left; margin-top :2px; margin-bottom :2px; }
+.content input { font-size :12px; }
+.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 :90%; }
+.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; }
+.tool_table li { padding :1px; list-style-type :disc; }
 /* CSS STYLES FOR THE PAGES SECTION */
-table.pages_view { width :100%; margin :0 auto; border :0; background-color :#ECF3F7; border-spacing :0px; }
-table.pages_view tr:hover { background-color: #F1F8DD; }
+table.pages_view { width :100%; margin :0 auto; border :0; background-color :#ecf3f7; border-spacing :0px; }
+table.pages_view tr:hover { background-color :#f1f8dd; }
 /* FORMS */
-.submit, .cancel { width: 100px; margin-top: 5px; }
-.form_submit .right { text-align: right; }
-.input_small { width: 20px; }
-.input_normal { width: 120px; }
-.input_medium { width: 150px; }
-.input_wide { width: 200px; }
-.input_large { width: 300px; }
-select option.disabled { color: #aaa; }
-.jsadmin_drag img { padding: 3px 0; margin-top: 1px; vertical-align: top; cursor: pointer; }
-.modify_link { padding-top: 4px; display: inline; vertical-align: middle; }
-.header_list_page_id { width: 30px; padding-right: 15px; text-align: right; }
-.header_list_actions { width: 150px; text-align: left; }
-.list_actions { width: 20px; text-align: left; }
-.sections_list { padding-left: 10px; font-weight: bold; }
-.header_list_block { width: 180px; text-align: left; }
-.header_list_sections_actions { width: 30px; text-align: left; }
-.value_page_code { width: 240px; color: #006400; font-weight: 400; }
+.submit, .cancel { width :100px; margin-top :5px; }
+.form_submit .right { text-align :right; }
+.input_small { width :20px; }
+.input_normal { width :120px; }
+.input_medium { width :150px; }
+.input_wide { width :200px; }
+.input_large { width :300px; }
+select option.disabled { color :#aaaaaa; }
+.jsadmin_drag img { padding :3px 0; margin-top :1px; vertical-align :top; cursor :pointer; }
+.modify_link { padding-top :4px; display :inline; vertical-align :middle; }
+.header_list_page_id { width :30px; padding-right :15px; text-align :right; }
+.header_list_actions { width :150px; text-align :left; }
+.list_actions { width :20px; text-align :left; }
+.sections_list { padding-left :10px; font-weight :bold; }
+.header_list_block { width :180px; text-align :left; }
+.header_list_sections_actions { width :30px; text-align :left; }
+.value_page_code { width :240px; color :#006400; font-weight :400; }
 /* Ende */
-.pages_list table td, table.pages_view td { padding: 3px; }
-.save, .reset, .input_narrow { width: 100px; }
-.settings_table td, .tool_table td { text-align: left; vertical-align: top; }
-#file_mode input, #dir_mode input { width: 12px; height: 12px; }
-#hide2, .hide, .page_list { display: none; }
-.header_list_page_title, .list_page_title { width: 300px; text-align: left; }
-.list_section_id, .list_page_id, .header_list_section_id { width: 2em; text-align: right; }
-.list_page_code, .list_page_language { width: 240px; }
-.form_submit .left, .header_list_menu_title, .list_menu_title, .header_list_type { text-align: left; }
-.header_title, .sections_list table, .setting_value input, .setting_value select, .setting_value textarea, .value_input input, .value_input text, .value_input select, .form_submit, .input_full { width: 100%; }
-.header_list_pubdate_start, .header_list_pubdate_end, .list_pubdate_start, .list_pubdate_end { width: 200px; text-align: left; }
-.right{ text-align: right; }
-.left{ text-align: left;  }
+.pages_list table td, table.pages_view td { padding :3px; }
+.save, .reset, .input_narrow { width :100px; }
+.settings_table td, .tool_table td { text-align :left; vertical-align :top; }
+#file_mode input, #dir_mode input { width :12px; height :12px; }
+#hide2, .hide, .page_list { display :none; }
+.header_list_page_title, .list_page_title { width :300px; text-align :left; }
+.list_section_id, .list_page_id, .header_list_section_id { width :2em; text-align :right; }
+.list_page_code, .list_page_language { width :240px; }
+.form_submit .left, .header_list_menu_title, .list_menu_title, .header_list_type { text-align :left; }
+.header_title, .sections_list table, .setting_value input, .setting_value select, .setting_value textarea, .value_input input, .value_input text, .value_input select, .form_submit, .input_full { width :100%; }
+.header_list_pubdate_start, .header_list_pubdate_end, .list_pubdate_start, .list_pubdate_end { width :200px; text-align :left; }
+.right{ text-align :right; }
+.left{ text-align :left; }
 /* set div layers in dead tables */
-.subcolumns {width:100%;overflow:hidden;margin:10px 0;}
-.subcolumns_oldgecko {width:100%;float:left;margin:10px 0;}
-
-.c10l, .c20l, .c25l, .c33l, .c40l, .c38l, .c50l, .c60l, .c62l, .c66l, .c75l, .c80l { float: left; }
-.c10r, .c20r, .c25r, .c33r, .c40r, .c38r, .c50r, .c60r, .c66r, .c62r, .c75r, .c80r { float: right; margin-left: -5px; }
-
-  .c10l, .c10r { width: 10%; }
-  .c20l, .c20r { width: 20%; line-height:2em;}
-  .c40l, .c40r { width: 40%; }
-  .c60l, .c60r { width: 60%; height: 21px; }
-  .c25l, .c25r { width: 28%; }
-  .c33l, .c33r { width: 33.333%; }
-  .c50l, .c50r { width: 50%; }
-  .c66l, .c66r { width: 66.666%; }
-  .c38l, .c38r { width: 38.2%; }
-  .c62l, .c62r { width: 61.8%; }
-  .subc { padding: 0 0.5em; }
-  .subcl { padding: 0 1em 0 0; }
-  .subcr { padding: 0 0 0 1em; }
-
-.c80l, .c80r, .c90l, .c90r { width: 80%; }
-.c75l, .c75r, .c80l, .c80r { width: 75%; }
-
-.info { padding: 10px; margin-bottom: 0.5em; background: #f8f8f8; color: #666; font-size: 91.7%; }
-.note { border: 2px #484 solid; padding: 10px;margin: 10px auto; background: #efe; color: #040; }
-.important { border: 2px #884 solid; padding: 10px;  margin-bottom: 1em; background: #ffe; color: #440; }
-.warning { border: 2px #844 solid; padding: 10px; margin-bottom: 1em; background: #fee; color: #400; }
-
-.row_0 { background-color: transparent; }
-.row_1 { background-color: #ccddee; }
-
+.subcolumns { width :100%; overflow :hidden; margin :10px 0; }
+.subcolumns_oldgecko { width :100%; float :left; margin :10px 0; }
+.c10l, .c20l, .c25l, .c33l, .c40l, .c38l, .c50l, .c60l, .c62l, .c66l, .c75l, .c80l { float :left; }
+.c10r, .c20r, .c25r, .c33r, .c40r, .c38r, .c50r, .c60r, .c66r, .c62r, .c75r, .c80r { float :right; margin-left :-5px; }
+  .c10l, .c10r { width :10%; }
+  .c20l, .c20r { width :20%; line-height :2em; }
+  .c40l, .c40r { width :40%; }
+  .c60l, .c60r { width :60%; height :21px; }
+  .c25l, .c25r { width :28%; }
+  .c33l, .c33r { width :33.333%; }
+  .c50l, .c50r { width :50%; }
+  .c66l, .c66r { width :66.666%; }
+  .c38l, .c38r { width :38.2%; }
+  .c62l, .c62r { width :61.8%; }
+  .subc { padding :0 0.5em; }
+  .subcl { padding :0 1em 0 0; }
+  .subcr { padding :0 0 0 1em; }
+.c80l, .c80r, .c90l, .c90r { width :80%; }
+.c75l, .c75r, .c80l, .c80r { width :75%; }
+.info { padding :10px; margin-bottom :0.5em; background :#f8f8f8; color :#666666; font-size :91.7%; }
+.note { border :2px #448844 solid; padding :10px; margin :10px auto; background :#eeffee; color :#004400; }
+.important { border :2px #888844 solid; padding :10px; margin-bottom :1em; background :#ffffee; color :#444400; }
+.warning { border :2px #884444 solid; padding :10px; margin-bottom :1em; background :#ffeeee; color :#440000; }
+.row_0 { background-color :transparent; }
+.row_1 { background-color :#ccddee; }
 div.content_box { margin :0em auto; }
-div.content_box form { width: 98%; }
-
+div.content_box form { width :98%; }
 #language,
 #timezone,
 #date_format,
-#time_format { min-width: 250px; }
-
+#time_format { min-width :250px; }
 #display_name,
 #username,
 #email,
 #new_password_1,
 #new_password_2,
-#current_password { min-width: 250px;  }
-
+#current_password { min-width :250px; }
 #submit,
-#reset { max-width: 100px; }
-
- div#username { height: 17px; width:118%; background-color: #e9e9e9; min-width:250px; border: 0px groove #6799c4; text-align: left; font-weight:bold; margin:0;} 
-.save_section { margin: 20px auto 5px auto; }
-
+#reset { max-width :100px; }
+ div#username { height :17px; width :118%; background-color :#e9e9e9; min-width :250px; border :0px groove #6799c4; text-align :left; font-weight :bold; margin :0; }
+.save_section { margin :20px auto 5px auto; }
 #language,
 #timezone,
 #date_format,
@@ -158,18 +137,14 @@
 #email,
 #new_password_1,
 #new_password_2,
-#current_password {width:118%;}
-
-.section-info { margin : 1.5em 0; }
-
+#current_password { width :118%; }
+.section-info { margin :1.5em 0; }
 .rounded { border-radius :10px; -khtml-border-radius :10px; -webkit-border-radius :10px; -moz-border-radius :10px; }
 .bigger { font-size :150%; }
 .strong { font-weight :bold; }
-
-.msg-box { background : #e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :center; }
-.error-box { background :#fee; border :0.2em #844 solid; color :#400; margin-bottom :1em; padding :0.63em; text-align :center; }
+.msg-box { background :#e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :center; }
+.error-box { background :#ffeeee; border :0.2em #884444 solid; color :#440000; margin-bottom :1em; padding :0.63em; text-align :center; }
 .msg-box p,
 .error-box p { font-size :120%; }
-
 select > option.user-inactive { color :#990000; }
-button.status { cursor :pointer; border-radius :5px; -khtml-border-radius :5px; -webkit-border-radius :5px; -moz-border-radius :5px; }
\ No newline at end of file
+button.status { cursor :pointer; border-radius :5px; -khtml-border-radius :5px; -webkit-border-radius :5px; -moz-border-radius :5px; }
Index: branches/2.8.x/wb/templates/wb_theme/templates/addons.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/addons.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/addons.htt	(nonexistent)
@@ -1,69 +0,0 @@
-<!-- BEGIN main_block -->
-<div class="box">
-	{URL_ADVANCED}
-</div>
-
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-<tr>
-	<td align="center" valign="top">
-		<!-- BEGIN modules_block -->
-		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_MODULES} >
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/modules/index.php"><img src="{THEME_URL}/icons/modules.png" alt="0" /></a></td>
-			<td class="title"><a href="{ADMIN_URL}/modules/index.php">{MODULES}</a></td>
-		</tr>
-		<tr>
-			<td class="description">{MODULES_OVERVIEW}</td>
-		</tr>
-		</table>
-		<!-- END modules_block -->		
-		<!-- BEGIN templates_block -->
-		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_TEMPLATES} >
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/templates/index.php"><img src="{THEME_URL}/icons/templates.png" alt="{TEMPLATES}" /></a></td>
-			<td class="title"><a href="{ADMIN_URL}/templates/index.php">{TEMPLATES}</a></td>
-		</tr>
-		<tr>
-			<td class="description">{TEMPLATES_OVERVIEW}</td>
-		</tr>
-		</table>
-		<!-- END templates_block -->
-		<!-- BEGIN languages_block -->
-		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_LANGUAGES} >
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/languages/index.php"><img src="{THEME_URL}/icons/languages.png" alt="{LANGUAGES}" /></a></td>
-			<td class="title"><a href="{ADMIN_URL}/languages/index.php">{LANGUAGES}</a></td>
-		</tr>
-		<tr>
-			<td class="description">{LANGUAGES_OVERVIEW}</td>
-		</tr>
-		</table>
-		<!-- END languages_block -->
-		<!-- BEGIN reload_block -->
-		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_RELOAD} >
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2"><img src="{THEME_URL}/icons/admintools.png" alt="{TXT_ADMIN_SETTINGS}" /></td>
-			<td class="title">{TXT_ADMIN_SETTINGS}</td>
-		</tr>
-		<tr>
-			<td class="description">
-				<form action="{RELOAD_URL}" method="post">
-				{FTAN}
-				{MESSAGE_RELOAD_ADDONS}<br style="margin-bottom: 0.5em" />
-				<input {DISPLAY_MODULES} type="checkbox" name="reload_modules" id="reload_modules" value="true" />
-				<label {DISPLAY_MODULES} for="reload_modules">{MODULES}</label>
-				<input {DISPLAY_TEMPLATES} type="checkbox" name="reload_templates" id="reload_templates" value="true" />
-				<label {DISPLAY_TEMPLATES} for="reload_templates">{TEMPLATES}</label>
-				<input {DISPLAY_LANGUAGES} type="checkbox" name="reload_languages" id="reload_languages" value="true" />
-				<label {DISPLAY_LANGUAGES} for="reload_languages">{LANGUAGES}</label>
-				<input type="submit" name="submit" value="{TEXT_RELOAD}" />
-				</form>
-			</td>
-		</tr>
-		</table>
-		<!-- END reload_block -->
-	</td>
-</tr>
-</table>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt	(nonexistent)
@@ -1,112 +0,0 @@
-<!-- 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>
-			<th align="right" width="40" class="headline">&nbsp;</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}&amp;id={TEMP_ID}');" title="{TEXT_DELETE}">
-					<img src="{THEME_URL}/images/delete_16.png" alt="" border="0" />
-				</a>
-			</td>
-   <td width="16" align="right" class="">
-	   <img src="{THEME_URL}/images/{IMAGE_EXIST}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" />
-   </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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/users.htt	(nonexistent)
@@ -1,34 +0,0 @@
-<!-- BEGIN main_block -->
-
-<form name="users" action="users.php" method="post">
-<input type="hidden" name="status" value="{USER_STATUS}" />
-{FTAN}
-
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
-	<td align="left">
-		<h2>{HEADING_MODIFY_DELETE_USER}</h2>
-	</td>
-	<td align="right">
-		<!-- BEGIN manage_groups_block -->
-		<a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a>
-		<!-- END manage_groups_block -->
-	</td>
-</tr>
-</table>
-<button type="button" name="status" title="{TEXT_USERS}" style="width: 40px; background: {STATUS_ICON} no-repeat center" value="{USER_STATUS}" onclick="javascript: window.location = 'index.php?status={USER_STATUS}';" class="status {DISPLAY_MODIFY}" >&nbsp;</button>
-<select name="user_id" style="width: 500px;">
-<!-- BEGIN list_block -->
-	<option value="{VALUE}" {STATUS}>{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 style="margin-top: 20px;" class="{DISPLAY_ADD}">{HEADING_ADD_USER}</h2>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/access.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/access.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/access.htt	(nonexistent)
@@ -1,48 +0,0 @@
-<!-- BEGIN main_block -->
-
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-<tr>
-	<td align="center" valign="top">
-		<!-- BEGIN users_block -->	
-		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_USERS} >
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/users/index.php">
-					<img src="{THEME_URL}/icons/users.png" alt="{USERS}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/users/index.php">{USERS}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{USERS_OVERVIEW}
-			</td>
-		</tr>
-		</table>
-		<!-- END users_block -->
-		<!-- BEGIN groups_block -->		
-		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
-		<tr>
-			<td class="graphic" align="center" valign="middle" rowspan="2">
-				<a href="{ADMIN_URL}/groups/index.php">
-					<img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" />
-				</a>
-			</td>
-			<td class="title">
-				<a href="{ADMIN_URL}/groups/index.php">{GROUPS}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="description">
-				{GROUPS_OVERVIEW}
-			</td>
-		</tr>
-		</table>
-		<!-- END groups_block -->
-	</td>
-</tr>
-</table>
-
-<!-- END main_block -->
\ No newline at end of file
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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/media_rename.htt	(nonexistent)
@@ -1,58 +0,0 @@
-<!-- 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>
-
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" align="center">
-<tr>
-	<td class="rename">
-<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" language="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/wb_theme/templates/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt	(nonexistent)
@@ -1,114 +0,0 @@
-<!-- BEGIN main_block -->
-<h2>{HEADING_MY_SETTINGS}</h2>
-<div class="content_box">
-	<form name="{FORM_NAME}" id="{FORM_NAME}" action="{ACTION_URL}" method="post">
-		{FTAN}
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_USERNAME}:</label><br />
-				</div>
-				<div class="c60l">
-					<div id="username">{USERNAME}</div><br />
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_DISPLAY_NAME}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="text" id="display_name" name="display_name" value="{DISPLAY_NAME}" /><br />
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_LANGUAGE}:</label><br />
-				</div>
-				<div class="c60l">
-				<select name="language" id="language">
-					<!-- BEGIN language_list_block -->
-						<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
-					<!-- END language_list_block -->
-					</select>
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_TIMEZONE}:</label><br />
-				</div>
-				<div class="c60l">
-					<select name="timezone" id="timezone">
-						<!-- BEGIN timezone_list_block -->
-							<option value="{VALUE}"{SELECTED}>{NAME}</option>
-						<!-- END timezone_list_block -->
-					</select>
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_DATE_FORMAT}:</label><br />
-				</div>
-				<div class="c60l">
-					<select name="date_format" id="date_format">
-						<!-- BEGIN date_format_list_block -->
-							<option value="{VALUE}"{SELECTED}>{NAME}</option>
-						<!-- END date_format_list_block -->
-					</select>
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_TIME_FORMAT}:</label><br />
-				</div>
-				<div class="c60l">
-					<select name="time_format" id="time_format">
-						<!-- BEGIN time_format_list_block -->
-							<option value="{VALUE}"{SELECTED}>{NAME}</option>
-						<!-- END time_format_list_block -->
-					</select>
-				</div>
-			</div>
-
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_EMAIL}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="text" id="email" name="email" value="{EMAIL}" /><br />
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_NEW_PASSWORD}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="password" id="new_password_1" name="new_password_1" value="{EMPTY_STRING}" /><br />
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_RETYPE_NEW_PASSWORD}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" /><br />
-				</div>
-			</div>
-			<hr />
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_NEED_CURRENT_PASSWORD}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="password" id="current_password" name="current_password" value="{EMPTY_STRING}" /><br />
-				</div>
-			</div>
-			<div class="subcolumns save_section">
-				<div class="c60l">
-					<input type="submit" id="submit" name="submit" value="{TEXT_SAVE}" />
-					<input type="reset" id="reset" name="reset" value="{TEXT_RESET}" />
-				</div>
-				<div class="c25l">&nbsp;</div>
-			</div>
-	</form>
-</div>
-
-<!-- END main_block -->
Index: branches/2.8.x/wb/templates/wb_theme/templates/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/languages.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/languages.htt	(nonexistent)
@@ -1,75 +0,0 @@
-<!-- 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}">
-{FTAN}
-<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}">
-{FTAN}
-<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}">
-{FTAN}
-<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/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/admintools.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/admintools.htt	(nonexistent)
@@ -1,30 +0,0 @@
-<!-- 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/media.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/media.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/media.htt	(nonexistent)
@@ -1,94 +0,0 @@
-<!-- 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/pages_modify.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/pages_modify.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/pages_modify.htt	(nonexistent)
@@ -1,24 +0,0 @@
-<!-- BEGIN main_block -->
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom: 10px;">
-<tr style="background-color: #F0F0F0;">
-	<td valign="middle" align="left">
-		<h2>{HEADING_MODIFY_PAGE}</h2>
-	</td>
-	<td align="right">
-		{TEXT_CURRENT_PAGE}:
-		<b>{PAGE_TITLE}</b>
-		-
-		<a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}&amp;{FTAN2}">{TEXT_CHANGE_SETTINGS}</a>
-<!-- BEGIN show_section_block -->
-		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
-		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;{FTAN2}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
-<!-- END show_section_block -->
-		<font style="color: #999999;" class="{CLASS_DISPLAY_MODIFIED}"><br />
-<!-- BEGIN show_modify_block -->
-		{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
-<!-- END show_modify_block -->
-		</font>
-	</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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/templates.htt	(nonexistent)
@@ -1,82 +0,0 @@
-<!-- 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/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/groups.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/groups.htt	(nonexistent)
@@ -1,35 +0,0 @@
-<!-- BEGIN main_block -->
-
-<form name="groups" action="groups.php" method="post">
-{FTAN}
-<table summary=""  cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
-	<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>
-
-<br />
-
-<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 -->
\ 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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/login_forgot.htt	(nonexistent)
@@ -1,77 +0,0 @@
-<!-- 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/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(nonexistent)
@@ -1,646 +0,0 @@
-<!-- BEGIN main_block -->
-
-<form name="settings" action="save.php" method="post">
-<input type="hidden" name="advanced" value="{ADVANCED}" />
-{FTAN}
-
-<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
-<tr>
-	<td colspan="3">
-		<h2>{HEADING_GENERAL_SETTINGS}</h2>
-	</td>
-</tr>
-<tr>
-	<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="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="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="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="2">
-		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
-	</td>
-</tr>
-<!-- BEGIN show_page_level_limit_block -->
-<tr{DISPLAY_ADVANCED}>
-	<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>
-		<!-- END page_level_limit_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- END show_page_level_limit_block -->
-<tr>
-	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
-	<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} />
-		<label for="page_trash_inline">{TEXT_INLINE}</label>
-		<div style="margin: 0; padding: 0;{DISPLAY_PAGE_TRASH_SEPARATE}">
-			<input type="radio" name="page_trash" id="page_trash_separate" style="width: 14px; height: 14px;" value="separate"{PAGE_TRASH_SEPARATE} />
-			<label for="page_trash_separate">{TEXT_SEPARATE}</label>
-		</div>
-	</td>
-</tr>
-<!-- BEGIN show_checkbox_1_block -->
-<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} />
-                <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} />
-                <label for="page_languages_false">{TEXT_DISABLED}</label>
-		</td>
-</tr>
-<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} />
-		<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} />
-		<label for="multiple_menus_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<!-- END show_checkbox_1_block -->
-<tr>
-	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
-	<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} />
-		<label for="home_folders_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<!-- BEGIN show_checkbox_2_block -->
-<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} />
-		<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} />
-		<label for="manage_sections_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<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} />
-		<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} />
-		<label for="section_blocks_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<!-- END show_checkbox_2_block -->
-<tr>
-	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
-	<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} />
-		<label for="intro_page_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<!-- BEGIN show_checkbox_3_block -->
-<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} />
-		<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} />
-		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<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} />
-		<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} />
-		<label for="smart_login_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<!-- END show_checkbox_3_block -->
-<tr>
-	<td class="setting_name">{TEXT_LOGIN}:</td>
-	<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} />
-		<label for="frontend_login_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<!-- BEGIN show_redirect_timer_block -->
-<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}" style="width:50%;" />
-		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
-	</td>
-</tr>
-<!-- END show_redirect_timer_block -->
-<tr>
-	<td class="setting_name">{TEXT_SIGNUP}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="frontend_signup">
-			<option value="false">{TEXT_DISABLED}</option>
-			<!-- BEGIN group_list_block -->
-				<option value="{ID}" {SELECTED}>{NAME}</option>
-			<!-- END group_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- BEGIN show_php_error_level_block -->
-<tr{DISPLAY_ADVANCED}>
-	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="er_level">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN error_reporting_list_block -->
-				<option value="{VALUE}"{SELECTED}>{NAME}</option>
-			<!-- END error_reporting_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- END show_php_error_level_block -->
-<!-- BEGIN show_wysiwyg_block -->
-<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}>
-	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="wysiwyg_editor">
-		<!-- BEGIN editor_list_block -->
-			<option value="{FILE}"{SELECTED}>{NAME}</option>
-		<!-- END editor_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- END show_wysiwyg_block -->
-<tr>
-	<td>&nbsp;</td>
-	<td align="left" nowrap="nowrap">
-		<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;">
-		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-	</td>
-</tr>
-<tr>
-	<td colspan="3" style="padding-top: 10px;">
-		<h2>{HEADING_DEFAULT_SETTINGS}</h2>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_LANGUAGE}:</td>
-	<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>
-			<!-- END language_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- BEGIN show_charset_block -->
-<tr{DISPLAY_ADVANCED}>
-	<td class="setting_name">{TEXT_CHARSET}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="default_charset">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN charset_list_block -->
-				<option value="{VALUE}" {SELECTED}>{NAME}</option>
-			<!-- END charset_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- END show_charset_block -->
-<tr>
-	<td class="setting_name">{TEXT_TIMEZONE}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="default_timezone">
-			<option value="0">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN timezone_list_block -->
-				<option value="{VALUE}" {SELECTED}>{NAME}</option>
-			<!-- END timezone_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
-	<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 -->
-				<option value="{VALUE}" {SELECTED}>{NAME}</option>
-			<!-- END date_format_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
-	<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 -->
-				<option value="{VALUE}" {SELECTED}>{NAME}</option>
-			<!-- END time_format_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_TEMPLATE}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="default_template">
-		<!-- BEGIN template_list_block -->
-			<option value="{FILE}"{SELECTED}>{NAME}</option>
-		<!-- END template_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_THEME}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="default_theme">
-		<!-- BEGIN theme_list_block -->
-			<option value="{FILE}"{SELECTED}>{NAME}</option>
-		<!-- END theme_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<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;">
-		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-	</td>
-</tr>
-<tr>
-	<td colspan="3" style="padding-top: 10px;">
-		<h2>{HEADING_SEARCH_SETTINGS}</h2>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_VISIBILITY}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="search">
-			<option value="public">{TEXT_PUBLIC}</option>
-			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
-			<option value="registered" {REGISTERED_SEARCH}>{TEXT_REGISTERED}</option>
-			<option value="none" {NONE_SEARCH}>{TEXT_NONE}</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_TEMPLATE}:</td>
-	<td class="setting_value" colspan="2">
-		<select name="search_template">
-		<!-- BEGIN search_template_list_block -->
-			<option value="{FILE}"{SELECTED}>{NAME}</option>
-		<!-- END search_template_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- BEGIN show_search_block -->
-<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}" />
-	</td>
-</tr>
-<!-- END show_search_block -->
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<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;">
-		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-	</td>
-</tr>
-<tr>
-	<td colspan="3" style="padding-top: 10px;">
-		<h2>{HEADING_SERVER_SETTINGS}</h2>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
-	<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} />
-		<label for="operating_system_windows" onclick="javascript: change_os('windows');">{TEXT_WINDOWS}</label>
-	</td>
-</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">
-		<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">
-				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
-			</label>
-			<span class="warning">({WORLD_WRITEABLE_WARNING})</span>
-		</div>
-		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
-	</td>
-</tr>
-<!-- BEGIN show_access_block -->
-<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="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}:
-			</td>
-		</tr>
-		<tr>
-			<td>{TEXT_USER}:</td>
-			<td>{TEXT_GROUP}:</td>
-			<td>{TEXT_OTHERS}:</td>
-		</tr>
-		<tr>
-			<td width="100" nowrap="nowrap">
-				<input type="checkbox" name="file_u_r" id="file_u_r" value="true"{FILE_U_R_CHECKED} />
-				<label for="file_u_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="file_u_w" id="file_u_w" value="true"{FILE_U_W_CHECKED} />
-				<label for="file_u_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="file_u_e" id="file_u_e" value="true"{FILE_U_E_CHECKED} />
-				<label for="file_u_e">{TEXT_EXECUTE}</label>
-			</td>
-			<td width="100" nowrap="nowrap">
-				<input type="checkbox" name="file_g_r" id="file_g_r" value="true"{FILE_G_R_CHECKED} />
-				<label for="file_g_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="file_g_w" id="file_g_w" value="true"{FILE_G_W_CHECKED} />
-				<label for="file_g_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="file_g_e" id="file_g_e" value="true"{FILE_G_E_CHECKED} />
-				<label for="file_g_e">{TEXT_EXECUTE}</label>
-			</td>
-			<td width="100" nowrap="nowrap">
-				<input type="checkbox" name="file_o_r" id="file_o_r" value="true"{FILE_O_R_CHECKED} />
-				<label for="file_o_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="file_o_w" id="file_o_w" value="true"{FILE_O_W_CHECKED} />
-				<label for="file_o_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="file_o_e" id="file_o_e" value="true"{FILE_O_E_CHECKED} />
-				<label for="file_o_e">{TEXT_EXECUTE}</label>
-			</td>
-		</tr>
-		</table>
-	</td>
-	<td class="setting_value" id="dir_mode" style="text-align: right;">
-		<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}:
-			</td>
-		</tr>
-		<tr>
-			<td>{TEXT_USER}:</td>
-			<td>{TEXT_GROUP}:</td>
-			<td>{TEXT_OTHERS}:</td>
-		</tr>
-		<tr>
-			<td width="100" nowrap="nowrap">
-				<input type="checkbox" name="dir_u_r" id="dir_u_r" value="true"{DIR_U_R_CHECKED} />
-				<label for="dir_u_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="dir_u_w" id="dir_u_w" value="true"{DIR_U_W_CHECKED} />
-				<label for="dir_u_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="dir_u_e" id="dir_u_e" value="true"{DIR_U_E_CHECKED} />
-				<label for="dir_u_e">{TEXT_EXECUTE}</label>
-			</td>
-			<td width="100" nowrap="nowrap">
-				<input type="checkbox" name="dir_g_r" id="dir_g_r" value="true"{DIR_G_R_CHECKED} />
-				<label for="dir_g_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="dir_g_w" id="dir_g_w" value="true"{DIR_G_W_CHECKED} />
-				<label for="dir_g_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="dir_g_e" id="dir_g_e" value="true"{DIR_G_E_CHECKED} />
-				<label for="dir_g_e">{TEXT_EXECUTE}</label>
-			</td>
-			<td width="100" nowrap="nowrap">
-				<input type="checkbox" name="dir_o_r" id="dir_o_r" value="true"{DIR_O_R_CHECKED} />
-				<label for="dir_o_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="dir_o_w" id="dir_o_w" value="true"{DIR_O_W_CHECKED} />
-				<label for="dir_o_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="dir_o_e" id="dir_o_e" value="true"{DIR_O_E_CHECKED} />
-				<label for="dir_o_e">{TEXT_EXECUTE}</label>
-			</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
-	<td class="setting_value" colspan="2">
-		<input type="text" name="sec_anchor" value="{SEC_ANCHOR}" />
-	</td>
-</tr>
-<!-- END show_access_block -->
-<!-- BASIC MAILER SETTINGS -->
-<tr>
-	<td colspan="3" style="padding-top: 10px;">
-		<h2>{HEADING_WBMAILER_SETTINGS}</h2>
-		<p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}</p>
-	</td>
-</tr>
-<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}" />
-	</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}" />
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
-	<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} />
-		<label for="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');">{TEXT_WBMAILER_SMTP}</label>
-	</td>
-</tr>
-<!-- MORE ADVANCED SMTP MAILER SETTINGS -->
-<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"{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"{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} />
-		<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"{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"{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}" />
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<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;">
-		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-	</td>
-</tr>
-</table>
-
-</form>
-
-<hr size="1" />
-
-<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-<br />
-<font class="{DISPLAY_ADVANCED_BUTTON}">
-{MODE_SWITCH_WARNING}
-</font>
-<script src="{ADMIN_URL}/settings/setting.js" language="javascript" type="text/javascript"></script>
-<!-- END main_block -->
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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt	(nonexistent)
@@ -1,295 +0,0 @@
-<!-- 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="save" 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_LINK}" method="post">
-		<input type="hidden" name="advanced" value="{ADVANCED}" />
-        <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/success.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/success.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/success.htt	(nonexistent)
@@ -1,11 +0,0 @@
-<!-- BEGIN main_block -->
-<div class="msg-box rounded">
-	<p>{MESSAGE}</p>
-<!-- BEGIN show_redirect_block -->
- <script type="text/javascript">
-  setTimeout("location.href='{REDIRECT}'", {REDIRECT_TIMER});
- </script>
-<!-- END show_redirect_block -->
-<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{REDIRECT}';" />
-</div>
-<!-- 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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/languages_details.htt	(nonexistent)
@@ -1,32 +0,0 @@
-<!-- BEGIN main_block -->
-
-<h2>{HEADING_LANGUAGE_DETAILS}</h2>
-
-<table summary="" cellpadding="5" cellspacing="0" border="0">
-<tr>
-	<td width="100">{TEXT_NAME}:</td>
-	<td>{NAME}</td>
-</tr>
-<tr>
-	<td>{TEXT_CODE}:</td>
-	<td>{CODE}</td>
-</tr>
-<tr>
-	<td>{TEXT_AUTHOR}:</td>
-	<td>{AUTHOR}</td>
-</tr>
-<tr>
-	<td>{TEXT_VERSION}:</td>
-	<td>{VERSION}</td>
-</tr>
-<tr>
-	<td>{TEXT_DESIGNED_FOR}:</td>
-	<td>Website Baker {DESIGNED_FOR}</td>
-</tr>
-</table>
-
-<br />
-
-<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
-
-<!-- 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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/pages_sections.htt	(nonexistent)
@@ -1,121 +0,0 @@
-<!-- BEGIN main_block -->
-        <div class="jsadmin jcalendar hide"></div>
-        <table summary="" cellpadding="0" cellspacing="0" class="sections_header">
-            <tr>
-                <td valign="middle" align="left">
-                    <h2>{HEADING_MANAGE_SECTIONS}</h2>
-                </td>
-                <td>ID: {PAGE_ID}</td>
-                <td align="right">{TEXT_CURRENT_PAGE}: <b>{PAGE_TITLE}</b>
-                    -
-                    <a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{HEADING_MODIFY_PAGE}</a>
-                    -
-                    <a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}">{TEXT_CHANGE_SETTINGS}</a>
-                </td>
-            </tr>
-        </table>
-
-        <form name="section_properties" action="{ADMIN_URL}/pages/sections_save.php?page_id={PAGE_IDKEY}" method="post">
-		{FTAN}
-		
-        <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>
-                	<td class="header_list_pubdate_start">{TEXT_PUBL_START_DATE}:</td>
-                	<td class="header_list_pubdate_end">{TEXT_PUBL_END_DATE}:</td>
-                	<td class="header_list_sections_actions"  colspan="3">{TEXT_ACTIONS}:</td>
-                    <td class="header_list_section_id">{TEXT_SID}</td>
-                    <td valign="middle" align="left"{DISPLAY_DEBUG}>{TEXT_PID}</td>
-                </tr>
-<!-- BEGIN section_block -->
-            	<tr onmouseover="this.style.backgroundColor = '#F1F8DD'" onmouseout="this.style.backgroundColor = '#FFF'">
-    				<td style="display: none;">
-                      <input type="hidden" name="page_id" value="{PAGE_IDKEY}"  />
-                      <input type="hidden" name="section_id" value="{VAR_SECTION_ID}"  />
-                      {VAR_SECTION_ID}
-                    </td>
-
-                    <td valign="middle" width="{NAME_SIZE}">{LINK_MODIFY_URL_VAR_MODUL_NAME}</td>
-
-                    <td valign="middle" class="{INPUT_ATTRIBUTE}"{STYLE_DISPLAY_SECTION_BLOCK}>
-                    	<select name="block{VAR_SECTION_ID}" class="input_narrow">
-                        {SET_NONE_DISPLAY_OPTION}
-                    	<!-- BEGIN block_block -->
-                    		<option value="{VALUE}"{SELECTED}>{NAME}</option>
-                    	<!-- END block_block -->
-                    	</select>
-                    </td>
-
-                    <td valign="middle" nowrap="nowrap" width="120"><input type="text" id="start_date{VAR_SECTION_ID}" name="start_date{VAR_SECTION_ID}" value="{VALUE_PUBL_START}" class="input_normal" />
-                        <img src="{THEME_URL}/images/{CLOCK_16_PNG}" id="trigger_start{VAR_SECTION_ID}" style="cursor: pointer;" title="{TEXT_CALENDAR}" alt="start"  />
-                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor: pointer;" alt="del" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.start_date{VAR_SECTION_ID}.value=''" />
-                    </td>
-
-                    <td valign="middle" nowrap="nowrap" width="120"><input type="text" id="end_date{VAR_SECTION_ID}" name="end_date{VAR_SECTION_ID}" value="{VALUE_PUBL_END}" class="input_narrow" />
-                        <img src="{THEME_URL}/images/{CLOCK_16_PNG}" id="trigger_stop{VAR_SECTION_ID}" alt="end" style="cursor: pointer;" title="{TEXT_CALENDAR}"  />
-                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor: pointer;" alt="del" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.end_date{VAR_SECTION_ID}.value=''" />
-                    </td>
-
-                    <td valign="middle" width="20">
-                        {VAR_MOVE_UP_URL}
-                    </td>
-
-                    <td valign="middle"  width="20">
-                        {VAR_MOVE_DOWN_URL}
-                    </td>
-
-                    <td valign="middle" width="20">
-                        <a href="#" onclick="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_IDKEY}');">
-                        <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="X" />
-                        </a>
-                    </td>
-                    <td valign="middle" align="right">
-                       {VAR_SECTION_ID}
-                    </td>
-                    <td valign="middle" align="right"{DISPLAY_DEBUG}>
-                       {POSITION}
-                    </td>
-                </tr>
-<!-- END section_block -->
-                <tr>
-                    <td valign="middle" align="right" colspan="{DEBUG_COLSPAN_SIZE}"><input type="submit" name="save" value="{TEXT_SAVE}" class="input_medium" /></td>
-    	        </tr>
-	    </table>
-    </form>
-
-	<h2>{TEXT_ADD_SECTION}</h2>
-	<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 summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%">
-    	<tr>
-    		<td width="100%">
-    			<select name="module" class="input_full">
-                <!-- BEGIN module_block -->
-    			 <option value="{VALUE}"{SELECTED}>{NAME}</option>
-                 <!-- END module_block -->
-    			</select>
-    		</td>
-			<td >
-    			<input type="submit" name="submit" value="{TEXT_ADD}" class="input_medium" />
-    		</td>
-    	</tr>
-    	</table>
-	</form>
-    <!-- BEGIN calendar_block -->
-    <script type="text/javascript" >
-         var section_id = '{VAR_SECTION_ID}';
-         var start_date = '{start_date}';
-         var end_date = '{end_date}';
-         var trigger_start = '{trigger_start}';
-         var trigger_end = '{trigger_end}';
-         var jscal_today = '{jscal_today}';
-         var jscal_ifformat = '{jscal_ifformat}';
-         var jscal_firstday = {jscal_firstday};
-         var showsTime = {showsTime};
-         var timeFormat = {timeFormat};
-    </script>
-    <script type="text/javascript" src="{ADMIN_URL}/pages/page_calendar.js" ></script>
-    <!-- END calendar_block -->
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/modules.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/modules.htt	(nonexistent)
@@ -1,124 +0,0 @@
-<!-- BEGIN main_block -->
-
-<div class="box">
-	{URL_TEMPLATES}&nbsp;&nbsp;{URL_LANGUAGES}&nbsp;&nbsp;{URL_ADVANCED}
-</div>
-
-<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
-{FTAN}
-<h2>{HEADING_INSTALL_MODULE}</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><br />
-        <input type="checkbox" name="overwrite" value="false"  />
-		<span>{OVERWRITE_NEWER_FILES}</span>
-	</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_MODULE}</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 module_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-		<!-- END module_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_MODULE_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 module_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-		<!-- END module_list_block -->
-		</select>
-	</td>
-	<td width="110">
-		<input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
-	</td>
-</tr>
-</table>
-
-<br />
-</form>
-
-<div class="{DISPLAY_MANUAL_INSTALL}">
-<h2>{HEADING_INVOKE_MODULE_FILES}</h2>
-<p>{TEXT_MANUAL_INSTALLATION}</p>
-
-<form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
-{FTAN}
-	<strong>{TEXT_FILE}:</strong> "install.php"&nbsp;&nbsp;&nbsp;
-	<input type="hidden" name="action" value="install" />
-	<select name="file" style="width: 250px;">
-	<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN install_list_block -->
-		<option value="{VALUE}">{NAME}</option>
-		<!-- END install_list_block -->
-	</select>
-	<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width: 100px; margin-left: 1em;" />
-</form>
-
-<form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
-{FTAN}
-	<br />{TEXT_FILE}: "upgrade.php"
-	<input type="hidden" name="action" value="upgrade" />
-	<select name="file" style="width: 250px;">
-	<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN upgrade_list_block -->
-		<option value="{VALUE}">{NAME}</option>
-		<!-- END upgrade_list_block -->
-	</select>
-	<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width: 100px; margin-left: 1em;" />
-</form>
-
-<form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
-{FTAN}
-	<br />{TEXT_FILE}: "uninstall.php"
-	<input type="hidden" name="action" value="uninstall" />
-	<select name="file" style="width: 250px;">
-	<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN uninstall_list_block -->
-		<option value="{VALUE}">{NAME}</option>
-		<!-- END uninstall_list_block -->
-	</select>
-	<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width: 100px; margin-left: 1em;" />
-</form>
-
-<p style="color: red;">{TEXT_MANUAL_INSTALLATION_WARNING}</p>
-</div>
-
-<!-- END main_block -->
\ No newline at end of file
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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/modules_details.htt	(nonexistent)
@@ -1,36 +0,0 @@
-<!-- BEGIN main_block -->
-
-<h2>{HEADING_MODULE_DETAILS}</h2>
-
-<table summary="" cellpadding="5" cellspacing="0" border="0">
-<tr>
-	<td width="100">{TEXT_NAME}:</td>
-	<td>{NAME}</td>
-</tr>
-<tr>
-	<td>{TEXT_TYPE}:</td>
-	<td>{TYPE}</td>
-</tr>
-<tr>
-	<td>{TEXT_AUTHOR}:</td>
-	<td>{AUTHOR}</td>
-</tr>
-<tr>
-	<td>{TEXT_VERSION}:</td>
-	<td>{VERSION}</td>
-</tr>
-<tr>
-	<td>{TEXT_DESIGNED_FOR}:</td>
-	<td>Website Baker {DESIGNED_FOR}</td>
-</tr>
-<tr>
-	<td valign="top">{TEXT_DESCRIPTION}:</td>
-	<td style="text-align: justify;">{DESCRIPTION}</td>
-</tr>
-</table>
-
-<br />
-
-<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/login.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/login.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/login.htt	(nonexistent)
@@ -1,93 +0,0 @@
-<!-- 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/error.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/error.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/error.htt	(nonexistent)
@@ -1,6 +0,0 @@
-<!-- BEGIN main_block -->
-<div class="error-box rounded">
-	<p>{MESSAGE}</p>
-	<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{LINK}';" />
-</div>
-<!-- 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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/templates_details.htt	(nonexistent)
@@ -1,32 +0,0 @@
-<!-- BEGIN main_block -->
-
-<h2>{HEADING_TEMPLATE_DETAILS}</h2>
-
-<table summary="" cellpadding="5" cellspacing="0" border="0">
-<tr>
-	<td width="100">{TEXT_NAME}:</td>
-	<td>{NAME}</td>
-</tr>
-<tr>
-	<td>{TEXT_AUTHOR}:</td>
-	<td>{AUTHOR}</td>
-</tr>
-<tr>
-	<td>{TEXT_VERSION}:</td>
-	<td>{VERSION}</td>
-</tr>
-<tr>
-	<td>{TEXT_DESIGNED_FOR}:</td>
-	<td>Website Baker {DESIGNED_FOR}</td>
-</tr>
-<tr>
-	<td valign="top">{TEXT_DESCRIPTION}:</td>
-	<td style="text-align: justify;">{DESCRIPTION}</td>
-</tr>
-</table>
-
-<br />
-
-<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt	(nonexistent)
@@ -1,181 +0,0 @@
-<!-- BEGIN main_block -->
-
-<script src="{ADMIN_URL}/pages/page_settings.js" type="text/javascript"></script>
-
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom: 10px;">
-<tr style="background-color: #F0F0F0;">
-	<td valign="middle" align="left">
-		<h2>{HEADING_MODIFY_PAGE_SETTINGS}</h2>
-	</td>
-	<td nowrap="nowrap">ID: {PAGE_ID}</td>
-	<td align="right">
-		{TEXT_CURRENT_PAGE}:
-		<b>{PAGE_TITLE}</b>
-		-
-		<a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{TEXT_MODIFY_PAGE}</a>
-		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
-		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
-		<br />
-		<font style="color: #999999;" class="{DISPLAY_MODIFIED}">
-			{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
-		</font>
-	</td>
-</tr>
-</table>
-
-<form name="settings" action="settings2.php" method="post">
-
-<input type="hidden" name="page_id" value="{PAGE_ID}" />
-{FTAN}
-<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
-<tr>
-	<td width="100" height="20">{TEXT_PAGE_TITLE}:</td>
-	<td width="240" height="20">
-		<input type="text" name="page_title" value="{PAGE_TITLE}" style="width: 232px;" />
-	</td>
-	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
-		{TEXT_ADMINISTRATORS}:
-		<ul style="list-style-type: none; margin: 0; padding: 0;">
-			<!-- BEGIN group_list_block -->
-			<li>
-			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-			<label for="admin_group_{TOGGLE}">{NAME}</label>
-			</li>
-			<!-- END group_list_block -->
-		</ul>
-	</td>
-	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
-		<div id="allowed_viewers" style="{DISPLAY_VIEWERS}">
-			{TEXT_ALLOWED_VIEWERS}:
-			<ul style="list-style-type: none; margin: 0; padding: 0;">
-				<!-- BEGIN group_list_block2 -->
-				<li>
-				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<label for="viewing_group_{TOGGLE}">{NAME}</label>
-				</li>
-				<!-- END group_list_block2 -->
-			</ul>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td width="100" height="20">{TEXT_MENU_TITLE}:</td>
-	<td width="240" height="20">
-		<input type="text" name="menu_title" value="{MENU_TITLE}" style="width: 232px;" />
-	</td>
-</tr>
-<tr>
-	<td width="100">{TEXT_PARENT}:</td>
-	<td width="240">
-		<select name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
-			<!-- BEGIN page_list_block2 -->
-			<option value="{ID}"{SELECTED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
-			<!-- END page_list_block2 -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="100">{TEXT_VISIBILITY}:</td>
-	<td width="240">
-		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
-			<option value="public"{PUBLIC_SELECTED}>{TEXT_PUBLIC}</option>
-			<option value="private"{PRIVATE_SELECTED}>{TEXT_PRIVATE}</option>
-			<option value="registered"{REGISTERED_SELECTED}>{TEXT_REGISTERED}</option>
-			<option value="hidden"{HIDDEN_SELECTED}>{TEXT_HIDDEN}</option>
-			<option value="none"{NO_VIS_SELECTED}>{TEXT_NONE}</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="100" valign="top">{TEXT_DESCRIPTION}:</td>
-	<td>
-		<textarea name="description" rows="10" cols="1" style="width: 236px; height: 50px;">{DESCRIPTION}</textarea>
-	</td>
-</tr>
-<tr>
-	<td width="100" valign="top">{TEXT_KEYWORDS}:</td>
-	<td>
-		<textarea name="keywords" rows="10" cols="1" style="width: 236px; height: 50px;">{KEYWORDS}</textarea>
-	</td>
-</tr>
-<tr>
-	<td>
-		{TEXT_TARGET}:
-	</td>
-	<td>
-		<select name="target" style="width: 240px;" ><!--  value="{TARGET}" -->
-			<option value="_blank"{BLANK_SELECTED}>{TEXT_NEW_WINDOW}</option>
-			<option value="_self"{SELF_SELECTED}>{TEXT_SAME_WINDOW}</option>
-			<option value="_top"{TOP_SELECTED}>{TEXT_TOP_FRAME}</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="100">{TEXT_TEMPLATE}:</td>
-	<td width="240">
-		<select name="template" style="width: 240px;">
-			<option value="">{TEXT_SYSTEM_DEFAULT}</option>
-			<option value="">----------------------</option>
-			<!-- BEGIN template_list_block -->
-			<option value="{VALUE}"{SELECTED}>{NAME}</option>
-			<!-- END template_list_block -->
-		</select>
-	</td>
-</tr>
-<tr style="{DISPLAY_MENU_LIST}">
-	<td width="100">{TEXT_MENU}:</td>
-	<td width="240">
-		<select name="menu" style="width: 240px;">
-			<!-- BEGIN menu_list_block -->
-			<option value="{VALUE}"{SELECTED}>{NAME}</option>
-			<!-- END menu_list_block -->
-		</select>
-	</td>
-</tr>
-<tr style="{DISPLAY_LANGUAGE_LIST}">
-	<td width="100">{TEXT_LANGUAGE}:</td>
-	<td class="list_language">
-		<select name="language" style="width: 240px;">
-			<!-- BEGIN language_list_block -->
-			<option value="{VALUE}"{SELECTED} style="background: {FLAG_LANG_ICONS} no-repeat center left; padding-left: 20px;">{NAME}</option>
-			<!-- END language_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- insert page_code 20090904-->
-<tr{DISPLAY_CODE_PAGE_LIST}>
-	<td width="100">{TEXT_PAGE_CODE}:</td>
-	<td class="list_page_code">
-		<select name="page_code" class="value_page_code">
-			<!-- BEGIN page_code_list_block -->
-			<option value="{VALUE}"{SELECTED} style="background: {FLAG_CODE_ICON} no-repeat center left; padding-left: 20px;">&nbsp;{PAGE_VALUE}</option>
-			<!-- END page_code_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- page code -->
-<tr>
-	<td width="100">{TEXT_SEARCHING}:</td>
-	<td width="240">
-		<select name="searching" style="width: 240px;">
-			<option value="1">{TEXT_ENABLED}</option>
-			<option value="0"{SEARCHING_DISABLED}>{TEXT_DISABLED}</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="100">&nbsp;</td>
-	<td colspan="4">
-		<input type="submit" name="submit" value="{TEXT_SAVE} {SECTION_SETTINGS}" style="width: 117px;" />
-		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-</table>
-
-</form>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/pages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/pages.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/pages.htt	(nonexistent)
@@ -1,99 +0,0 @@
-<!-- BEGIN main_block -->
-<div class="{DISPLAY_ADD}">
-    <h2>{HEADING_ADD_PAGE}</h2>
-    <form name="add" action="add.php" method="post">
-	{FTAN}
-    <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
-    <tr>
-    	<td width="70" height="20">{TEXT_TITLE}:</td>
-    	<td width="240" height="20">
-    		<input type="text" name="title" style="width: 232px;" />
-    	</td>
-    	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
-    		{TEXT_ADMINISTRATORS}:
-    		<ul style="list-style-type: none; margin: 0; padding: 0;">
-    			<!-- BEGIN group_list_block -->
-    			<li>
-    			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-    			<label for="admin_group_{TOGGLE}">{NAME}</label>
-    			</li>
-    			<!-- END group_list_block -->
-    		</ul>
-    	</td>
-    	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
-    		<div id="viewers" style="display: none;">
-    			{TEXT_REGISTERED_VIEWERS}:
-    			<ul style="list-style-type: none; margin: 0; padding: 0;">
-    				<!-- BEGIN group_list_block2 -->
-    				<li>
-    				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-    				<label for="viewing_group_{TOGGLE}">{NAME}</label>
-    				</li>
-    				<!-- END group_list_block2 -->
-    			</ul>
-    		</div>
-    	</td>
-    </tr>
-    <tr>
-    	<td width="70">{TEXT_TYPE}:</td>
-    	<td width="240">
-    		<select name="type" style="width: 240px;">
-    			<!-- BEGIN module_list_block -->
-    				<option value="{VALUE}"{SELECTED}>{NAME}</option>
-    			<!-- END module_list_block -->
-    		</select>
-    	</td>
-    </tr>
-    <tr>
-    	<td width="70">{TEXT_PARENT}:</td>
-    	<td width="240">
-    		<select name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
-    			<!-- BEGIN page_list_block2 -->
-    			<option value="{ID}"{DISABLED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
-    			<!-- END page_list_block2 -->
-    		</select>
-    	</td>
-    </tr>
-    <tr>
-    	<td width="70">{TEXT_VISIBILITY}:</td>
-    	<td width="240">
-    		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
-    			<option value="public"{SELECTED}>{TEXT_PUBLIC}</option>
-    			<option value="private">{TEXT_PRIVATE}</option>
-    			<option value="registered">{TEXT_REGISTERED}</option>
-    			<option value="hidden">{TEXT_HIDDEN}</option>
-    			<option value="none">{TEXT_NONE}</option>
-    		</select>
-    	</td>
-    </tr>
-    <tr>
-    	<td width="70">&nbsp;</td>
-    	<td colspan="4">
-    		<input type="submit" name="submit" value="{TEXT_ADD}" style="width: 117px;" />
-    		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
-    	</td>
-    </tr>
-    <tr>
-    	<td>&nbsp;</td>
-    	<td>&nbsp;</td>
-    </tr>
-    </table>
-
-    </form>
-
-</div>
-<div class="{DISPLAY_INTRO}" style="padding-top: 10px;">
-<br />
-<h2>{HEADING_MODIFY_INTRO_PAGE}</h2>
-<a href="intro.php">
-{INTRO_LINK}
-</a>
-
-</div>
-<!-- Addition for remembering expanded state of pages -->
-<script type="text/javascript" language="javascript">
-var THEME_URL = '{THEME_URL}';
-var WB_URL = '{WB_URL}';
-</script>
-<script src="{ADMIN_URL}/pages/page_index.js" type="text/javascript"></script>
-<!-- END main_block -->
\ No newline at end of file
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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/users_form.htt	(nonexistent)
@@ -1,95 +0,0 @@
-<!-- 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}" />
-		<input type="button" style="width: 100px; margin-top: 5px;" onclick="javascript: window.location = 'index.php';" value="{TEXT_CANCEL}">
-	</td>
-</tr>
-</table>
-
-</form>
-
-<!-- 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 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/start.htt	(nonexistent)
@@ -1,153 +0,0 @@
-<!-- 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/backup/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/users_form.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/users_form.htt	(revision 1529)
@@ -0,0 +1,95 @@
+<!-- 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}" />
+		<input type="button" style="width: 100px; margin-top: 5px;" onclick="javascript: window.location = 'index.php';" value="{TEXT_CANCEL}">
+	</td>
+</tr>
+</table>
+
+</form>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/login_forgot.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/login_forgot.htt	(revision 1529)
@@ -0,0 +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 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/backup/error.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/error.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/error.htt	(revision 1529)
@@ -0,0 +1,6 @@
+<!-- BEGIN main_block -->
+<div class="error-box rounded">
+	<p>{MESSAGE}</p>
+	<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{LINK}';" />
+</div>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/start.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/start.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/start.htt	(revision 1529)
@@ -0,0 +1,153 @@
+<!-- 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/backup/templates.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/templates.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/templates.htt	(revision 1529)
@@ -0,0 +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 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/backup/pages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/pages.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/pages.htt	(revision 1529)
@@ -0,0 +1,99 @@
+<!-- BEGIN main_block -->
+<div class="{DISPLAY_ADD}">
+    <h2>{HEADING_ADD_PAGE}</h2>
+    <form name="add" action="add.php" method="post">
+	{FTAN}
+    <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
+    <tr>
+    	<td width="70" height="20">{TEXT_TITLE}:</td>
+    	<td width="240" height="20">
+    		<input type="text" name="title" style="width: 232px;" />
+    	</td>
+    	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
+    		{TEXT_ADMINISTRATORS}:
+    		<ul style="list-style-type: none; margin: 0; padding: 0;">
+    			<!-- BEGIN group_list_block -->
+    			<li>
+    			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+    			<label for="admin_group_{TOGGLE}">{NAME}</label>
+    			</li>
+    			<!-- END group_list_block -->
+    		</ul>
+    	</td>
+    	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
+    		<div id="viewers" style="display: none;">
+    			{TEXT_REGISTERED_VIEWERS}:
+    			<ul style="list-style-type: none; margin: 0; padding: 0;">
+    				<!-- BEGIN group_list_block2 -->
+    				<li>
+    				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+    				<label for="viewing_group_{TOGGLE}">{NAME}</label>
+    				</li>
+    				<!-- END group_list_block2 -->
+    			</ul>
+    		</div>
+    	</td>
+    </tr>
+    <tr>
+    	<td width="70">{TEXT_TYPE}:</td>
+    	<td width="240">
+    		<select name="type" style="width: 240px;">
+    			<!-- BEGIN module_list_block -->
+    				<option value="{VALUE}"{SELECTED}>{NAME}</option>
+    			<!-- END module_list_block -->
+    		</select>
+    	</td>
+    </tr>
+    <tr>
+    	<td width="70">{TEXT_PARENT}:</td>
+    	<td width="240">
+    		<select name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
+    			<!-- BEGIN page_list_block2 -->
+    			<option value="{ID}"{DISABLED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
+    			<!-- END page_list_block2 -->
+    		</select>
+    	</td>
+    </tr>
+    <tr>
+    	<td width="70">{TEXT_VISIBILITY}:</td>
+    	<td width="240">
+    		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
+    			<option value="public"{SELECTED}>{TEXT_PUBLIC}</option>
+    			<option value="private">{TEXT_PRIVATE}</option>
+    			<option value="registered">{TEXT_REGISTERED}</option>
+    			<option value="hidden">{TEXT_HIDDEN}</option>
+    			<option value="none">{TEXT_NONE}</option>
+    		</select>
+    	</td>
+    </tr>
+    <tr>
+    	<td width="70">&nbsp;</td>
+    	<td colspan="4">
+    		<input type="submit" name="submit" value="{TEXT_ADD}" style="width: 117px;" />
+    		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
+    	</td>
+    </tr>
+    <tr>
+    	<td>&nbsp;</td>
+    	<td>&nbsp;</td>
+    </tr>
+    </table>
+
+    </form>
+
+</div>
+<div class="{DISPLAY_INTRO}" style="padding-top: 10px;">
+<br />
+<h2>{HEADING_MODIFY_INTRO_PAGE}</h2>
+<a href="intro.php">
+{INTRO_LINK}
+</a>
+
+</div>
+<!-- Addition for remembering expanded state of pages -->
+<script type="text/javascript" language="javascript">
+var THEME_URL = '{THEME_URL}';
+var WB_URL = '{WB_URL}';
+</script>
+<script src="{ADMIN_URL}/pages/page_index.js" type="text/javascript"></script>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/settings.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/settings.htt	(revision 1529)
@@ -0,0 +1,646 @@
+<!-- BEGIN main_block -->
+
+<form name="settings" action="save.php" method="post">
+<input type="hidden" name="advanced" value="{ADVANCED}" />
+{FTAN}
+
+<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
+<tr>
+	<td colspan="3">
+		<h2>{HEADING_GENERAL_SETTINGS}</h2>
+	</td>
+</tr>
+<tr>
+	<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="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="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="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="2">
+		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
+	</td>
+</tr>
+<!-- BEGIN show_page_level_limit_block -->
+<tr{DISPLAY_ADVANCED}>
+	<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>
+		<!-- END page_level_limit_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- END show_page_level_limit_block -->
+<tr>
+	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
+	<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} />
+		<label for="page_trash_inline">{TEXT_INLINE}</label>
+		<div style="margin: 0; padding: 0;{DISPLAY_PAGE_TRASH_SEPARATE}">
+			<input type="radio" name="page_trash" id="page_trash_separate" style="width: 14px; height: 14px;" value="separate"{PAGE_TRASH_SEPARATE} />
+			<label for="page_trash_separate">{TEXT_SEPARATE}</label>
+		</div>
+	</td>
+</tr>
+<!-- BEGIN show_checkbox_1_block -->
+<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} />
+                <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} />
+                <label for="page_languages_false">{TEXT_DISABLED}</label>
+		</td>
+</tr>
+<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} />
+		<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} />
+		<label for="multiple_menus_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<!-- END show_checkbox_1_block -->
+<tr>
+	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
+	<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} />
+		<label for="home_folders_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<!-- BEGIN show_checkbox_2_block -->
+<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} />
+		<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} />
+		<label for="manage_sections_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="section_blocks_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<!-- END show_checkbox_2_block -->
+<tr>
+	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
+	<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} />
+		<label for="intro_page_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<!-- BEGIN show_checkbox_3_block -->
+<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} />
+		<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} />
+		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="smart_login_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<!-- END show_checkbox_3_block -->
+<tr>
+	<td class="setting_name">{TEXT_LOGIN}:</td>
+	<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} />
+		<label for="frontend_login_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<!-- BEGIN show_redirect_timer_block -->
+<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}" style="width:50%;" />
+		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
+	</td>
+</tr>
+<!-- END show_redirect_timer_block -->
+<tr>
+	<td class="setting_name">{TEXT_SIGNUP}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="frontend_signup">
+			<option value="false">{TEXT_DISABLED}</option>
+			<!-- BEGIN group_list_block -->
+				<option value="{ID}" {SELECTED}>{NAME}</option>
+			<!-- END group_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- BEGIN show_php_error_level_block -->
+<tr{DISPLAY_ADVANCED}>
+	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="er_level">
+			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN error_reporting_list_block -->
+				<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END error_reporting_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- END show_php_error_level_block -->
+<!-- BEGIN show_wysiwyg_block -->
+<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}>
+	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="wysiwyg_editor">
+		<!-- BEGIN editor_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END editor_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- END show_wysiwyg_block -->
+<tr>
+	<td>&nbsp;</td>
+	<td align="left" nowrap="nowrap">
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;">
+		<h2>{HEADING_DEFAULT_SETTINGS}</h2>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_LANGUAGE}:</td>
+	<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>
+			<!-- END language_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- BEGIN show_charset_block -->
+<tr{DISPLAY_ADVANCED}>
+	<td class="setting_name">{TEXT_CHARSET}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="default_charset">
+			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN charset_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END charset_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- END show_charset_block -->
+<tr>
+	<td class="setting_name">{TEXT_TIMEZONE}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="default_timezone">
+			<option value="0">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN timezone_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END timezone_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
+	<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 -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END date_format_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
+	<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 -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END time_format_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TEMPLATE}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="default_template">
+		<!-- BEGIN template_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END template_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_THEME}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="default_theme">
+		<!-- BEGIN theme_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END theme_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;">
+		<h2>{HEADING_SEARCH_SETTINGS}</h2>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_VISIBILITY}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="search">
+			<option value="public">{TEXT_PUBLIC}</option>
+			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
+			<option value="registered" {REGISTERED_SEARCH}>{TEXT_REGISTERED}</option>
+			<option value="none" {NONE_SEARCH}>{TEXT_NONE}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TEMPLATE}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="search_template">
+		<!-- BEGIN search_template_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END search_template_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- BEGIN show_search_block -->
+<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}" />
+	</td>
+</tr>
+<!-- END show_search_block -->
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;">
+		<h2>{HEADING_SERVER_SETTINGS}</h2>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
+	<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} />
+		<label for="operating_system_windows" onclick="javascript: change_os('windows');">{TEXT_WINDOWS}</label>
+	</td>
+</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">
+		<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">
+				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
+			</label>
+			<span class="warning">({WORLD_WRITEABLE_WARNING})</span>
+		</div>
+		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
+	</td>
+</tr>
+<!-- BEGIN show_access_block -->
+<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="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}:
+			</td>
+		</tr>
+		<tr>
+			<td>{TEXT_USER}:</td>
+			<td>{TEXT_GROUP}:</td>
+			<td>{TEXT_OTHERS}:</td>
+		</tr>
+		<tr>
+			<td width="100" nowrap="nowrap">
+				<input type="checkbox" name="file_u_r" id="file_u_r" value="true"{FILE_U_R_CHECKED} />
+				<label for="file_u_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_u_w" id="file_u_w" value="true"{FILE_U_W_CHECKED} />
+				<label for="file_u_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_u_e" id="file_u_e" value="true"{FILE_U_E_CHECKED} />
+				<label for="file_u_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td width="100" nowrap="nowrap">
+				<input type="checkbox" name="file_g_r" id="file_g_r" value="true"{FILE_G_R_CHECKED} />
+				<label for="file_g_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_g_w" id="file_g_w" value="true"{FILE_G_W_CHECKED} />
+				<label for="file_g_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_g_e" id="file_g_e" value="true"{FILE_G_E_CHECKED} />
+				<label for="file_g_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td width="100" nowrap="nowrap">
+				<input type="checkbox" name="file_o_r" id="file_o_r" value="true"{FILE_O_R_CHECKED} />
+				<label for="file_o_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_o_w" id="file_o_w" value="true"{FILE_O_W_CHECKED} />
+				<label for="file_o_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_o_e" id="file_o_e" value="true"{FILE_O_E_CHECKED} />
+				<label for="file_o_e">{TEXT_EXECUTE}</label>
+			</td>
+		</tr>
+		</table>
+	</td>
+	<td class="setting_value" id="dir_mode" style="text-align: right;">
+		<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}:
+			</td>
+		</tr>
+		<tr>
+			<td>{TEXT_USER}:</td>
+			<td>{TEXT_GROUP}:</td>
+			<td>{TEXT_OTHERS}:</td>
+		</tr>
+		<tr>
+			<td width="100" nowrap="nowrap">
+				<input type="checkbox" name="dir_u_r" id="dir_u_r" value="true"{DIR_U_R_CHECKED} />
+				<label for="dir_u_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_u_w" id="dir_u_w" value="true"{DIR_U_W_CHECKED} />
+				<label for="dir_u_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_u_e" id="dir_u_e" value="true"{DIR_U_E_CHECKED} />
+				<label for="dir_u_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td width="100" nowrap="nowrap">
+				<input type="checkbox" name="dir_g_r" id="dir_g_r" value="true"{DIR_G_R_CHECKED} />
+				<label for="dir_g_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_g_w" id="dir_g_w" value="true"{DIR_G_W_CHECKED} />
+				<label for="dir_g_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_g_e" id="dir_g_e" value="true"{DIR_G_E_CHECKED} />
+				<label for="dir_g_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td width="100" nowrap="nowrap">
+				<input type="checkbox" name="dir_o_r" id="dir_o_r" value="true"{DIR_O_R_CHECKED} />
+				<label for="dir_o_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_o_w" id="dir_o_w" value="true"{DIR_O_W_CHECKED} />
+				<label for="dir_o_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_o_e" id="dir_o_e" value="true"{DIR_O_E_CHECKED} />
+				<label for="dir_o_e">{TEXT_EXECUTE}</label>
+			</td>
+		</tr>
+		</table>
+	</td>
+</tr>
+<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
+	<td class="setting_value" colspan="2">
+		<input type="text" name="sec_anchor" value="{SEC_ANCHOR}" />
+	</td>
+</tr>
+<!-- END show_access_block -->
+<!-- BASIC MAILER SETTINGS -->
+<tr>
+	<td colspan="3" style="padding-top: 10px;">
+		<h2>{HEADING_WBMAILER_SETTINGS}</h2>
+		<p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}</p>
+	</td>
+</tr>
+<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}" />
+	</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}" />
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
+	<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} />
+		<label for="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');">{TEXT_WBMAILER_SMTP}</label>
+	</td>
+</tr>
+<!-- MORE ADVANCED SMTP MAILER SETTINGS -->
+<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"{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"{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} />
+		<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"{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"{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}" />
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+</table>
+
+</form>
+
+<hr size="1" />
+
+<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+<br />
+<font class="{DISPLAY_ADVANCED_BUTTON}">
+{MODE_SWITCH_WARNING}
+</font>
+<script src="{ADMIN_URL}/settings/setting.js" language="javascript" type="text/javascript"></script>
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/media_browse.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/media_browse.htt	(revision 1529)
@@ -0,0 +1,112 @@
+<!-- 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>
+			<th align="right" width="40" class="headline">&nbsp;</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}&amp;id={TEMP_ID}');" title="{TEXT_DELETE}">
+					<img src="{THEME_URL}/images/delete_16.png" alt="" border="0" />
+				</a>
+			</td>
+   <td width="16" align="right" class="">
+	   <img src="{THEME_URL}/images/{IMAGE_EXIST}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" />
+   </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/backup/users.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/users.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/users.htt	(revision 1529)
@@ -0,0 +1,34 @@
+<!-- BEGIN main_block -->
+
+<form name="users" action="users.php" method="post">
+<input type="hidden" name="status" value="{USER_STATUS}" />
+{FTAN}
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%">
+<tr>
+	<td align="left">
+		<h2>{HEADING_MODIFY_DELETE_USER}</h2>
+	</td>
+	<td align="right">
+		<!-- BEGIN manage_groups_block -->
+		<a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a>
+		<!-- END manage_groups_block -->
+	</td>
+</tr>
+</table>
+<button type="button" name="status" title="{TEXT_USERS}" style="width: 40px; background: {STATUS_ICON} no-repeat center" value="{USER_STATUS}" onclick="javascript: window.location = 'index.php?status={USER_STATUS}';" class="status {DISPLAY_MODIFY}" >&nbsp;</button>
+<select name="user_id" style="width: 500px;">
+<!-- BEGIN list_block -->
+	<option value="{VALUE}" {STATUS}>{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 style="margin-top: 20px;" class="{DISPLAY_ADD}">{HEADING_ADD_USER}</h2>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/preferences.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/preferences.htt	(revision 1529)
@@ -0,0 +1,114 @@
+<!-- BEGIN main_block -->
+<h2>{HEADING_MY_SETTINGS}</h2>
+<div class="content_box">
+	<form name="{FORM_NAME}" id="{FORM_NAME}" action="{ACTION_URL}" method="post">
+		{FTAN}
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_USERNAME}:</label><br />
+				</div>
+				<div class="c60l">
+					<div id="username">{USERNAME}</div><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_DISPLAY_NAME}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="text" id="display_name" name="display_name" value="{DISPLAY_NAME}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_LANGUAGE}:</label><br />
+				</div>
+				<div class="c60l">
+				<select name="language" id="language">
+					<!-- BEGIN language_list_block -->
+						<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
+					<!-- END language_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_TIMEZONE}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="timezone" id="timezone">
+						<!-- BEGIN timezone_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END timezone_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_DATE_FORMAT}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="date_format" id="date_format">
+						<!-- BEGIN date_format_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END date_format_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_TIME_FORMAT}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="time_format" id="time_format">
+						<!-- BEGIN time_format_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END time_format_list_block -->
+					</select>
+				</div>
+			</div>
+
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_EMAIL}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="text" id="email" name="email" value="{EMAIL}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_NEW_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="new_password_1" name="new_password_1" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_RETYPE_NEW_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<hr />
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_NEED_CURRENT_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="current_password" name="current_password" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns save_section">
+				<div class="c60l">
+					<input type="submit" id="submit" name="submit" value="{TEXT_SAVE}" />
+					<input type="reset" id="reset" name="reset" value="{TEXT_RESET}" />
+				</div>
+				<div class="c25l">&nbsp;</div>
+			</div>
+	</form>
+</div>
+
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/access.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/access.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/access.htt	(revision 1529)
@@ -0,0 +1,48 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+<tr>
+	<td align="center" valign="top">
+		<!-- BEGIN users_block -->	
+		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_USERS} >
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2">
+				<a href="{ADMIN_URL}/users/index.php">
+					<img src="{THEME_URL}/icons/users.png" alt="{USERS}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/users/index.php">{USERS}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{USERS_OVERVIEW}
+			</td>
+		</tr>
+		</table>
+		<!-- END users_block -->
+		<!-- BEGIN groups_block -->		
+		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2">
+				<a href="{ADMIN_URL}/groups/index.php">
+					<img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" />
+				</a>
+			</td>
+			<td class="title">
+				<a href="{ADMIN_URL}/groups/index.php">{GROUPS}</a>
+			</td>
+		</tr>
+		<tr>
+			<td class="description">
+				{GROUPS_OVERVIEW}
+			</td>
+		</tr>
+		</table>
+		<!-- END groups_block -->
+	</td>
+</tr>
+</table>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/groups_form.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/groups_form.htt	(revision 1529)
@@ -0,0 +1,295 @@
+<!-- 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="save" 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_LINK}" method="post">
+		<input type="hidden" name="advanced" value="{ADVANCED}" />
+        <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/backup/templates_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/templates_details.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/templates_details.htt	(revision 1529)
@@ -0,0 +1,32 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_TEMPLATE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+<tr>
+	<td valign="top">{TEXT_DESCRIPTION}:</td>
+	<td style="text-align: justify;">{DESCRIPTION}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_modify.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_modify.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_modify.htt	(revision 1529)
@@ -0,0 +1,24 @@
+<!-- BEGIN main_block -->
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom: 10px;">
+<tr style="background-color: #F0F0F0;">
+	<td valign="middle" align="left">
+		<h2>{HEADING_MODIFY_PAGE}</h2>
+	</td>
+	<td align="right">
+		{TEXT_CURRENT_PAGE}:
+		<b>{PAGE_TITLE}</b>
+		-
+		<a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}&amp;{FTAN2}">{TEXT_CHANGE_SETTINGS}</a>
+<!-- BEGIN show_section_block -->
+		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
+		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;{FTAN2}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
+<!-- END show_section_block -->
+		<font style="color: #999999;" class="{CLASS_DISPLAY_MODIFIED}"><br />
+<!-- BEGIN show_modify_block -->
+		{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
+<!-- END show_modify_block -->
+		</font>
+	</td>
+</tr>
+</table>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/languages.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/languages.htt	(revision 1529)
@@ -0,0 +1,75 @@
+<!-- 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}">
+{FTAN}
+<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}">
+{FTAN}
+<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}">
+{FTAN}
+<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/backup/media_rename.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/media_rename.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/media_rename.htt	(revision 1529)
@@ -0,0 +1,58 @@
+<!-- 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>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" align="center">
+<tr>
+	<td class="rename">
+<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" language="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/wb_theme/templates/backup/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_sections.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_sections.htt	(revision 1529)
@@ -0,0 +1,121 @@
+<!-- BEGIN main_block -->
+        <div class="jsadmin jcalendar hide"></div>
+        <table summary="" cellpadding="0" cellspacing="0" class="sections_header">
+            <tr>
+                <td valign="middle" align="left">
+                    <h2>{HEADING_MANAGE_SECTIONS}</h2>
+                </td>
+                <td>ID: {PAGE_ID}</td>
+                <td align="right">{TEXT_CURRENT_PAGE}: <b>{PAGE_TITLE}</b>
+                    -
+                    <a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{HEADING_MODIFY_PAGE}</a>
+                    -
+                    <a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}">{TEXT_CHANGE_SETTINGS}</a>
+                </td>
+            </tr>
+        </table>
+
+        <form name="section_properties" action="{ADMIN_URL}/pages/sections_save.php?page_id={PAGE_IDKEY}" method="post">
+		{FTAN}
+		
+        <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>
+                	<td class="header_list_pubdate_start">{TEXT_PUBL_START_DATE}:</td>
+                	<td class="header_list_pubdate_end">{TEXT_PUBL_END_DATE}:</td>
+                	<td class="header_list_sections_actions"  colspan="3">{TEXT_ACTIONS}:</td>
+                    <td class="header_list_section_id">{TEXT_SID}</td>
+                    <td valign="middle" align="left"{DISPLAY_DEBUG}>{TEXT_PID}</td>
+                </tr>
+<!-- BEGIN section_block -->
+            	<tr onmouseover="this.style.backgroundColor = '#F1F8DD'" onmouseout="this.style.backgroundColor = '#FFF'">
+    				<td style="display: none;">
+                      <input type="hidden" name="page_id" value="{PAGE_IDKEY}"  />
+                      <input type="hidden" name="section_id" value="{VAR_SECTION_ID}"  />
+                      {VAR_SECTION_ID}
+                    </td>
+
+                    <td valign="middle" width="{NAME_SIZE}">{LINK_MODIFY_URL_VAR_MODUL_NAME}</td>
+
+                    <td valign="middle" class="{INPUT_ATTRIBUTE}"{STYLE_DISPLAY_SECTION_BLOCK}>
+                    	<select name="block{VAR_SECTION_ID}" class="input_narrow">
+                        {SET_NONE_DISPLAY_OPTION}
+                    	<!-- BEGIN block_block -->
+                    		<option value="{VALUE}"{SELECTED}>{NAME}</option>
+                    	<!-- END block_block -->
+                    	</select>
+                    </td>
+
+                    <td valign="middle" nowrap="nowrap" width="120"><input type="text" id="start_date{VAR_SECTION_ID}" name="start_date{VAR_SECTION_ID}" value="{VALUE_PUBL_START}" class="input_normal" />
+                        <img src="{THEME_URL}/images/{CLOCK_16_PNG}" id="trigger_start{VAR_SECTION_ID}" style="cursor: pointer;" title="{TEXT_CALENDAR}" alt="start"  />
+                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor: pointer;" alt="del" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.start_date{VAR_SECTION_ID}.value=''" />
+                    </td>
+
+                    <td valign="middle" nowrap="nowrap" width="120"><input type="text" id="end_date{VAR_SECTION_ID}" name="end_date{VAR_SECTION_ID}" value="{VALUE_PUBL_END}" class="input_narrow" />
+                        <img src="{THEME_URL}/images/{CLOCK_16_PNG}" id="trigger_stop{VAR_SECTION_ID}" alt="end" style="cursor: pointer;" title="{TEXT_CALENDAR}"  />
+                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor: pointer;" alt="del" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.end_date{VAR_SECTION_ID}.value=''" />
+                    </td>
+
+                    <td valign="middle" width="20">
+                        {VAR_MOVE_UP_URL}
+                    </td>
+
+                    <td valign="middle"  width="20">
+                        {VAR_MOVE_DOWN_URL}
+                    </td>
+
+                    <td valign="middle" width="20">
+                        <a href="#" onclick="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_IDKEY}');">
+                        <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="X" />
+                        </a>
+                    </td>
+                    <td valign="middle" align="right">
+                       {VAR_SECTION_ID}
+                    </td>
+                    <td valign="middle" align="right"{DISPLAY_DEBUG}>
+                       {POSITION}
+                    </td>
+                </tr>
+<!-- END section_block -->
+                <tr>
+                    <td valign="middle" align="right" colspan="{DEBUG_COLSPAN_SIZE}"><input type="submit" name="save" value="{TEXT_SAVE}" class="input_medium" /></td>
+    	        </tr>
+	    </table>
+    </form>
+
+	<h2>{TEXT_ADD_SECTION}</h2>
+	<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 summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%">
+    	<tr>
+    		<td width="100%">
+    			<select name="module" class="input_full">
+                <!-- BEGIN module_block -->
+    			 <option value="{VALUE}"{SELECTED}>{NAME}</option>
+                 <!-- END module_block -->
+    			</select>
+    		</td>
+			<td >
+    			<input type="submit" name="submit" value="{TEXT_ADD}" class="input_medium" />
+    		</td>
+    	</tr>
+    	</table>
+	</form>
+    <!-- BEGIN calendar_block -->
+    <script type="text/javascript" >
+         var section_id = '{VAR_SECTION_ID}';
+         var start_date = '{start_date}';
+         var end_date = '{end_date}';
+         var trigger_start = '{trigger_start}';
+         var trigger_end = '{trigger_end}';
+         var jscal_today = '{jscal_today}';
+         var jscal_ifformat = '{jscal_ifformat}';
+         var jscal_firstday = {jscal_firstday};
+         var showsTime = {showsTime};
+         var timeFormat = {timeFormat};
+    </script>
+    <script type="text/javascript" src="{ADMIN_URL}/pages/page_calendar.js" ></script>
+    <!-- END calendar_block -->
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/modules.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/modules.htt	(revision 1529)
@@ -0,0 +1,124 @@
+<!-- BEGIN main_block -->
+
+<div class="box">
+	{URL_TEMPLATES}&nbsp;&nbsp;{URL_LANGUAGES}&nbsp;&nbsp;{URL_ADVANCED}
+</div>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
+<h2>{HEADING_INSTALL_MODULE}</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><br />
+        <input type="checkbox" name="overwrite" value="false"  />
+		<span>{OVERWRITE_NEWER_FILES}</span>
+	</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_MODULE}</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 module_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+		<!-- END module_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_MODULE_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 module_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+		<!-- END module_list_block -->
+		</select>
+	</td>
+	<td width="110">
+		<input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
+	</td>
+</tr>
+</table>
+
+<br />
+</form>
+
+<div class="{DISPLAY_MANUAL_INSTALL}">
+<h2>{HEADING_INVOKE_MODULE_FILES}</h2>
+<p>{TEXT_MANUAL_INSTALLATION}</p>
+
+<form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
+{FTAN}
+	<strong>{TEXT_FILE}:</strong> "install.php"&nbsp;&nbsp;&nbsp;
+	<input type="hidden" name="action" value="install" />
+	<select name="file" style="width: 250px;">
+	<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN install_list_block -->
+		<option value="{VALUE}">{NAME}</option>
+		<!-- END install_list_block -->
+	</select>
+	<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width: 100px; margin-left: 1em;" />
+</form>
+
+<form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
+{FTAN}
+	<br />{TEXT_FILE}: "upgrade.php"
+	<input type="hidden" name="action" value="upgrade" />
+	<select name="file" style="width: 250px;">
+	<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN upgrade_list_block -->
+		<option value="{VALUE}">{NAME}</option>
+		<!-- END upgrade_list_block -->
+	</select>
+	<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width: 100px; margin-left: 1em;" />
+</form>
+
+<form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
+{FTAN}
+	<br />{TEXT_FILE}: "uninstall.php"
+	<input type="hidden" name="action" value="uninstall" />
+	<select name="file" style="width: 250px;">
+	<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN uninstall_list_block -->
+		<option value="{VALUE}">{NAME}</option>
+		<!-- END uninstall_list_block -->
+	</select>
+	<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width: 100px; margin-left: 1em;" />
+</form>
+
+<p style="color: red;">{TEXT_MANUAL_INSTALLATION_WARNING}</p>
+</div>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/login.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/login.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/login.htt	(revision 1529)
@@ -0,0 +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 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/backup/addons.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/addons.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/addons.htt	(revision 1529)
@@ -0,0 +1,69 @@
+<!-- BEGIN main_block -->
+<div class="box">
+	{URL_ADVANCED}
+</div>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+<tr>
+	<td align="center" valign="top">
+		<!-- BEGIN modules_block -->
+		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_MODULES} >
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/modules/index.php"><img src="{THEME_URL}/icons/modules.png" alt="0" /></a></td>
+			<td class="title"><a href="{ADMIN_URL}/modules/index.php">{MODULES}</a></td>
+		</tr>
+		<tr>
+			<td class="description">{MODULES_OVERVIEW}</td>
+		</tr>
+		</table>
+		<!-- END modules_block -->		
+		<!-- BEGIN templates_block -->
+		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_TEMPLATES} >
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/templates/index.php"><img src="{THEME_URL}/icons/templates.png" alt="{TEMPLATES}" /></a></td>
+			<td class="title"><a href="{ADMIN_URL}/templates/index.php">{TEMPLATES}</a></td>
+		</tr>
+		<tr>
+			<td class="description">{TEMPLATES_OVERVIEW}</td>
+		</tr>
+		</table>
+		<!-- END templates_block -->
+		<!-- BEGIN languages_block -->
+		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_LANGUAGES} >
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/languages/index.php"><img src="{THEME_URL}/icons/languages.png" alt="{LANGUAGES}" /></a></td>
+			<td class="title"><a href="{ADMIN_URL}/languages/index.php">{LANGUAGES}</a></td>
+		</tr>
+		<tr>
+			<td class="description">{LANGUAGES_OVERVIEW}</td>
+		</tr>
+		</table>
+		<!-- END languages_block -->
+		<!-- BEGIN reload_block -->
+		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_RELOAD} >
+		<tr>
+			<td class="graphic" align="center" valign="middle" rowspan="2"><img src="{THEME_URL}/icons/admintools.png" alt="{TXT_ADMIN_SETTINGS}" /></td>
+			<td class="title">{TXT_ADMIN_SETTINGS}</td>
+		</tr>
+		<tr>
+			<td class="description">
+				<form action="{RELOAD_URL}" method="post">
+				{FTAN}
+				{MESSAGE_RELOAD_ADDONS}<br style="margin-bottom: 0.5em" />
+				<input {DISPLAY_MODULES} type="checkbox" name="reload_modules" id="reload_modules" value="true" />
+				<label {DISPLAY_MODULES} for="reload_modules">{MODULES}</label>
+				<input {DISPLAY_TEMPLATES} type="checkbox" name="reload_templates" id="reload_templates" value="true" />
+				<label {DISPLAY_TEMPLATES} for="reload_templates">{TEMPLATES}</label>
+				<input {DISPLAY_LANGUAGES} type="checkbox" name="reload_languages" id="reload_languages" value="true" />
+				<label {DISPLAY_LANGUAGES} for="reload_languages">{LANGUAGES}</label>
+				<input type="submit" name="submit" value="{TEXT_RELOAD}" />
+				</form>
+			</td>
+		</tr>
+		</table>
+		<!-- END reload_block -->
+	</td>
+</tr>
+</table>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/success.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/success.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/success.htt	(revision 1529)
@@ -0,0 +1,11 @@
+<!-- BEGIN main_block -->
+<div class="msg-box rounded">
+	<p>{MESSAGE}</p>
+<!-- BEGIN show_redirect_block -->
+ <script type="text/javascript">
+  setTimeout("location.href='{REDIRECT}'", {REDIRECT_TIMER});
+ </script>
+<!-- END show_redirect_block -->
+<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{REDIRECT}';" />
+</div>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/admintools.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/admintools.htt	(revision 1529)
@@ -0,0 +1,30 @@
+<!-- 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/backup/languages_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/languages_details.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/languages_details.htt	(revision 1529)
@@ -0,0 +1,32 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_LANGUAGE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_CODE}:</td>
+	<td>{CODE}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/modules_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/modules_details.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/modules_details.htt	(revision 1529)
@@ -0,0 +1,36 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_MODULE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_TYPE}:</td>
+	<td>{TYPE}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+<tr>
+	<td valign="top">{TEXT_DESCRIPTION}:</td>
+	<td style="text-align: justify;">{DESCRIPTION}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/media.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/media.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/media.htt	(revision 1529)
@@ -0,0 +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="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/backup/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/groups.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/groups.htt	(revision 1529)
@@ -0,0 +1,35 @@
+<!-- BEGIN main_block -->
+
+<form name="groups" action="groups.php" method="post">
+{FTAN}
+<table summary=""  cellpadding="0" cellspacing="0" border="0" width="100%">
+<tr>
+	<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>
+
+<br />
+
+<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 -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_settings.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_settings.htt	(revision 1529)
@@ -0,0 +1,181 @@
+<!-- BEGIN main_block -->
+
+<script src="{ADMIN_URL}/pages/page_settings.js" type="text/javascript"></script>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom: 10px;">
+<tr style="background-color: #F0F0F0;">
+	<td valign="middle" align="left">
+		<h2>{HEADING_MODIFY_PAGE_SETTINGS}</h2>
+	</td>
+	<td nowrap="nowrap">ID: {PAGE_ID}</td>
+	<td align="right">
+		{TEXT_CURRENT_PAGE}:
+		<b>{PAGE_TITLE}</b>
+		-
+		<a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{TEXT_MODIFY_PAGE}</a>
+		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
+		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
+		<br />
+		<font style="color: #999999;" class="{DISPLAY_MODIFIED}">
+			{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
+		</font>
+	</td>
+</tr>
+</table>
+
+<form name="settings" action="settings2.php" method="post">
+
+<input type="hidden" name="page_id" value="{PAGE_ID}" />
+{FTAN}
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
+<tr>
+	<td width="100" height="20">{TEXT_PAGE_TITLE}:</td>
+	<td width="240" height="20">
+		<input type="text" name="page_title" value="{PAGE_TITLE}" style="width: 232px;" />
+	</td>
+	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
+		{TEXT_ADMINISTRATORS}:
+		<ul style="list-style-type: none; margin: 0; padding: 0;">
+			<!-- BEGIN group_list_block -->
+			<li>
+			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+			<label for="admin_group_{TOGGLE}">{NAME}</label>
+			</li>
+			<!-- END group_list_block -->
+		</ul>
+	</td>
+	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
+		<div id="allowed_viewers" style="{DISPLAY_VIEWERS}">
+			{TEXT_ALLOWED_VIEWERS}:
+			<ul style="list-style-type: none; margin: 0; padding: 0;">
+				<!-- BEGIN group_list_block2 -->
+				<li>
+				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
+				</li>
+				<!-- END group_list_block2 -->
+			</ul>
+		</div>
+	</td>
+</tr>
+<tr>
+	<td width="100" height="20">{TEXT_MENU_TITLE}:</td>
+	<td width="240" height="20">
+		<input type="text" name="menu_title" value="{MENU_TITLE}" style="width: 232px;" />
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_PARENT}:</td>
+	<td width="240">
+		<select name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
+			<!-- BEGIN page_list_block2 -->
+			<option value="{ID}"{SELECTED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
+			<!-- END page_list_block2 -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_VISIBILITY}:</td>
+	<td width="240">
+		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
+			<option value="public"{PUBLIC_SELECTED}>{TEXT_PUBLIC}</option>
+			<option value="private"{PRIVATE_SELECTED}>{TEXT_PRIVATE}</option>
+			<option value="registered"{REGISTERED_SELECTED}>{TEXT_REGISTERED}</option>
+			<option value="hidden"{HIDDEN_SELECTED}>{TEXT_HIDDEN}</option>
+			<option value="none"{NO_VIS_SELECTED}>{TEXT_NONE}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100" valign="top">{TEXT_DESCRIPTION}:</td>
+	<td>
+		<textarea name="description" rows="10" cols="1" style="width: 236px; height: 50px;">{DESCRIPTION}</textarea>
+	</td>
+</tr>
+<tr>
+	<td width="100" valign="top">{TEXT_KEYWORDS}:</td>
+	<td>
+		<textarea name="keywords" rows="10" cols="1" style="width: 236px; height: 50px;">{KEYWORDS}</textarea>
+	</td>
+</tr>
+<tr>
+	<td>
+		{TEXT_TARGET}:
+	</td>
+	<td>
+		<select name="target" style="width: 240px;" ><!--  value="{TARGET}" -->
+			<option value="_blank"{BLANK_SELECTED}>{TEXT_NEW_WINDOW}</option>
+			<option value="_self"{SELF_SELECTED}>{TEXT_SAME_WINDOW}</option>
+			<option value="_top"{TOP_SELECTED}>{TEXT_TOP_FRAME}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_TEMPLATE}:</td>
+	<td width="240">
+		<select name="template" style="width: 240px;">
+			<option value="">{TEXT_SYSTEM_DEFAULT}</option>
+			<option value="">----------------------</option>
+			<!-- BEGIN template_list_block -->
+			<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END template_list_block -->
+		</select>
+	</td>
+</tr>
+<tr style="{DISPLAY_MENU_LIST}">
+	<td width="100">{TEXT_MENU}:</td>
+	<td width="240">
+		<select name="menu" style="width: 240px;">
+			<!-- BEGIN menu_list_block -->
+			<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END menu_list_block -->
+		</select>
+	</td>
+</tr>
+<tr style="{DISPLAY_LANGUAGE_LIST}">
+	<td width="100">{TEXT_LANGUAGE}:</td>
+	<td class="list_language">
+		<select name="language" style="width: 240px;">
+			<!-- BEGIN language_list_block -->
+			<option value="{VALUE}"{SELECTED} style="background: {FLAG_LANG_ICONS} no-repeat center left; padding-left: 20px;">{NAME}</option>
+			<!-- END language_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- insert page_code 20090904-->
+<tr{DISPLAY_CODE_PAGE_LIST}>
+	<td width="100">{TEXT_PAGE_CODE}:</td>
+	<td class="list_page_code">
+		<select name="page_code" class="value_page_code">
+			<!-- BEGIN page_code_list_block -->
+			<option value="{VALUE}"{SELECTED} style="background: {FLAG_CODE_ICON} no-repeat center left; padding-left: 20px;">&nbsp;{PAGE_VALUE}</option>
+			<!-- END page_code_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- page code -->
+<tr>
+	<td width="100">{TEXT_SEARCHING}:</td>
+	<td width="240">
+		<select name="searching" style="width: 240px;">
+			<option value="1">{TEXT_ENABLED}</option>
+			<option value="0"{SEARCHING_DISABLED}>{TEXT_DISABLED}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">&nbsp;</td>
+	<td colspan="4">
+		<input type="submit" name="submit" value="{TEXT_SAVE} {SECTION_SETTINGS}" style="width: 117px;" />
+		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+</form>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/header.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/header.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/wb_theme/templates/header.htt	(revision 1529)
@@ -22,7 +22,6 @@
 <script src="{WB_URL}/include/jquery/jquery-include.js" type="text/javascript"></script>
 <!--[if lt IE 7]><script type="text/javascript" src="{WB_URL}/include/jquery/plugins/jquery-pngFix.js"></script><![endif]-->
 <script src="{THEME_URL}/jquery/jquery-plugins.js" type="text/javascript"></script>
-<script src="{WB_URL}/include/editarea/edit_area_full.js" type="text/javascript"></script>
 {BACKEND_MODULE_JS}
 <script type="text/javascript">
 function confirm_link(message, url) {
Index: branches/2.8.x/wb/templates/argos_theme/images/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/argos_theme/languages/NL.php
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/languages/NL.php	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/languages/NL.php	(revision 1529)
@@ -1,33 +1,32 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-//Modul Description
-$template_description 	= 'Geavanceerde admin-template voor Website Baker 2.8.';
-
-//Texts
-$TEXT['ADMIN_ONLY'] = 'Instellingen alleen beschikbaar voor administrator';
-$TEXT['NO_SHOW_THUMBS'] = 'Thumbnails niet weergeven';
-$TEXT['TEXT_HEADER'] = 'Stel de maximale grootte voor \'resized\' afbeeldingen in per folder</b><br><small><i>(NB: werkt alleen bij nieuwe uploads)</i></small>';
-?>
\ No newline at end of file
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+//Modul Description
+$template_description 	= 'Geavanceerde admin-template voor Website Baker 2.8.';
+
+//Texts
+$TEXT['ADMIN_ONLY'] = 'Instellingen alleen beschikbaar voor administrator';
+$TEXT['NO_SHOW_THUMBS'] = 'Thumbnails niet weergeven';
+$TEXT['TEXT_HEADER'] = 'Stel de maximale grootte voor \'resized\' afbeeldingen in per folder</b><br><small><i>(NB: werkt alleen bij nieuwe uploads)</i></small>';
Index: branches/2.8.x/wb/templates/argos_theme/languages/EN.php
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/languages/EN.php	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/languages/EN.php	(revision 1529)
@@ -1,33 +1,32 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-//Modul Description
-$template_description 	= 'Enhanced backend theme for Website Baker 2.8.';
-
-//Texts
-$TEXT['ADMIN_ONLY'] = 'Settings for administrator only';
-$TEXT['NO_SHOW_THUMBS'] = 'Hide thumbnails';
-$TEXT['TEXT_HEADER'] = 'Set maximum imagesize for a folder</b><br><small><i>(resizing on new uploads only)</i></small>';
-?>
\ No newline at end of file
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+//Modul Description
+$template_description 	= 'Enhanced backend theme for Website Baker 2.8.';
+
+//Texts
+$TEXT['ADMIN_ONLY'] = 'Settings for administrator only';
+$TEXT['NO_SHOW_THUMBS'] = 'Hide thumbnails';
+$TEXT['TEXT_HEADER'] = 'Set maximum imagesize for a folder</b><br><small><i>(resizing on new uploads only)</i></small>';
Index: branches/2.8.x/wb/templates/argos_theme/languages/FR.php
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/languages/FR.php	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/languages/FR.php	(revision 1529)
@@ -1,33 +1,32 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-//Modul Description
-$template_description 	= 'Enhanced backend theme for Website Baker 2.8.';
-
-//Texts
-$TEXT['ADMIN_ONLY'] = 'Seul l&apos;administrateur peut modifier ces r&eacute;glages';
-$TEXT['NO_SHOW_THUMBS'] = 'Cacher les vignettes';
-$TEXT['TEXT_HEADER'] = 'D&eacute;finir la taille des images par dossier</b><br><small><i>(Redimensionnement seulement lors d&apos;un nouvel upload)</i></small>';
-?>
\ No newline at end of file
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+//Modul Description
+$template_description 	= 'Enhanced backend theme for Website Baker 2.8.';
+
+//Texts
+$TEXT['ADMIN_ONLY'] = 'Seul l&apos;administrateur peut modifier ces r&eacute;glages';
+$TEXT['NO_SHOW_THUMBS'] = 'Cacher les vignettes';
+$TEXT['TEXT_HEADER'] = 'D&eacute;finir la taille des images par dossier</b><br><small><i>(Redimensionnement seulement lors d&apos;un nouvel upload)</i></small>';
Index: branches/2.8.x/wb/templates/argos_theme/languages/DE.php
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/languages/DE.php	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/languages/DE.php	(revision 1529)
@@ -1,34 +1,33 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-//Modul Description
-$template_description 	= 'Ein erweitertes Backend-Theme f&uuml;r Websitebaker 2.8';
-
-//Texts
-$TEXT['ADMIN_ONLY'] = 'diese Optionen nur Administratoren zug&auml;nglich machen';
-$TEXT['NO_SHOW_THUMBS'] = 'Vorschaubilder verstecken';
-$TEXT['TEXT_HEADER'] = 'Maximale Bildergr&ouml;&szlig;e f&uuml;r Ordner festlegen</b><br><small><i>(&Auml;nderung nur beim Hochladen)</i></small>';
-
-?>
\ No newline at end of file
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+//Modul Description
+$template_description 	= 'Ein erweitertes Backend-Theme f&uuml;r Websitebaker 2.8';
+
+//Texts
+$TEXT['ADMIN_ONLY'] = 'diese Optionen nur Administratoren zug&auml;nglich machen';
+$TEXT['NO_SHOW_THUMBS'] = 'Vorschaubilder verstecken';
+$TEXT['TEXT_HEADER'] = 'Maximale Bildergr&ouml;&szlig;e f&uuml;r Ordner festlegen</b><br><small><i>(&Auml;nderung nur beim Hochladen)</i></small>';
+
Index: branches/2.8.x/wb/templates/argos_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/theme.css	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/theme.css	(revision 1529)
@@ -1,170 +1,137 @@
-
-html {overflow:-moz-scrollbars-vertical; /* Force firefox to always show room for a vertical scrollbar */}
-
-body,td,th,input,textarea {font-family:verdana,arial,helvetica,sans-serif;font-size:11px;color:#333;}
-body {background:#f9f9f9 url(images/background.jpg) 0 0 repeat-x;margin:0;text-align:center;}
-img {border:0px;}
-
-#admin_header {text-align:center;width:900px;height:105px;margin:0 auto;padding:10px 0 0 0;}
-#admin_header a#website_title {display:block;text-align:left;font-size:14px;font-weight:bold;color:#fff;text-transform:uppercase;text-decoration:none;}
-#topmenu {float:right;text-align:right;color:#fff;}
-#topmenu a {font-size:11px;color:#fff;text-decoration:underline;margin:0 5px;}
-#topmenu .version {font-size:11px;color:#7cacda;padding:0 10px 0 0;}
-#header_top {height:78px;}
-
-h1 {text-align:left;font-size:15px;color:#fff;text-transform:uppercase;}
-h2 {text-align:left;font-size:18px;color:#000;margin:5px 0;font-family:arial,sans-serif;letter-spacing:-1px;font-weight:normal;}
-h3 {text-align:left;font-size:14px;color:#000;margin:5px 0;}
-
-a:link, a:visited, a:active {color:#28609b;text-decoration:none;}
-a:hover {text-decoration:underline;color:#28609b;}
-
-.menu {margin:0 auto;padding:0;text-align:center;width:900px;}
-.menu ul {list-style-type:none;margin:0;padding:0;}
-.menu li {display:inline;margin:0 2px 0 0;padding:0;font-weight:bold;border-bottom:3px solid #c9c9c9;}
-.menu a {float:left;color:#fff !important;background:#28609b url(images/tabl.jpg) no-repeat left top;margin:0 5px 0 0;padding:0 0 0 3px;text-decoration:none;border-bottom:3px solid #cacaca;}
-.menu a span {display:block;background:#28609b url(images/tabr.jpg) no-repeat right top;padding:6px 9px 6px 6px;}
-.menu a:hover, .menu a:hover span {background-color:#28609b;text-decoration:none;}
-.menu .current a, .menu a:hover {border-bottom:3px solid #d25e59;}
-
-#content_container {text-align:center;width:900px;clear:both;margin:0 auto;}
-.content {margin:0;padding:20px 0;width:900px;text-align:left;vertical-align:top;}
-hr {margin:15px 0;color:#003366;height:1px;}
-
-.hide {display:none;}
-.note {color:#666;font-size:11px;}
+html { overflow :-moz-scrollbars-vertical; /* Force firefox to always show room for a vertical scrollbar */ }
+body,td,th,input,textarea { font-family :verdana,arial,helvetica,sans-serif; font-size :11px; color :#333333; }
+body { background :url(images/background.jpg) #f9f9f9 0 0 repeat-x; margin :0; text-align :center; }
+img { border :0px; }
+#admin_header { text-align :center; width :900px; height :105px; margin :0 auto; padding :10px 0 0 0; }
+#admin_header a#website_title { display :block; text-align :left; font-size :14px; font-weight :bold; color :#ffffff; text-transform :uppercase; text-decoration :none; }
+#topmenu { float :right; text-align :right; color :#ffffff; }
+#topmenu a { font-size :11px; color :#ffffff; text-decoration :underline; margin :0 5px; }
+#topmenu .version { font-size :11px; color :#7cacda; padding :0 10px 0 0; }
+#header_top { height :78px; }
+h1 { text-align :left; font-size :15px; color :#ffffff; text-transform :uppercase; }
+h2 { text-align :left; font-size :18px; color :#000000; margin :5px 0; font-family :arial,sans-serif; letter-spacing :-1px; font-weight :normal; }
+h3 { text-align :left; font-size :14px; color :#000000; margin :5px 0; }
+a:link, a:visited, a:active { color :#28609b; text-decoration :none; }
+a:hover { text-decoration :underline; color :#28609b; }
+.menu { margin :0 auto; padding :0; text-align :center; width :900px; }
+.menu ul { list-style-type :none; margin :0; padding :0; }
+.menu li { display :inline; margin :0 2px 0 0; padding :0; font-weight :bold; border-bottom :3px solid #c9c9c9; }
+.menu a { float :left; color :#ffffff !important; background :url(images/tabl.jpg) #28609b no-repeat left top; margin :0 5px 0 0; padding :0 0 0 3px; text-decoration :none; border-bottom :3px solid #cacaca; }
+.menu a span { display :block; background :url(images/tabr.jpg) #28609b no-repeat right top; padding :6px 9px 6px 6px; }
+.menu a:hover, .menu a:hover span { background-color :#28609b; text-decoration :none; }
+.menu .current a, .menu a:hover { border-bottom :3px solid #d25e59; }
+#content_container { text-align :center; width :900px; clear :both; margin :0 auto; }
+.content { margin :0; padding :20px 0; width :900px; text-align :left; vertical-align :top; }
+hr { margin :15px 0; color :#003366; height :1px; }
+.hide { display :none; }
+.note { color :#666666; font-size :11px; }
 .center { text-align :center; }
-
-form {margin:0;}
-label {cursor:pointer;}
-input:focus, select:focus, textarea:focus {background:#f1f8fd;}
-
+form { margin :0; }
+label { cursor :pointer; }
+input:focus, select:focus, textarea:focus { background :#f1f8fd; }
 /* WB2.8 STYLES */
-.img_noborder img {border:0;}
-iframe {border:1px solid #35373a;}
-div.box {font-size:11px;width:100%;text-align:right;margin:-10px 0 0 0;}
-.section {margin-top:10px;padding:0;border:1px solid #999;height:75px;width:100%;background-color:#fdfdfd;}
-.graphic {width:50px;height:50px;border:4px solid #fdfdfd;padding-left:3px;}
-.graphic img {vertical-align:middle;background-color:#fff;padding:4px;border:1px solid #d0d0d0;}
-.title {text-align:left;font-weight:bold;font-size:14px;margin-bottom:5px;}
-span.title { display :block;}
-.description {text-align:left;padding:4px 4px 0 4px;}
-.note {color:#666;font-size:11px;}
-.bold {font-weight:bold;}
-
-.submit, .cancel {width:100px;margin-top:5px;}
-.form_submit {width:100%;}
-.form_submit .left {text-align:left;}
-.form_submit .right {text-align:right;}
-.input_small {width:20px;}
-.input_narrow {width:100px;}
-.input_normal {width:120px;}
-.input_medium {width:150px;}
-.input_wide {width:200px;}
-.input_large {width:300px;}
-.input_full {width:100%;}
-select option.disabled {color:#aaa;}
-
-.jsadmin_drag img {margin-top:2px;vertical-align:top;cursor:pointer;}
-.jsadmin_drag img:hover {/* background-color:lightgrey;*/}
-.modify_link {padding:4px 0 0 7px;}
-
-.settings_table td {vertical-align:top;text-align:left;padding:5px;}
-.setting_name {width:10%;min-width:180px;}
-.setting_value {width:90%}
-.setting_value input, .setting_value select, .setting_value textarea {width:100%;}
-.setting_value textarea {height:50px;}
-
-#admintools ul {padding:0;margin:0;}
-#admintools li {list-style-type:none;display:inline;float:left;width:48%;margin:0 10px 0 0;}
-
-.value_input input, .value_input text, .value_input select {width:100%;}
-#file_mode input, #dir_mode input {width:12px;height:12px;}
-#hide2 {display:none;}
-
-.pages_list {font-weight:bold; margin :10px auto;}
-.pages_list .icon_col td img {display:block;border-style:none;float:left;padding-right:7px;}
-.pages_list table {width:900px;}
-.pages_list ul {margin:0;font-weight:normal;padding:0;}
-.pages_list ul li {list-style-type:none;margin:2px 0;}
-
-table.pages_view {width:900px;}
-table.pages_view tr, tr.sectionrow {background:#f0f0f0;line-height:2.2em;}
-table.pages_view tr:hover, tr.sectionrow:hover {background:#eaeff6;}
-tr.sectionrow {padding:0 10px;}
-tr.sectionrow td {border-top:3px solid #f9f9f9;}
-
-.page_list {display:none;}
-.page_list_show li {display:block;}
-img.page_list_rights {border:none;float:left;margin:0;vertical-align:middle;padding :2px;}
-
-.sections_list {font-weight:bold;padding-left:10px;}
-.sections_list table {width:900px;}
-
-.header_list_type {text-align:left;}
-.header_list_block {text-align:left;width:180px;}
-.header_list_pubdate_start {text-align:left;width:200px;}
-.header_list_pubdate_end {text-align:left;width:200px;}
-.header_list_sections_actions {text-align:left;width:30px;}
-.header_list_section_id {width:30px;text-align:right;}
-
-.list_section_id {width:30px;text-align:right;}
-.list_pubdate_start {text-align:left;width:200px;}
-.list_pubdate_end {text-align:left;width:200px;}
-
-.header_list_menu_title {text-align:left;padding-left:30px;}
-.header_list_page_title {width:334px;text-align:left;}
-.header_list_page_id {width:30px;text-align:left;}
-.header_list_actions {width:178px;text-align:left;}
-
-.list_menu_title {text-align:left;}
-.list_page_title {width:300px;text-align:left;}
-
-.list_page_id {width:50px;text-align:right;padding-right:15px;}
-.list_actions {width:25px;text-align:left;}
-
-.value_page_code {color:#006400;font-weight:bold;width:240px;}
-.list_page_code {width:240px;}
-.list_page_language {width:240px;}
-#multi_lingual {font-weight:bold;}
-.right{text-align:right;}
-.left{text-align:left;}
-
+.img_noborder img { border :0; }
+iframe { border :1px solid #35373a; }
+div.box { font-size :11px; width :100%; text-align :right; margin :-10px 0 0 0; }
+.section { margin-top :10px; padding :0; border :1px solid #999999; height :75px; width :100%; background-color :#fdfdfd; }
+.graphic { width :50px; height :50px; border :4px solid #fdfdfd; padding-left :3px; }
+.graphic img { vertical-align :middle; background-color :#ffffff; padding :4px; border :1px solid #d0d0d0; }
+.title { text-align :left; padding :4px 5px 0px 3px; font-weight :bold; font-size :14px; margin-bottom :5px; }
+span.title { display :block; }
+.description { text-align :left; padding :4px 0px 0 0px; }
+.note { color :#666666; font-size :11px; }
+.bold { font-weight :bold; }
+.submit, .cancel { width :100px; margin-top :5px; }
+.form_submit { width :100%; }
+.form_submit .left { text-align :left; }
+.form_submit .right { text-align :right; }
+.input_small { width :20px; }
+.input_narrow { width :100px; }
+.input_normal { width :120px; }
+.input_medium { width :150px; }
+.input_wide { width :200px; }
+.input_large { width :300px; }
+.input_full { width :100%; }
+select option.disabled { color :#aaaaaa; }
+.jsadmin_drag img { margin-top :2px; vertical-align :top; cursor :pointer; }
+.jsadmin_drag img:hover { }
+.modify_link { padding :4px 0 0 7px; }
+.settings_table td { vertical-align :top; text-align :left; padding :5px; }
+.setting_name { width :10%; min-width :180px; }
+.setting_value { width :90%; }
+.setting_value input, .setting_value select, .setting_value textarea { width :100%; }
+.setting_value textarea { height :50px; }
+#admintools ul { padding :0; margin :0; }
+#admintools li { list-style-type :none; display :inline; float :left; width :48%; margin :0 10px 0 0; }
+.value_input input, .value_input text, .value_input select { width :100%; }
+#file_mode input, #dir_mode input { width :12px; height :12px; }
+#hide2 { display :none; }
+.pages_list { font-weight :bold; margin :10px auto; }
+.pages_list .icon_col td img { display :block; border-style :none; float :left; padding-right :7px; }
+.pages_list table { width :900px; }
+.pages_list ul { margin :0; font-weight :normal; padding :0; }
+.pages_list ul li { list-style-type :none; margin :2px 0; }
+table.pages_view { width :900px; }
+table.pages_view tr, tr.sectionrow { background :#f0f0f0; line-height :2.2em; }
+table.pages_view tr:hover, tr.sectionrow:hover { background :#eaeff6; }
+tr.sectionrow { padding :0 10px; }
+tr.sectionrow td { border-top :3px solid #f9f9f9; }
+.page_list { display :none; }
+.page_list_show li { display :block; }
+img.page_list_rights { border :none; float :left; margin :0; vertical-align :middle; padding :2px; }
+.sections_list { font-weight :bold; padding-left :10px; }
+.sections_list table { width :900px; }
+.header_list_type { text-align :left; }
+.header_list_block { text-align :left; width :180px; }
+.header_list_pubdate_start { text-align :left; width :200px; }
+.header_list_pubdate_end { text-align :left; width :200px; }
+.header_list_sections_actions { text-align :left; width :30px; }
+.header_list_section_id { width :30px; text-align :right; }
+.list_section_id { width :30px; text-align :right; }
+.list_pubdate_start { text-align :left; width :200px; }
+.list_pubdate_end { text-align :left; width :200px; }
+.header_list_menu_title { text-align :left; padding-left :30px; }
+.header_list_page_title { width :334px; text-align :left; }
+.header_list_page_id { width :30px; text-align :left; }
+.header_list_actions { width :178px; text-align :left; }
+.list_menu_title { text-align :left; }
+.list_page_title { width :300px; text-align :left; }
+.list_page_id { width :50px; text-align :right; padding-right :15px; }
+.list_actions { width :25px; text-align :left; }
+.value_page_code { color :#006400; font-weight :bold; width :240px; }
+.list_page_code { width :240px; }
+.list_page_language { width :240px; }
+#multi_lingual { font-weight :bold; }
+.right{ text-align :right; }
+.left{ text-align :left; }
 /* set div layers in dead tables */
-.subcolumns {width:100%;overflow:hidden;margin:10px 0;}
-.subcolumns_oldgecko {width:100%;float:left;margin:10px 0;}
-
-.c10l, .c20l, .c25l, .c33l, .c40l, .c38l, .c50l, .c60l, .c62l, .c66l, .c75l, .c80l {float:left;}
-.c10r, .c20r, .c25r, .c33r, .c40r, .c38r, .c50r, .c60r, .c66r, .c62r, .c75r, .c80r {float:right;margin-left:-5px;}
-
-.c10l, .c10r {width:10%;}
-.c20l, .c20r {width:20%;line-height:2em;}
-.c40l, .c40r {width:40%;}
-.c60l, .c60r {width:60%;height:2em;}
-.c25l, .c25r {width:28%;}
-.c33l, .c33r {width:33.333%;}
-.c50l, .c50r {width:50%;}
-.c66l, .c66r {width:66.666%;}
-.c38l, .c38r {width:38.2%;}
-.c62l, .c62r {width:61.8%;}
-.subc {padding:0 0.5em;}
-.subcl {padding:0 1em 0 0;}
-.subcr {padding:0 0 0 1em;}
-
-.c80l, .c80r, .c90l, .c90r {width:80%;}
-.c75l, .c75r, .c80l, .c80r {width:75%;}
-
-.info {padding:10px;margin-bottom:0.5em;background:#f8f8f8;color:#666;font-size:11px;}
-.note {border:2px #484 solid;padding:10px;margin:10px auto;background:#efe;color:#040;}
-.important {border:2px #884 solid;padding:10px; margin-bottom:1em;background:#ffe;color:#440;}
-.warning {border:2px #844 solid;padding:10px;margin:1em auto;background:#fee;color:#400;}
-
-.row_0 {background-color:transparent;}
-.row_1 {background-color:#ccddee;}
-
+.subcolumns { width :100%; overflow :hidden; margin :10px 0; }
+.subcolumns_oldgecko { width :100%; float :left; margin :10px 0; }
+.c10l, .c20l, .c25l, .c33l, .c40l, .c38l, .c50l, .c60l, .c62l, .c66l, .c75l, .c80l { float :left; }
+.c10r, .c20r, .c25r, .c33r, .c40r, .c38r, .c50r, .c60r, .c66r, .c62r, .c75r, .c80r { float :right; margin-left :-5px; }
+.c10l, .c10r { width :10%; }
+.c20l, .c20r { width :20%; line-height :2em; }
+.c40l, .c40r { width :40%; }
+.c60l, .c60r { width :60%; height :2em; }
+.c25l, .c25r { width :28%; }
+.c33l, .c33r { width :33.333%; }
+.c50l, .c50r { width :50%; }
+.c66l, .c66r { width :66.666%; }
+.c38l, .c38r { width :38.2%; }
+.c62l, .c62r { width :61.8%; }
+.subc { padding :0 0.5em; }
+.subcl { padding :0 1em 0 0; }
+.subcr { padding :0 0 0 1em; }
+.c80l, .c80r, .c90l, .c90r { width :80%; }
+.c75l, .c75r, .c80l, .c80r { width :75%; }
+.info { padding :10px; margin-bottom :0.5em; background :#f8f8f8; color :#666666; font-size :11px; }
+.note { border :2px #448844 solid; padding :10px; margin :10px auto; background :#eeffee; color :#004400; }
+.important { border :2px #888844 solid; padding :10px; margin-bottom :1em; background :#ffffee; color :#444400; }
+.warning { border :2px #884444 solid; padding :10px; margin :1em auto; background :#ffeeee; color :#440000; }
+.row_0 { background-color :transparent; }
+.row_1 { background-color :#ccddee; }
 div.content_box { margin :0em auto; }
-div.content_box form { width: 98%; }
-
+div.content_box form { width :98%; }
 #language,
 #timezone,
 #date_format,
@@ -174,22 +141,18 @@
 #email,
 #new_password_1,
 #new_password_2,
-#current_password {width:118%;}
-
+#current_password { width :118%; }
 #submit,
-#reset {max-width:100px;}
-
-div#username {height:17px;width:118%;text-align:left;font-weight:bold;margin:0;} 
-.save_section {margin:20px auto 5px auto;}
-.section-info { margin : 1.5em 0; }
-
+#reset { max-width :100px; }
+div#username { height :17px; width :118%; text-align :left; font-weight :bold; margin :0; }
+.save_section { margin :20px auto 5px auto; }
+.section-info { margin :1.5em 0; }
 .rounded { border-radius :10px; -khtml-border-radius :10px; -webkit-border-radius :10px; -moz-border-radius :10px; }
 .bigger { font-size :150%; }
 .strong { font-weight :bold; }
-
-.msg-box { background : #e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :center; }
-.error-box { background :#fee; border :0.2em #844 solid; color :#400; margin-bottom :1em; padding :0.63em; text-align :center; }
+.msg-box { background :#e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :center; }
+.error-box { background :#ffeeee; border :0.2em #884444 solid; color :#440000; margin-bottom :1em; padding :0.63em; text-align :center; }
 .msg-box p,
 .error-box p { font-size :120%; }
 select > option.user-inactive { color :#990000; }
-button.status { cursor :pointer; border-radius :5px; -khtml-border-radius :5px; -webkit-border-radius :5px; -moz-border-radius :5px; }
\ No newline at end of file
+button.status { cursor :pointer; border-radius :5px; -khtml-border-radius :5px; -webkit-border-radius :5px; -moz-border-radius :5px; }
Index: branches/2.8.x/wb/templates/argos_theme/templates/addons.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/addons.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/addons.htt	(nonexistent)
@@ -1,60 +0,0 @@
-<!-- BEGIN main_block -->
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td valign="middle" align="left"><h2>{ADDONS_OVERVIEW}</h2></td>
-		<td align="right">{URL_ADVANCED}</td>
-	</tr>
-</table>
-
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-	<tr>
-		<td align="center" valign="top">
-			<!-- BEGIN modules_block -->
-			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_MODULES} >
-				<tr>
-					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/modules/index.php"><img src="{THEME_URL}/icons/modules.png" alt="0" /> </a> </td>
-					<td class="description" valign="top"><a href="{ADMIN_URL}/modules/index.php"><span class="title">{MODULES}</span></a><p>{MODULES_OVERVIEW}</p></td>
-				</tr>
-			</table>
-			<!-- END modules_block -->
-			<!-- BEGIN templates_block -->
-			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_TEMPLATES} >
-				<tr>
-					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/templates/index.php"><img src="{THEME_URL}/icons/templates.png" alt="{TEMPLATES}" /> </a> </td>
-					<td class="description" valign="top"><a href="{ADMIN_URL}/templates/index.php"><span class="title">{TEMPLATES}</span></a><p>{TEMPLATES_OVERVIEW}</p></td>
-				</tr>
-			</table>
-			<!-- END templates_block -->
-			<!-- BEGIN languages_block -->
-			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_LANGUAGES} >
-				<tr>
-					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/languages/index.php"><img src="{THEME_URL}/icons/languages.png" alt="{LANGUAGES}" /> </a> </td>
-					<td class="description" valign="top"> <a href="{ADMIN_URL}/languages/index.php"><span class="title">{LANGUAGES}</span></a><p>{LANGUAGES_OVERVIEW}</p></td>
-				</tr>
-			</table>
-			<!-- END languages_block -->
-			<!-- BEGIN reload_block -->
-			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_RELOAD} >
-				<tr>
-					<td class="graphic" align="center" valign="middle" rowspan="2"><img src="{THEME_URL}/icons/admintools.png" alt="{TXT_ADMIN_SETTINGS}" /> </td>
-					<td class="description" valign="top"><span class="title">{TXT_ADMIN_SETTINGS}</span>
-						<form action="{RELOAD_URL}" method="post">
-						{FTAN}
-							{MESSAGE_RELOAD_ADDONS}
-							<br style="margin-bottom: 0.5em" />
-							<input {DISPLAY_MODULES} type="checkbox" name="reload_modules" id="reload_modules" value="true" />
-							<label {DISPLAY_MODULES} for="reload_modules">{MODULES}</label>
-							<input {DISPLAY_TEMPLATES} type="checkbox" name="reload_templates" id="reload_templates" value="true" />
-							<label {DISPLAY_TEMPLATES} for="reload_templates">{TEMPLATES}</label>
-							<input {DISPLAY_LANGUAGES} type="checkbox" name="reload_languages" id="reload_languages" value="true" />
-							<label {DISPLAY_LANGUAGES} for="reload_languages">{LANGUAGES}</label>
-							<input type="submit" name="submit" value="{TEXT_RELOAD}" />
-						</form>
-					</td>
-				</tr>
-			</table>
-			<!-- END reload_block -->
-		</td>
-	</tr>
-</table>
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt	(nonexistent)
@@ -1,59 +0,0 @@
-<!-- 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="120">
-		<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}&amp;id={TEMP_ID}');"><img src="{THEME_URL}/images/delete_16.png" alt="{TEXT_DELETE}" border="0" /></a>&nbsp;&nbsp;
-	</td>
-   <td width="16" align="right" class="">
-	   <img src="{THEME_URL}/images/{IMAGE_EXIST}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" />
-   </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/users.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/users.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/users.htt	(nonexistent)
@@ -1,32 +0,0 @@
-<!-- BEGIN main_block -->
-
-<form name="users" action="users.php" method="post">
-<input type="hidden" name="userstatus" value="{USER_STATUS}" />
-{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_USER}</h2></td>
-		<td align="right">
-		<!-- BEGIN manage_groups_block -->
-		<a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a>
-		<!-- END manage_groups_block -->
-		</td>
-     </tr>
-</table>
-<button type="button" name="status" title="{TEXT_USERS}" style="width: 30px; background: {STATUS_ICON} no-repeat center" value="{USER_STATUS}" onclick="javascript: window.location = 'index.php?status={USER_STATUS}';" class="status {DISPLAY_MODIFY}" >&nbsp;</button>
-<select name="user_id" style="width: 500px;">
-<!-- BEGIN list_block -->
-	<option value="{VALUE}" {STATUS}>{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 style="margin-top: 20px;" class="{DISPLAY_ADD}">{HEADING_ADD_USER}</h2>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/access.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/access.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/access.htt	(nonexistent)
@@ -1,33 +0,0 @@
-<!-- BEGIN main_block -->
-<h2>{ACCESS}</h2>
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-	<tr>
-		<td align="center" valign="top">
-			<!-- BEGIN users_block -->	
-			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_USERS} >
-				<tr>
-					<td class="graphic" align="center" valign="top" rowspan="2">
-						<a href="{ADMIN_URL}/users/index.php"><img src="{THEME_URL}/icons/users.png" alt="{USERS}" /></a>
-					</td>
-					<td class="description" valign="top">
-						<a href="{ADMIN_URL}/users/index.php"><span class="title">{USERS}</span></a><p>{USERS_OVERVIEW}</p>
-					</td>
-				</tr>
-			</table>	
-			<!-- END users_block -->
-			<!-- BEGIN groups_block -->		
-			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
-				<tr>
-					<td class="graphic" align="center" valign="top" rowspan="2">
-						<a href="{ADMIN_URL}/groups/index.php"><img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" /></a>
-					</td>
-					<td class="description" valign="top">
-						<a href="{ADMIN_URL}/groups/index.php"><span class="title">{GROUPS}</span></a><p>{GROUPS_OVERVIEW}</p>
-					</td>
-				</tr>
-			</table>
-			<!-- END groups_block -->
-		</td>
-	</tr>
-</table>
-<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt	(nonexistent)
@@ -1,114 +0,0 @@
-<!-- BEGIN main_block -->
-<h2>{HEADING_MY_SETTINGS}</h2>
-<div class="content_box">
-	<form name="{FORM_NAME}" id="{FORM_NAME}" action="{ACTION_URL}" method="post">
-		{FTAN}
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_USERNAME}:</label><br />
-				</div>
-				<div class="c60l">
-					<div id="username">{USERNAME}</div><br />
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_DISPLAY_NAME}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="text" id="display_name" name="display_name" value="{DISPLAY_NAME}" /><br />
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_LANGUAGE}:</label><br />
-				</div>
-				<div class="c60l">
-				<select name="language" id="language">
-					<!-- BEGIN language_list_block -->
-						<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
-					<!-- END language_list_block -->
-					</select>
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_TIMEZONE}:</label><br />
-				</div>
-				<div class="c60l">
-					<select name="timezone" id="timezone">
-						<!-- BEGIN timezone_list_block -->
-							<option value="{VALUE}"{SELECTED}>{NAME}</option>
-						<!-- END timezone_list_block -->
-					</select>
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_DATE_FORMAT}:</label><br />
-				</div>
-				<div class="c60l">
-					<select name="date_format" id="date_format">
-						<!-- BEGIN date_format_list_block -->
-							<option value="{VALUE}"{SELECTED}>{NAME}</option>
-						<!-- END date_format_list_block -->
-					</select>
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_TIME_FORMAT}:</label><br />
-				</div>
-				<div class="c60l">
-					<select name="time_format" id="time_format">
-						<!-- BEGIN time_format_list_block -->
-							<option value="{VALUE}"{SELECTED}>{NAME}</option>
-						<!-- END time_format_list_block -->
-					</select>
-				</div>
-			</div>
-
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_EMAIL}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="text" id="email" name="email" value="{EMAIL}" /><br />
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_NEW_PASSWORD}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="password" id="new_password_1" name="new_password_1" value="{EMPTY_STRING}" /><br />
-				</div>
-			</div>
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_RETYPE_NEW_PASSWORD}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" /><br />
-				</div>
-			</div>
-			<hr />
-			<div class="subcolumns">
-				<div class="c25l">
-					<label>{TEXT_NEED_CURRENT_PASSWORD}:</label><br />
-				</div>
-				<div class="c60l">
-					<input type="password" id="current_password" name="current_password" value="{EMPTY_STRING}" /><br />
-				</div>
-			</div>
-			<div class="subcolumns save_section">
-				<div class="c60l">
-					<input type="submit" id="submit" name="submit" value="{TEXT_SAVE}" />
-					<input type="reset" id="reset" name="reset" value="{TEXT_RESET}" />
-				</div>
-				<div class="c25l">&nbsp;</div>
-			</div>
-	</form>
-</div>
-
-<!-- END main_block -->
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 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/media_rename.htt	(nonexistent)
@@ -1,61 +0,0 @@
-<!-- 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/templates.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/templates.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/templates.htt	(nonexistent)
@@ -1,88 +0,0 @@
-<!-- BEGIN main_block -->
-
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
-		<td align="right">
-			{URL_MODULES}
-			-
-			{URL_LANGUAGES}
-			-
-			{URL_ADVANCED}
-		</td>
-     </tr>
-</table>
-
-<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
-{FTAN}
-
-<h2>{HEADING_INSTALL_TEMPLATE}</h2>
-
-<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td>
-		<input type="file" name="userfile" size="82" />
-		<script type="text/javascript">
-		document.install.userfile.focus();
-		</script>
-	</td>
-	<td width="110" align="left">
-		<input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" />
-	</td>
-</tr>
-</table>
-
-<br />
-
-</form>
-
-<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
-{FTAN}
-
-<h2>{HEADING_UNINSTALL_TEMPLATE}</h2>
-
-<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td>
-		<select name="file" style="width: 97%;">
-		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN template_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-		<!-- END template_list_block -->
-		</select>
-	</td>
-	<td width="110">
-		<input type="submit" name="submit" value="{TEXT_UNINSTALL}" style="width: 100px;" />
-	</td>
-</tr>
-</table>
-
-<br />
-
-</form>
-
-<form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
-{FTAN}
-
-<h2>{HEADING_TEMPLATE_DETAILS}</h2>
-
-<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td>
-		<select name="file" style="width: 97%;">
-		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN template_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-		<!-- END template_list_block -->
-		</select>
-	</td>
-	<td width="110">
-		<input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
-	</td>
-</tr>
-</table>
-
-<br />
-</form>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/pages_modify.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/pages_modify.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/pages_modify.htt	(nonexistent)
@@ -1,25 +0,0 @@
-<!-- BEGIN main_block -->
-
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-<tr style="background:#f0f0f0;">
-	<td valign="middle" align="left"><h2>{HEADING_MODIFY_PAGE}</h2></td>
-	<td align="left" width="20%">ID: {PAGE_ID}</td>
-	<td align="right">
-		{TEXT_CURRENT_PAGE}:
-		<b>{PAGE_TITLE}</b>
-		- 
-		<a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}">{TEXT_CHANGE_SETTINGS}</a>
-<!-- BEGIN show_section_block -->
-		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
-		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
-<!-- END show_section_block -->
-		<font style="color:#999;" class="{CLASS_DISPLAY_MODIFIED}"><br />
-<!-- BEGIN show_modify_block -->
-		{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
-<!-- END show_modify_block -->
-		</font>
-	</td>
-</tr>
-</table>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/groups.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/groups.htt	(nonexistent)
@@ -1,30 +0,0 @@
-<!-- BEGIN main_block -->
-
-<form name="groups" action="groups.php" method="post">
- {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/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt	(nonexistent)
@@ -1,70 +0,0 @@
-<!-- BEGIN main_block -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>Retrieve Login Details</title>
-<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
-<meta http-equiv="content-language" content="{LANGUAGE}" />
-<meta name="description" content="Retrieve Login Details" />
-<meta name="keywords" content="Retrieve Login Details" />
-<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
-</head>
-<body onload="document.forgot_pass.email.focus();">
-
-<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
-	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
-	{SECTION_FORGOT}
-</div> 
-
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
-<tr>
-	<td class="content">
-	
-	<form name="forgot_pass" action="{ACTION_URL}" method="post">
-	<input type="hidden" name="url" value="{URL}" />
-		<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
-		<tr>
-			<td height="40" align="center" style="color: #{MESSAGE_COLOR};" colspan="2">{MESSAGE}</td>
-		</tr>
-		<tr style="{DISPLAY_FORM}">
-			<td height="10" colspan="2"></td>
-		</tr>
-		<tr style="{DISPLAY_FORM}">
-			<td width="165" height="30" align="right">{TEXT_EMAIL}:</td>
-			<td><input type="text" maxlength="255" name="email" value="{EMAIL}" style="width: 180px;" /></td>
-		</tr>
-		<tr style="{DISPLAY_FORM}" height="30">
-			<td>&nbsp;</td>
-			<td><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;"></td>
-		</tr>
-		<tr style="{DISPLAY_FORM}">
-			<td height="10" colspan="2"></td>
-		</tr>
-		</table>
-	</form>
-	
-	<center>
-		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>
-		<br />
-		<br />
-		<a href="{WB_URL}/">{TEXT_HOME}</a>
-	</center>
-
-	</td>
-</tr>
-</table>
-
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0px 10px 0px;">
-<tr>
-	<td style="font-size:12px;text-align:center;">
-      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
-      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
-      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-	</td>
-</tr>
-</table>
-
-</body>
-</html>
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/success.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/success.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/success.htt	(nonexistent)
@@ -1,11 +0,0 @@
-<!-- BEGIN main_block -->
-<div class="msg-box rounded">
-	<p>{MESSAGE}</p>
-<!-- BEGIN show_redirect_block -->
- <script type="text/javascript">
-  setTimeout("location.href='{REDIRECT}'", {REDIRECT_TIMER});
- </script>
-<!-- END show_redirect_block -->
-<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{REDIRECT}';" />
-</div>
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt	(nonexistent)
@@ -1,115 +0,0 @@
-<!-- BEGIN main_block -->
-<div class="jsadmin jcalendar hide"></div>
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td valign="middle" align="left"><h2>{HEADING_MANAGE_SECTIONS}</h2></td>
-		<td align="left" width="20%">ID: {PAGE_ID}</td>
-		<td align="right">{TEXT_CURRENT_PAGE}: <b>{PAGE_TITLE}</b>
-			-
-			<a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{HEADING_MODIFY_PAGE}</a>
-			-
-			<a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}">{TEXT_CHANGE_SETTINGS}</a>
-		</td>
-     </tr>
-</table>
-
-        <form name="section_properties" action="{ADMIN_URL}/pages/sections_save.php?page_id={PAGE_IDKEY}" method="post">
-		{FTAN}
-		
-        <table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" class="img_noborder">
-			<tr class="sections_list">
-				<td class="header_list_type">{TEXT_TYPE}</td>
-				<td class="header_list_block"><span {STYLE_DISPLAY_SECTION_BLOCK}>{TEXT_BLOCK}&nbsp;</span></td>
-				<td class="header_list_pubdate_start">{TEXT_PUBL_START_DATE}</td>
-				<td class="header_list_pubdate_end">{TEXT_PUBL_END_DATE}</td>
-				<td class="header_list_sections_actions" colspan="3">{TEXT_ACTIONS}</td>
-				<td class="header_list_section_id">ID</td>
-				<td {DISPLAY_DEBUG}>{TEXT_PID}</td>
-			</tr>
-<!-- BEGIN section_block -->
-            	<tr class="sectionrow">
-    				<td align="right" style="display:none;">
-                      <input type="hidden" name="page_id" value="{PAGE_IDKEY}"  />
-                      <input type="hidden" name="section_id" value="{VAR_SECTION_ID}"  />
-                      {VAR_SECTION_ID}
-                    </td>
-					
-                    <td>{LINK_MODIFY_URL_VAR_MODUL_NAME}</td>
-					
-                    <td class="{INPUT_ATTRIBUTE}"><span {STYLE_DISPLAY_SECTION_BLOCK}>
-                    	<select name="block{VAR_SECTION_ID}" class="input_normal">
-                        {SET_NONE_DISPLAY_OPTION}
-                    	<!-- BEGIN block_block -->
-                    		<option value="{VALUE}"{SELECTED}>{NAME}</option>
-                    	<!-- END block_block -->
-                    	</select></span>&nbsp;
-                    </td>
-					
-                    <td class="list_pubdate_start"><input type="text" id="start_date{VAR_SECTION_ID}" name="start_date{VAR_SECTION_ID}" value="{VALUE_PUBL_START}" class="input_normal" />
-                        <img src="{THEME_URL}/images/calendar_16.png" id="trigger_start{VAR_SECTION_ID}" style="cursor:pointer;" title="{TEXT_CALENDAR}" alt="{TEXT_CALENDAR}"  />
-                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor:pointer;" alt="{TEXT_DELETE_DATE}" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.start_date{VAR_SECTION_ID}.value=''" />
-                    </td>
-					
-                    <td class="list_pubdate_end"><input type="text" id="end_date{VAR_SECTION_ID}" name="end_date{VAR_SECTION_ID}" value="{VALUE_PUBL_END}" class="input_normal" />
-                        <img src="{THEME_URL}/images/calendar_16.png" id="trigger_stop{VAR_SECTION_ID}" alt="{TEXT_CALENDAR}" style="cursor: pointer;" title="{TEXT_CALENDAR}"  />
-                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor:pointer;" alt="{TEXT_DELETE_DATE}" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.end_date{VAR_SECTION_ID}.value=''" />
-                    </td>
-
-					<td>{VAR_MOVE_UP_URL}</td>
-					
-                    <td>{VAR_MOVE_DOWN_URL}</td>
-
-                    <td>
-                        <a href="#" onclick="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_IDKEY}');">
-                        <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="{TEXT_DELETE}" border="0" />
-                        </a>
-                    </td>
-
-                    <td class="list_section_id">{VAR_SECTION_ID}</td>
-
-                    <td {DISPLAY_DEBUG}>{POSITION}</td>
-                </tr>
-<!-- END section_block -->
-                <tr>
-                    <td align="left" colspan="{DEBUG_COLSPAN_SIZE}">
-					<br />
-					<input type="submit" name="save" value="{TEXT_SAVE}" class="input_medium" />
-					</td>
-    	        </tr>
-	    </table>
-    </form>
-<br />
-	<h2>{TEXT_ADD_SECTION}</h2>
-	<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 summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%">
-    	<tr>
-    		<td width="50%" valign="middle">
-    			<select name="module" class="input_large">
-                <!-- BEGIN module_block -->
-    			 <option value="{VALUE}"{SELECTED}>{NAME}</option>
-                 <!-- END module_block -->
-    			</select>
-				&nbsp;&nbsp;
-				<input type="submit" name="submit" value="{TEXT_ADD}" class="input_medium" />
-   		  </td>
-    	</tr>
-   	  </table>
-	</form>
-    <!-- BEGIN calendar_block -->
-    <script type="text/javascript" >
-         var section_id = '{VAR_SECTION_ID}';
-         var start_date = '{start_date}';
-         var end_date = '{end_date}';
-         var trigger_start = '{trigger_start}';
-         var trigger_end = '{trigger_end}';
-         var jscal_today = '{jscal_today}';
-         var jscal_ifformat = '{jscal_ifformat}';
-         var jscal_firstday = {jscal_firstday};
-         var showsTime = {showsTime};
-         var timeFormat = {timeFormat};
-    </script>
-    <script type="text/javascript" src="{ADMIN_URL}/pages/page_calendar.js" ></script>
-    <!-- END calendar_block -->
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/languages_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/languages_details.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/languages_details.htt	(nonexistent)
@@ -1,32 +0,0 @@
-<!-- BEGIN main_block -->
-
-<h2>{HEADING_LANGUAGE_DETAILS}</h2>
-
-<table summary="" cellpadding="5" cellspacing="0" border="0">
-<tr>
-	<td width="100">{TEXT_NAME}:</td>
-	<td>{NAME}</td>
-</tr>
-<tr>
-	<td>{TEXT_CODE}:</td>
-	<td>{CODE}</td>
-</tr>
-<tr>
-	<td>{TEXT_AUTHOR}:</td>
-	<td>{AUTHOR}</td>
-</tr>
-<tr>
-	<td>{TEXT_VERSION}:</td>
-	<td>{VERSION}</td>
-</tr>
-<tr>
-	<td>{TEXT_DESIGNED_FOR}:</td>
-	<td>Website Baker {DESIGNED_FOR}</td>
-</tr>
-</table>
-
-<br />
-
-<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/modules_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/modules_details.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/modules_details.htt	(nonexistent)
@@ -1,36 +0,0 @@
-<!-- BEGIN main_block -->
-
-<h2>{HEADING_MODULE_DETAILS}</h2>
-
-<table summary="" cellpadding="5" cellspacing="0" border="0">
-<tr>
-	<td width="100">{TEXT_NAME}:</td>
-	<td>{NAME}</td>
-</tr>
-<tr>
-	<td>{TEXT_TYPE}:</td>
-	<td>{TYPE}</td>
-</tr>
-<tr>
-	<td>{TEXT_AUTHOR}:</td>
-	<td>{AUTHOR}</td>
-</tr>
-<tr>
-	<td>{TEXT_VERSION}:</td>
-	<td>{VERSION}</td>
-</tr>
-<tr>
-	<td>{TEXT_DESIGNED_FOR}:</td>
-	<td>Website Baker {DESIGNED_FOR}</td>
-</tr>
-<tr>
-	<td valign="top">{TEXT_DESCRIPTION}:</td>
-	<td style="text-align: justify;">{DESCRIPTION}</td>
-</tr>
-</table>
-
-<br />
-
-<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/modules.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/modules.htt	(nonexistent)
@@ -1,136 +0,0 @@
-<!-- BEGIN main_block -->
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td align="right">
-			{URL_TEMPLATES}
-			-
-			{URL_LANGUAGES}
-			-
-			{URL_ADVANCED}
-		</td>
-     </tr>
-</table>
-
-<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
-{FTAN}
-  <h2>{HEADING_INSTALL_MODULE}</h2>
-  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
-    <tr>
-      <td valign="middle">
-        <input type="file" name="userfile" size="97" />
-        <script type="text/javascript">
-		document.install.userfile.focus();
-		</script><br />
-        <input type="checkbox" name="overwrite" value="false"  />
-		<span>{OVERWRITE_NEWER_FILES}</span>
-      </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_MODULE}</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 module_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-          <!-- END module_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_MODULE_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 module_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-          <!-- END module_list_block -->
-        </select>
-      </td>
-      <td width="110">
-        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
-      </td>
-    </tr>
-  </table>
-  <br />
-</form>
-<div class="{DISPLAY_MANUAL_INSTALL}">
-  <h2>{HEADING_INVOKE_MODULE_FILES}</h2>
-  <p>{TEXT_MANUAL_INSTALLATION}</p>
-  <form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
-{FTAN}
-  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
-	  <tr>
-		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "install.php"</td>
-		<td valign="middle">
-			<input type="hidden" name="action" value="install" />
-			<select name="file" style="width: 250px;">
-	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN install_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-			<!-- END install_list_block -->
-			</select>
-			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
-		</td>
-	  </tr>
-  </table>
-  </form>
-  
-  <form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
-{FTAN}
-  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
-	  <tr>
-		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "upgrade.php"</td>
-		<td valign="middle" >
-			<input type="hidden" name="action" value="upgrade" />
-			<select name="file" style="width: 250px;">
-	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN install_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-			<!-- END install_list_block -->
-			</select>
-			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
-		</td>
-	  </tr>
-  </table>
-  </form>
-
-  <form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
-{FTAN}
-  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
-	  <tr>
-		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "uninstall.php"</td>
-		<td valign="middle">
-			<input type="hidden" name="action" value="uninstall" />
-			<select name="file" style="width: 250px;">
-	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN install_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-			<!-- END install_list_block -->
-			</select>
-			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
-			</td>
-	  </tr>
-  </table>
-  </form>
-
-  <p style="color:red;">{TEXT_MANUAL_INSTALLATION_WARNING}</p>
-</div>
-<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/login.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/login.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/login.htt	(nonexistent)
@@ -1,83 +0,0 @@
-<!-- BEGIN mainBlock -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>{TEXT_LOGIN}</title>
-<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
-<meta http-equiv="content-language" content="{LANGUAGE}" />
-<meta name="description" content="{TEXT_LOGIN}" />
-<meta name="keywords" content="{TEXT_LOGIN}" />
-<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
-</head>
-<body onload="document.login.{USERNAME_FIELDNAME}.focus();">
-<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
-	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
-	{TEXT_LOGIN}
-</div> 
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
-  <tr>
-    <td class="content">
-      <form name="login" action="{ACTION_URL}" method="post">
-        <input type="hidden" name="url" value="{URL}" />
-        <input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
-        <input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
-        <table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
-          <tr>
-            <td height="40" align="center" colspan="2">{MESSAGE}</td>
-          </tr>
-          <tr>
-            <td height="10" colspan="2"></td>
-          </tr>
-          <tr>
-            <td width="170" height="30" align="right">{TEXT_USERNAME}:</td>
-            <td>
-              <input type="text" maxlength="{MAX_USERNAME_LEN}" name="{USERNAME_FIELDNAME}" value="{USERNAME}" style="width: 180px;" />
-            </td>
-          </tr>
-          <tr>
-            <td width="170" height="30" align="right">{TEXT_PASSWORD}:</td>
-            <td>
-              <input type="password" maxlength="{MAX_PASSWORD_LEN}" name="{PASSWORD_FIELDNAME}" style="width: 180px;" />
-            </td>
-          </tr>
-          <tr style="{DISPLAY_REMEMBER_ME}">
-            <td>&nbsp;</td>
-            <td>
-              <input type="checkbox" name="remember" id="remember" value="true" />
-              <label for="remember">{TEXT_REMEMBER_ME}</label>
-            </td>
-          </tr>
-          <tr>
-            <td>&nbsp;</td>
-            <td>
-              <input type="submit" name="submit" value="{TEXT_LOGIN}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" />
-            </td>
-          </tr>
-          <tr>
-            <td height="10" colspan="2"></td>
-          </tr>
-        </table>
-      </form>
-      <center>
-        <a href="{FORGOTTEN_DETAILS_APP}">{TEXT_FORGOTTEN_DETAILS}</a> 
-		<br />
-        <br />
-        <br />
-        <a href="{WB_URL}/">{TEXT_HOME}</a>
-      </center>
-    </td>
-  </tr>
-</table>
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding:10px 0;">
-  <tr>
-    <td style="font-size:10px;text-align:center;">
-      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
-      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
-      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-    </td>
-  </tr>
-</table>
-</body>
-</html>
-<!-- END mainBlock -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt	(nonexistent)
@@ -1,178 +0,0 @@
-<!-- BEGIN main_block -->
-
-<script src="{ADMIN_URL}/pages/page_settings.js" type="text/javascript"></script>
-
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-  <tr style="background:#f0f0f0;">
-	<td valign="middle" align="left"><h2>{HEADING_MODIFY_PAGE_SETTINGS}</h2></td>
-	<td nowrap="nowrap">ID: {PAGE_ID}</td>
-	<td align="right">
-		{TEXT_CURRENT_PAGE}:
-		<b>{PAGE_TITLE}</b>
-		-
-		<a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{TEXT_MODIFY_PAGE}</a>
-		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
-		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
-		<br />
-		<font style="color:#999;" class="{DISPLAY_MODIFIED}">
-			{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
-		</font>
-	</td>
-  </tr>
-</table>
-
-<form name="settings" action="settings2.php" method="post">
-{FTAN}
-<input type="hidden" name="page_id" value="{PAGE_ID}" />
-<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
-<tr>
-	<td width="100" height="20">{TEXT_PAGE_TITLE}:</td>
-	<td width="240" height="20">
-		<input type="text" name="page_title" value="{PAGE_TITLE}" style="width: 232px;" />
-	</td>
-	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
-		{TEXT_ADMINISTRATORS}:
-		<ul style="list-style-type: none; margin: 0; padding: 0;">
-			<!-- BEGIN group_list_block -->
-			<li>
-			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-			<label for="admin_group_{TOGGLE}">{NAME}</label>
-			</li>
-			<!-- END group_list_block -->
-		</ul>
-	</td>
-	<td rowspan="10" valign="top" style="padding:8px 0 0 20px;">
-		<div id="allowed_viewers" style="{DISPLAY_VIEWERS}">
-			{TEXT_ALLOWED_VIEWERS}:
-			<ul style="list-style-type:none;margin:0;padding:0;">
-				<!-- BEGIN group_list_block2 -->
-				<li>
-				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<label for="viewing_group_{TOGGLE}">{NAME}</label>
-				</li>
-				<!-- END group_list_block2 -->
-			</ul>
-		</div>
-	</td>
-</tr>
-<tr>
-	<td width="100" height="20">{TEXT_MENU_TITLE}:</td>
-	<td width="240" height="20">
-		<input type="text" name="menu_title" value="{MENU_TITLE}" style="width: 232px;" />
-	</td>
-</tr>
-<tr>
-	<td width="100">{TEXT_PARENT}:</td>
-	<td width="240">
-		<select name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
-			<!-- BEGIN page_list_block2 -->
-			<option value="{ID}"{SELECTED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
-			<!-- END page_list_block2 -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="100">{TEXT_VISIBILITY}:</td>
-	<td width="240">
-		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
-			<option value="public"{PUBLIC_SELECTED}>{TEXT_PUBLIC}</option>
-			<option value="private"{PRIVATE_SELECTED}>{TEXT_PRIVATE}</option>
-			<option value="registered"{REGISTERED_SELECTED}>{TEXT_REGISTERED}</option>
-			<option value="hidden"{HIDDEN_SELECTED}>{TEXT_HIDDEN}</option>
-			<option value="none"{NO_VIS_SELECTED}>{TEXT_NONE}</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="100" valign="top">{TEXT_DESCRIPTION}:</td>
-	<td>
-		<textarea name="description" rows="10" cols="1" style="width:236px;height:50px;">{DESCRIPTION}</textarea>
-	</td>
-</tr>
-<tr>
-	<td width="100" valign="top">{TEXT_KEYWORDS}:</td>
-	<td>
-		<textarea name="keywords" rows="10" cols="1" style="width:236px;height:50px;">{KEYWORDS}</textarea>
-	</td>
-</tr>
-<tr>
-	<td>
-		{TEXT_TARGET}:
-	</td>
-	<td>
-		<select name="target" style="width: 240px;" ><!--  value="{TARGET}" -->
-			<option value="_blank"{BLANK_SELECTED}>{TEXT_NEW_WINDOW}</option>
-			<option value="_self"{SELF_SELECTED}>{TEXT_SAME_WINDOW}</option>
-			<option value="_top"{TOP_SELECTED}>{TEXT_TOP_FRAME}</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="100">{TEXT_TEMPLATE}:</td>
-	<td width="240">
-		<select name="template" style="width: 240px;">
-			<option value="">{TEXT_SYSTEM_DEFAULT}</option>
-			<option value="">----------------------</option>
-			<!-- BEGIN template_list_block -->
-			<option value="{VALUE}"{SELECTED}>{NAME}</option>
-			<!-- END template_list_block -->
-		</select>
-	</td>
-</tr>
-<tr style="{DISPLAY_MENU_LIST}">
-	<td width="100">{TEXT_MENU}:</td>
-	<td width="240">
-		<select name="menu" style="width: 240px;">
-			<!-- BEGIN menu_list_block -->
-			<option value="{VALUE}"{SELECTED}>{NAME}</option>
-			<!-- END menu_list_block -->
-		</select>
-	</td>
-</tr>
-<tr style="{DISPLAY_LANGUAGE_LIST}">
-	<td width="100">{TEXT_LANGUAGE}:</td>
-	<td width="240">
-		<select name="language" style="width: 240px;">
-			<!-- BEGIN language_list_block -->
-			<option value="{VALUE}"{SELECTED} style="background: {FLAG_LANG_ICONS} no-repeat center left; padding-left: 20px;">{NAME}</option>
-			<!-- END language_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- insert page_code 20090904-->
-<tr{DISPLAY_CODE_PAGE_LIST}>
-	<td width="100">{TEXT_PAGE_CODE}:</td>
-	<td class="list_page_code">
-		<select name="page_code" class="value_page_code">
-			<!-- BEGIN page_code_list_block -->
-			<option value="{VALUE}"{SELECTED} style="background: {FLAG_CODE_ICON} no-repeat center left; padding-left: 20px;">&nbsp;{PAGE_VALUE}</option>
-			<!-- END page_code_list_block -->
-		</select>
-	</td>
-</tr>
-<!-- page code -->
-<tr>
-	<td width="100">{TEXT_SEARCHING}:</td>
-	<td width="240">
-		<select name="searching" style="width: 240px;">
-			<option value="1">{TEXT_ENABLED}</option>
-			<option value="0"{SEARCHING_DISABLED}>{TEXT_DISABLED}</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="100">&nbsp;</td>
-	<td colspan="4">
-		<input type="submit" name="submit" value="{TEXT_SAVE} {SECTION_SETTINGS}" style="width: 117px;" />
-		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</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/start.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/start.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/start.htt	(nonexistent)
@@ -1,75 +0,0 @@
-<!-- BEGIN main_block -->
-
-<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
-  <tr>
-    <td colspan="3">{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}. </td>
-  </tr>
-  <tr style="{DISPLAY_WARNING};">
-    <td colspan="3" align="center" style="color: #FF0000; font-weight: bold;">{WARNING}</td>
-  </tr>
-  <tr>
-    <td align="center" valign="top" width="49%">
-      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_PAGES};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/pages/index.php"> <img src="{THEME_URL}/icons/pages.png" border="0" alt="{PAGES}" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/pages/index.php"><span class="title">{PAGES}</span></a>
-		  {PAGES_OVERVIEW}
-		  </td>
-        </tr>
-
-      </table>
-      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADDONS};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/addons/index.php"> <img src="{THEME_URL}/icons/addons.png" border="0" alt="{ADDONS}" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/addons/index.php"><span class="title">{ADDONS}</span></a>
-		  {ADDONS_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_SETTINGS};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/settings/index.php"> <img src="{THEME_URL}/icons/settings.png" border="0" alt="{SETTINGS}" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/settings/index.php"><span class="title">{SETTINGS}</span></a>
-		  {SETTINGS_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ACCESS};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/access/index.php"> <img src="{THEME_URL}/icons/access.png" border="0" alt="{ACCESS}" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/access/index.php"><span class="title">{ACCESS}</span></a>
-		  {ACCESS_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-    </td>
-    <td width="10">&nbsp; </td>
-    <td align="center" valign="top">
-	  <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_MEDIA};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/media/index.php"> <img src="{THEME_URL}/icons/media.png" border="0" alt="{MEDIA}" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/media/index.php"><span class="title">{MEDIA}</span></a>
-		  {MEDIA_OVERVIEW}
-		  </td>
-        </tr>
-      </table>	  
-      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/preferences/index.php"> <img src="{THEME_URL}/icons/preferences.png" border="0" alt="{PREFERENCES}" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/preferences/index.php"><span class="title">{PREFERENCES}</span></a>
-		  {PREFERENCES_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADMINTOOLS};">
-        <tr>
-          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/admintools/index.php"> <img src="{THEME_URL}/icons/admintools.png" border="0" alt="{ADMINTOOLS}" /> </a> </td>
-          <td class="description" valign="top"> <a href="{ADMIN_URL}/admintools/index.php"><span class="title">{ADMINTOOLS}</span></a>
-		  {ADMINTOOLS_OVERVIEW}
-		  </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/languages.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/languages.htt	(nonexistent)
@@ -1,74 +0,0 @@
-<!-- BEGIN main_block -->
-
-<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
-		<td align="right">
-			{URL_MODULES}
-			-
-			{URL_TEMPLATES}
-			-
-			{URL_ADVANCED}
-		</td>
-     </tr>
-</table>
-
-<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
-{FTAN}
-  <h2>{HEADING_INSTALL_LANGUAGE}</h2>
-  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
-    <tr>
-      <td>
-        <input type="file" name="userfile" size="97" />
-        <script type="text/javascript">
-		document.install.userfile.focus();
-		</script>
-      </td>
-      <td width="110" align="left">
-        <input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" />
-      </td>
-    </tr>
-  </table>
-  <br />
-</form>
-<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
-{FTAN}
-  <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}">
-{FTAN}
-  <h2>{HEADING_LANGUAGE_DETAILS}</h2>
-  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
-    <tr>
-      <td>
-        <select name="code" style="width: 97%;">
-		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
-		<!-- BEGIN language_list_block -->
-			<option value="{VALUE}">{NAME}</option>
-          <!-- END language_list_block -->
-        </select>
-      </td>
-      <td width="110">
-        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
-      </td>
-    </tr>
-  </table>
-  <br />
-</form>
-<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/admintools.htt	(nonexistent)
@@ -1,22 +0,0 @@
-<!-- BEGIN main_block -->
-<h2>{HEADING_ADMINISTRATION_TOOLS} </h2>
-<div id="admintools">
-	<ul>
-	<!-- BEGIN tool_list_block -->
-	<li>
-		<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" alt="{TOOL_NAME}" align="left" /></a>
-			</td>
-			<td class="description" valign="top">
-				<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}"><span class="title">{TOOL_NAME}</span></a>{TOOL_DESCRIPTION}
-			</td>
-		</tr>
-		</table>
-	</li>
-	<!-- END tool_list_block -->
-	</ul>
-	{TOOL_LIST}
-</div>
-<!-- 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 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/media.htt	(nonexistent)
@@ -1,123 +0,0 @@
-<!-- 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>
Index: branches/2.8.x/wb/templates/argos_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(nonexistent)
@@ -1,585 +0,0 @@
-<!-- BEGIN main_block -->
-
-<form name="settings" action="save.php" method="post">
-<input type="hidden" name="advanced" value="{ADVANCED}" />
-{FTAN}
-
-<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
-<tr>
-	<td colspan="3"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
-</tr>
-<tr>
-	<td class="setting_name" width="200">{TEXT_WEBSITE_TITLE}:</td>
-	<td class="setting_value" colspan="3" width="700">
-		<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">
-		<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">
-		<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">
-		<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">
-		<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">
-		<select name="page_level_limit">
-		<!-- BEGIN page_level_limit_list_block -->
-			<option value="{NUMBER}"{SELECTED}>{NUMBER}</option>
-		<!-- END page_level_limit_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
-	<td class="setting_value" colspan="3">
-		<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} />
-		<label for="page_trash_inline">{TEXT_INLINE}</label>
-		<div style="margin: 0; padding: 0;{DISPLAY_PAGE_TRASH_SEPARATE}">
-			<input type="radio" name="page_trash" id="page_trash_separate" style="width: 14px; height: 14px;" value="separate"{PAGE_TRASH_SEPARATE} />
-			<label for="page_trash_separate">{TEXT_SEPARATE}</label>
-		</div>
-	</td>
-</tr>
-<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} />
-                <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} />
-                <label for="page_languages_false">{TEXT_DISABLED}</label>
-		</td>
-</tr>
-<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} />
-		<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} />
-		<label for="multiple_menus_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
-	<td class="setting_value" colspan="3">
-		<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} />
-		<label for="home_folders_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<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} />
-		<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} />
-		<label for="manage_sections_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<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} />
-		<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} />
-		<label for="section_blocks_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
-	<td class="setting_value" colspan="3">
-		<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} />
-		<label for="intro_page_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<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} />
-		<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} />
-		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<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} />
-		<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} />
-		<label for="smart_login_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_LOGIN}:</td>
-	<td class="setting_value" colspan="3">
-		<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} />
-		<label for="frontend_login_false">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<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}" style="width:50%;" />
-		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_SIGNUP}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="frontend_signup">
-			<option value="false">{TEXT_DISABLED}</option>
-			<!-- BEGIN group_list_block -->
-				<option value="{ID}" {SELECTED}>{NAME}</option>
-			<!-- END group_list_block -->
-		</select>
-	</td>
-</tr>
-<tr{DISPLAY_ADVANCED}>
-	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="er_level">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN error_reporting_list_block -->
-				<option value="{VALUE}"{SELECTED}>{NAME}</option>
-			<!-- END error_reporting_list_block -->
-		</select>
-	</td>
-</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>
-</tr>
-<tr{DISPLAY_ADVANCED}>
-	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="wysiwyg_editor">
-		<!-- BEGIN editor_list_block -->
-			<option value="{FILE}"{SELECTED}>{NAME}</option>
-		<!-- END editor_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<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;">
-		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-	</td>
-</tr>
-<tr>
-	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_DEFAULT_SETTINGS}</h2></td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_LANGUAGE}:</td>
-	<td class="setting_value" colspan="3">
-		<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>
-			<!-- END language_list_block -->
-		</select>
-	</td>
-</tr>
-<tr{DISPLAY_ADVANCED}>
-	<td class="setting_name">{TEXT_CHARSET}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="default_charset">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN charset_list_block -->
-				<option value="{VALUE}" {SELECTED}>{NAME}</option>
-			<!-- END charset_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_TIMEZONE}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="default_timezone">
-			<option value="0">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN timezone_list_block -->
-				<option value="{VALUE}" {SELECTED}>{NAME}</option>
-			<!-- END timezone_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="default_date_format">
-			<option value="M d Y">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN date_format_list_block -->
-				<option value="{VALUE}" {SELECTED}>{NAME}</option>
-			<!-- END date_format_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="default_time_format">
-			<option value="g:i A">{TEXT_PLEASE_SELECT}...</option>
-			<!-- BEGIN time_format_list_block -->
-				<option value="{VALUE}" {SELECTED}>{NAME}</option>
-			<!-- END time_format_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_TEMPLATE}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="default_template">
-		<!-- BEGIN template_list_block -->
-			<option value="{FILE}"{SELECTED}>{NAME}</option>
-		<!-- END template_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_THEME}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="default_theme">
-		<!-- BEGIN theme_list_block -->
-			<option value="{FILE}"{SELECTED}>{NAME}</option>
-		<!-- END theme_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<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;">
-		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-	</td>
-</tr>
-<tr>
-	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SEARCH_SETTINGS}</h2></td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_VISIBILITY}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="search">
-			<option value="public">{TEXT_PUBLIC}</option>
-			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
-			<option value="registered" {REGISTERED_SEARCH}>{TEXT_REGISTERED}</option>
-			<option value="none" {NONE_SEARCH}>{TEXT_NONE}</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_TEMPLATE}:</td>
-	<td class="setting_value" colspan="3">
-		<select name="search_template">
-		<!-- BEGIN search_template_list_block -->
-			<option value="{FILE}"{SELECTED}>{NAME}</option>
-		<!-- END search_template_list_block -->
-		</select>
-	</td>
-</tr>
-<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}>
-	<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}" />
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<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;">
-		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-	</td>
-</tr>
-<tr>
-	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SERVER_SETTINGS}</h2></td>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
-	<td class="setting_value" colspan="3">
-		<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} />
-		<label for="operating_system_windows" onclick="javascript: change_os('windows');">{TEXT_WINDOWS}</label>
-	</td>
-</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">
-		<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">
-				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
-			</label>
-			<span class="warning">({WORLD_WRITEABLE_WARNING})</span>
-		</div>
-		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
-	</td>
-</tr>
-
-<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">
-		<tr>
-			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_FILES}:</td>
-		</tr>
-		<tr>
-			<td>{TEXT_USER}:</td>
-			<td>{TEXT_GROUP}:</td>
-			<td>{TEXT_OTHERS}:</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="file_u_r" id="file_u_r" value="true"{FILE_U_R_CHECKED} />
-				<label for="file_u_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="file_u_w" id="file_u_w" value="true"{FILE_U_W_CHECKED} />
-				<label for="file_u_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="file_u_e" id="file_u_e" value="true"{FILE_U_E_CHECKED} />
-				<label for="file_u_e">{TEXT_EXECUTE}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="file_g_r" id="file_g_r" value="true"{FILE_G_R_CHECKED} />
-				<label for="file_g_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="file_g_w" id="file_g_w" value="true"{FILE_G_W_CHECKED} />
-				<label for="file_g_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="file_g_e" id="file_g_e" value="true"{FILE_G_E_CHECKED} />
-				<label for="file_g_e">{TEXT_EXECUTE}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="file_o_r" id="file_o_r" value="true"{FILE_O_R_CHECKED} />
-				<label for="file_o_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="file_o_w" id="file_o_w" value="true"{FILE_O_W_CHECKED} />
-				<label for="file_o_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="file_o_e" id="file_o_e" value="true"{FILE_O_E_CHECKED} />
-				<label for="file_o_e">{TEXT_EXECUTE}</label>
-			</td>
-		</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">
-		<tr>
-			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_DIRECTORIES}:</td>
-		</tr>
-		<tr>
-			<td>{TEXT_USER}:</td>
-			<td>{TEXT_GROUP}:</td>
-			<td>{TEXT_OTHERS}:</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="dir_u_r" id="dir_u_r" value="true"{DIR_U_R_CHECKED} />
-				<label for="dir_u_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="dir_u_w" id="dir_u_w" value="true"{DIR_U_W_CHECKED} />
-				<label for="dir_u_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="dir_u_e" id="dir_u_e" value="true"{DIR_U_E_CHECKED} />
-				<label for="dir_u_e">{TEXT_EXECUTE}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="dir_g_r" id="dir_g_r" value="true"{DIR_G_R_CHECKED} />
-				<label for="dir_g_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="dir_g_w" id="dir_g_w" value="true"{DIR_G_W_CHECKED} />
-				<label for="dir_g_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="dir_g_e" id="dir_g_e" value="true"{DIR_G_E_CHECKED} />
-				<label for="dir_g_e">{TEXT_EXECUTE}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="dir_o_r" id="dir_o_r" value="true"{DIR_O_R_CHECKED} />
-				<label for="dir_o_r">{TEXT_READ}</label>
-				<br />
-				<input type="checkbox" name="dir_o_w" id="dir_o_w" value="true"{DIR_O_W_CHECKED} />
-				<label for="dir_o_w">{TEXT_WRITE}</label>
-				<br />
-				<input type="checkbox" name="dir_o_e" id="dir_o_e" value="true"{DIR_O_E_CHECKED} />
-				<label for="dir_o_e">{TEXT_EXECUTE}</label>
-			</td>
-		</tr>
-		</table>
-	</td>
-</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>
-</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>
-</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>
-</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>
-</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>
-</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>
-</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>
-</tr>
-<!-- BASIC MAILER SETTINGS -->
-<tr>
-	<td colspan="3" style="padding-top: 10px;">
-		<h2>{HEADING_WBMAILER_SETTINGS}</h2>
-		<p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}</p>
-	</td>
-</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>
-</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>
-</tr>
-<tr>
-	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
-	<td class="setting_value" colspan="3">
-		<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} />
-		<label for="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');">{TEXT_WBMAILER_SMTP}</label>
-	</td>
-</tr>
-<!-- MORE ADVANCED SMTP MAILER SETTINGS -->
-<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"{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"{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} />
-		<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"{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"{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>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<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;">
-		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-	</td>
-</tr>
-</table>
-
-</form>
-
-<hr size="1" />
-
-<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
-<br />
-<font class="{DISPLAY_ADVANCED_BUTTON}">{MODE_SWITCH_WARNING}</font>
-<script src="{ADMIN_URL}/settings/setting.js" type="text/javascript"></script>
-<!-- END main_block -->
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 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt	(nonexistent)
@@ -1,279 +0,0 @@
-<!-- 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 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="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 summary="" cellpadding="2" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
-<tr>
-	<td valign="top" align="left" width="150">{TEXT_MODULE_PERMISSIONS}:</td>
-	<td valign="top" align="left">
-		<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="save" 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_LINK}" method="post">
-<input type="hidden" name="group_id" value="{GROUP_ID}" />
-<input type="hidden" name="action" value="modify" />
-{FTAN}
-<table summary="" 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/templates_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/templates_details.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/templates_details.htt	(nonexistent)
@@ -1,32 +0,0 @@
-<!-- BEGIN main_block -->
-
-<h2>{HEADING_TEMPLATE_DETAILS}</h2>
-
-<table summary="" cellpadding="5" cellspacing="0" border="0">
-<tr>
-	<td width="100">{TEXT_NAME}:</td>
-	<td>{NAME}</td>
-</tr>
-<tr>
-	<td>{TEXT_AUTHOR}:</td>
-	<td>{AUTHOR}</td>
-</tr>
-<tr>
-	<td>{TEXT_VERSION}:</td>
-	<td>{VERSION}</td>
-</tr>
-<tr>
-	<td>{TEXT_DESIGNED_FOR}:</td>
-	<td>Website Baker {DESIGNED_FOR}</td>
-</tr>
-<tr>
-	<td valign="top">{TEXT_DESCRIPTION}:</td>
-	<td style="text-align: justify;">{DESCRIPTION}</td>
-</tr>
-</table>
-
-<br />
-
-<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/error.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/error.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/error.htt	(nonexistent)
@@ -1,6 +0,0 @@
-<!-- BEGIN main_block -->
-<div class="error-box rounded">
-	<p>{MESSAGE}</p>
-<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{LINK}';" />
-</div>
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/setparameter.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/setparameter.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/setparameter.htt	(nonexistent)
@@ -1,64 +0,0 @@
-<!-- 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>Set Upload Parameters</title>
-
-
-<style type="text/css">
-body,td,th,input,textarea {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-}
-body {
-	background-color: #FFF;
-	margin: 0px;
-}
-hr {
-	margin: 0px;
-	color: #003366;
-	height: 1px;
-}
-.hide {
-	display: none;
-}
-a:link, a:visited, a:active {
-	color: #003366;
-	text-decoration: none;
-}
-a:hover {
-	text-decoration: none;
-	color: #336699;
-}
-</style>
-</head>
-<body>
-
-<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" style="border-bottom: 1px solid #666; width: 100%;">
-<tr style="background-color: #DDD;">
-	<td align="center">{TEXT_HEADER}</td>
-</tr>
-</table>
-<form method="post" action="{ADMIN_URL}/media/setparameter.php">
-	{FTAN}
-<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
-	<tr><td>{SETTINGS}</td><td><input type="checkbox" name="show_thumbs" {NO_SHOW_THUMBS_SELECTED}> {NO_SHOW_THUMBS}</td></tr>
-	<tr class="{DISPLAY_ADMIN}"><td></td>&nbsp;<td><input type="checkbox" name="admin_only" {ADMIN_ONLY_SELECTED}> {ADMIN_ONLY}</td></tr>
-	<tr><td colspan="2" style="border-bottom: 1px solid #666; line-height: 1px;">&nbsp;</td></tr>
-<!-- BEGIN list_block -->
-	<tr style="background-color: #{ROW_BG_COLOR};">
-		<td>{PATH_NAME}</td>
-		<td>{WIDTH} <input size="5" type="text" name="{FIELD_NAME_W}" value="{CUR_WIDTH}"> {HEIGHT} <input size="5" type="text" name="{FIELD_NAME_H}" value="{CUR_HEIGHT}"></td>
-	</tr>
-<!-- END list_block -->
-	<tr>
-		<td><input type="button" onclick="javascript: window.location = 'browse.php'" value="{BACK}"></td>
-		<td><input type="submit" name="save" value="{SAVE_TEXT}"></td>
-	</tr>
-</table>
-</form>
-</body>
-</html>
-
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt	(nonexistent)
@@ -1,95 +0,0 @@
-<!-- BEGIN main_block -->
-
-<script type="text/javascript">
-function toggle_radio(radio_on, radio_off) {
-	document.getElementById(radio_on).checked = true;
-	document.getElementById(radio_off).checked = true;
-}
-</script>
-
-<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_USER}</h2>
-
-<form name="user" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
-<input type="hidden" name="user_id" value="{USER_ID}" />
-<input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
-{FTAN}
-<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
-<tr>
-	<td width="150">{TEXT_USERNAME}:</td>
-	<td class="value_input">
-		<input type="text" name="{USERNAME_FIELDNAME}" maxlength="30" value="{USERNAME}" />
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_PASSWORD}:</td>
-	<td class="value_input">
-		<input type="password" name="password" maxlength="30" />
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_RETYPE_PASSWORD}:</td>
-	<td class="value_input">
-		<input type="password" name="password2" maxlength="30" />
-	</td>
-</tr>
-<tr style="{DISPLAY_EXTRA}">
-	<td>&nbsp;</td>
-	<td style="font-size: 10px;">
-		{CHANGING_PASSWORD}
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_DISPLAY_NAME}:</td>
-	<td class="value_input">
-		<input type="text" name="display_name" maxlength="255" value="{DISPLAY_NAME}" />
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_EMAIL}:</td>
-	<td class="value_input">
-		<input type="text" name="email" maxlength="255" value="{EMAIL}" />
-	</td>
-</tr>
-<tr style="{DISPLAY_HOME_FOLDERS}">
-	<td>{TEXT_HOME_FOLDER}:</td>
-	<td class="value_input">
-		<select name="home_folder">
-			<option value="">{TEXT_NONE}</option>
-			<!-- BEGIN folder_list_block -->
-			<option value="{FOLDER}"{SELECTED}>{NAME}</option>
-			<!-- END folder_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>{TEXT_GROUP}:</td>
-	<td class="value_input">
-		<select name="groups[]" multiple="multiple" size="5">
-		<!-- BEGIN group_list_block -->
-			<option value="{ID}" {SELECTED}>{NAME}</option>
-		<!-- END group_list_block -->
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="radio" name="active[]" id="active" value="1" {ACTIVE_CHECKED} />
-		<label for="active">{TEXT_ACTIVE}</label>
-		<input type="radio" name="active[]" id="disabled" value="0" {DISABLED_CHECKED} />
-		<label for="disabled">{TEXT_DISABLED}</label>
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
-		<input type="reset" name="reset" value="{TEXT_RESET}" />
-		<input type="button" style="width: 100px; margin-top: 5px;" onclick="javascript: window.location = 'index.php';" value="{TEXT_CANCEL}">
-	</td>
-</tr>
-</table>
-
-</form>
-
-<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/pages.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/pages.htt	(revision 1528)
+++ branches/2.8.x/wb/templates/argos_theme/templates/pages.htt	(nonexistent)
@@ -1,90 +0,0 @@
-<!-- BEGIN main_block -->
-<div class="{DISPLAY_ADD}">
-<h2>{HEADING_ADD_PAGE}</h2>
-<form name="add" action="add.php" method="post">
-{FTAN}
-<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
-  <tr>
-	<td width="70" height="20">{TEXT_TITLE}:</td>
-	<td width="240" height="20"><input type="text" name="title" style="width: 232px;" /></td>
-	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">{TEXT_ADMINISTRATORS}:
-		<ul style="list-style-type: none; margin: 0; padding: 0;">
-			<!-- BEGIN group_list_block -->
-			<li>
-			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-			<label for="admin_group_{TOGGLE}">{NAME}</label>
-			</li>
-			<!-- END group_list_block -->
-		</ul>
-	</td>
-	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
-		<div id="viewers" style="display: none;">{TEXT_REGISTERED_VIEWERS}:
-			<ul style="list-style-type: none; margin: 0; padding: 0;">
-				<!-- BEGIN group_list_block2 -->
-				<li>
-				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<label for="viewing_group_{TOGGLE}">{NAME}</label>
-				</li>
-				<!-- END group_list_block2 -->
-			</ul>
-		</div>
-	</td>
-  </tr>
-  <tr>
-	<td width="70">{TEXT_TYPE}:</td>
-	<td width="240">
-		<select name="type" style="width: 240px;">
-			<!-- BEGIN module_list_block -->
-				<option value="{VALUE}"{SELECTED}>{NAME}</option>
-			<!-- END module_list_block -->
-		</select>
-	</td>
-  </tr>
-  <tr>
-	<td width="70">{TEXT_PARENT}:</td>
-	<td width="240">
-		<select  name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
-			<!-- BEGIN page_list_block2 -->
-			<option value="{ID}"{DISABLED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
-			<!-- END page_list_block2 -->
-		</select>
-	</td>
-  </tr>
-  <tr>
-	<td width="70">{TEXT_VISIBILITY}:</td>
-	<td width="240">
-		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
-			<option value="public"{SELECTED}>{TEXT_PUBLIC}</option>
-			<option value="private">{TEXT_PRIVATE}</option>
-			<option value="registered">{TEXT_REGISTERED}</option>
-			<option value="hidden">{TEXT_HIDDEN}</option>
-			<option value="none">{TEXT_NONE}</option>
-		</select>
-	</td>
-  </tr>
-  <tr>
-	<td width="70">&nbsp;</td>
-	<td colspan="4">
-		<input type="submit" name="submit" value="{TEXT_ADD}" style="width: 117px;" />
-		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
-	</td>
-  </tr>
-  <tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-  </tr>
-</table>
-</form>
-</div>
-<div class="{DISPLAY_INTRO}" style="padding-top: 10px;">
-<br />
-<h2>{HEADING_MODIFY_INTRO_PAGE}</h2>
-<a href="intro.php">{INTRO_LINK}</a>
-</div>
-<!-- Addition for remembering expanded state of pages -->
-<script type="text/javascript">
-var THEME_URL = '{THEME_URL}';
-var WB_URL = '{WB_URL}';
-</script>
-<script src="{ADMIN_URL}/pages/page_index.js" type="text/javascript"></script>
-<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/users_form.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/users_form.htt	(revision 1529)
@@ -0,0 +1,95 @@
+<!-- BEGIN main_block -->
+
+<script type="text/javascript">
+function toggle_radio(radio_on, radio_off) {
+	document.getElementById(radio_on).checked = true;
+	document.getElementById(radio_off).checked = true;
+}
+</script>
+
+<h2 style="{DISPLAY_EXTRA}">{HEADING_MODIFY_USER}</h2>
+
+<form name="user" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
+<input type="hidden" name="user_id" value="{USER_ID}" />
+<input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
+{FTAN}
+<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="150">{TEXT_USERNAME}:</td>
+	<td class="value_input">
+		<input type="text" name="{USERNAME_FIELDNAME}" maxlength="30" value="{USERNAME}" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_PASSWORD}:</td>
+	<td class="value_input">
+		<input type="password" name="password" maxlength="30" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_RETYPE_PASSWORD}:</td>
+	<td class="value_input">
+		<input type="password" name="password2" maxlength="30" />
+	</td>
+</tr>
+<tr style="{DISPLAY_EXTRA}">
+	<td>&nbsp;</td>
+	<td style="font-size: 10px;">
+		{CHANGING_PASSWORD}
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_DISPLAY_NAME}:</td>
+	<td class="value_input">
+		<input type="text" name="display_name" maxlength="255" value="{DISPLAY_NAME}" />
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_EMAIL}:</td>
+	<td class="value_input">
+		<input type="text" name="email" maxlength="255" value="{EMAIL}" />
+	</td>
+</tr>
+<tr style="{DISPLAY_HOME_FOLDERS}">
+	<td>{TEXT_HOME_FOLDER}:</td>
+	<td class="value_input">
+		<select name="home_folder">
+			<option value="">{TEXT_NONE}</option>
+			<!-- BEGIN folder_list_block -->
+			<option value="{FOLDER}"{SELECTED}>{NAME}</option>
+			<!-- END folder_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>{TEXT_GROUP}:</td>
+	<td class="value_input">
+		<select name="groups[]" multiple="multiple" size="5">
+		<!-- BEGIN group_list_block -->
+			<option value="{ID}" {SELECTED}>{NAME}</option>
+		<!-- END group_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="radio" name="active[]" id="active" value="1" {ACTIVE_CHECKED} />
+		<label for="active">{TEXT_ACTIVE}</label>
+		<input type="radio" name="active[]" id="disabled" value="0" {DISABLED_CHECKED} />
+		<label for="disabled">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
+		<input type="reset" name="reset" value="{TEXT_RESET}" />
+		<input type="button" style="width: 100px; margin-top: 5px;" onclick="javascript: window.location = 'index.php';" value="{TEXT_CANCEL}">
+	</td>
+</tr>
+</table>
+
+</form>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/login_forgot.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/login_forgot.htt	(revision 1529)
@@ -0,0 +1,70 @@
+<!-- BEGIN main_block -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>Retrieve Login Details</title>
+<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
+<meta http-equiv="content-language" content="{LANGUAGE}" />
+<meta name="description" content="Retrieve Login Details" />
+<meta name="keywords" content="Retrieve Login Details" />
+<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
+</head>
+<body onload="document.forgot_pass.email.focus();">
+
+<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
+	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
+	{SECTION_FORGOT}
+</div> 
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
+<tr>
+	<td class="content">
+	
+	<form name="forgot_pass" action="{ACTION_URL}" method="post">
+	<input type="hidden" name="url" value="{URL}" />
+		<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
+		<tr>
+			<td height="40" align="center" style="color: #{MESSAGE_COLOR};" colspan="2">{MESSAGE}</td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td height="10" colspan="2"></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td width="165" height="30" align="right">{TEXT_EMAIL}:</td>
+			<td><input type="text" maxlength="255" name="email" value="{EMAIL}" style="width: 180px;" /></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}" height="30">
+			<td>&nbsp;</td>
+			<td><input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;"></td>
+		</tr>
+		<tr style="{DISPLAY_FORM}">
+			<td height="10" colspan="2"></td>
+		</tr>
+		</table>
+	</form>
+	
+	<center>
+		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>
+		<br />
+		<br />
+		<a href="{WB_URL}/">{TEXT_HOME}</a>
+	</center>
+
+	</td>
+</tr>
+</table>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0px 10px 0px;">
+<tr>
+	<td style="font-size:12px;text-align:center;">
+      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
+      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+	</td>
+</tr>
+</table>
+
+</body>
+</html>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/error.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/error.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/error.htt	(revision 1529)
@@ -0,0 +1,6 @@
+<!-- BEGIN main_block -->
+<div class="error-box rounded">
+	<p>{MESSAGE}</p>
+<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{LINK}';" />
+</div>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/setparameter.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/setparameter.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/setparameter.htt	(revision 1529)
@@ -0,0 +1,64 @@
+<!-- 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>Set Upload Parameters</title>
+
+
+<style type="text/css">
+body,td,th,input,textarea {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+body {
+	background-color: #FFF;
+	margin: 0px;
+}
+hr {
+	margin: 0px;
+	color: #003366;
+	height: 1px;
+}
+.hide {
+	display: none;
+}
+a:link, a:visited, a:active {
+	color: #003366;
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: none;
+	color: #336699;
+}
+</style>
+</head>
+<body>
+
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" style="border-bottom: 1px solid #666; width: 100%;">
+<tr style="background-color: #DDD;">
+	<td align="center">{TEXT_HEADER}</td>
+</tr>
+</table>
+<form method="post" action="{ADMIN_URL}/media/setparameter.php">
+	{FTAN}
+<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" class="{DISPLAY_LIST_TABLE}">
+	<tr><td>{SETTINGS}</td><td><input type="checkbox" name="show_thumbs" {NO_SHOW_THUMBS_SELECTED}> {NO_SHOW_THUMBS}</td></tr>
+	<tr class="{DISPLAY_ADMIN}"><td></td>&nbsp;<td><input type="checkbox" name="admin_only" {ADMIN_ONLY_SELECTED}> {ADMIN_ONLY}</td></tr>
+	<tr><td colspan="2" style="border-bottom: 1px solid #666; line-height: 1px;">&nbsp;</td></tr>
+<!-- BEGIN list_block -->
+	<tr style="background-color: #{ROW_BG_COLOR};">
+		<td>{PATH_NAME}</td>
+		<td>{WIDTH} <input size="5" type="text" name="{FIELD_NAME_W}" value="{CUR_WIDTH}"> {HEIGHT} <input size="5" type="text" name="{FIELD_NAME_H}" value="{CUR_HEIGHT}"></td>
+	</tr>
+<!-- END list_block -->
+	<tr>
+		<td><input type="button" onclick="javascript: window.location = 'browse.php'" value="{BACK}"></td>
+		<td><input type="submit" name="save" value="{SAVE_TEXT}"></td>
+	</tr>
+</table>
+</form>
+</body>
+</html>
+
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/start.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/start.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/start.htt	(revision 1529)
@@ -0,0 +1,75 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+  <tr>
+    <td colspan="3">{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}. </td>
+  </tr>
+  <tr style="{DISPLAY_WARNING};">
+    <td colspan="3" align="center" style="color: #FF0000; font-weight: bold;">{WARNING}</td>
+  </tr>
+  <tr>
+    <td align="center" valign="top" width="49%">
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_PAGES};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/pages/index.php"> <img src="{THEME_URL}/icons/pages.png" border="0" alt="{PAGES}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/pages/index.php"><span class="title">{PAGES}</span></a>
+		  {PAGES_OVERVIEW}
+		  </td>
+        </tr>
+
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADDONS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/addons/index.php"> <img src="{THEME_URL}/icons/addons.png" border="0" alt="{ADDONS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/addons/index.php"><span class="title">{ADDONS}</span></a>
+		  {ADDONS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_SETTINGS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/settings/index.php"> <img src="{THEME_URL}/icons/settings.png" border="0" alt="{SETTINGS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/settings/index.php"><span class="title">{SETTINGS}</span></a>
+		  {SETTINGS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ACCESS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/access/index.php"> <img src="{THEME_URL}/icons/access.png" border="0" alt="{ACCESS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/access/index.php"><span class="title">{ACCESS}</span></a>
+		  {ACCESS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+    </td>
+    <td width="10">&nbsp; </td>
+    <td align="center" valign="top">
+	  <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_MEDIA};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/media/index.php"> <img src="{THEME_URL}/icons/media.png" border="0" alt="{MEDIA}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/media/index.php"><span class="title">{MEDIA}</span></a>
+		  {MEDIA_OVERVIEW}
+		  </td>
+        </tr>
+      </table>	  
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/preferences/index.php"> <img src="{THEME_URL}/icons/preferences.png" border="0" alt="{PREFERENCES}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/preferences/index.php"><span class="title">{PREFERENCES}</span></a>
+		  {PREFERENCES_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADMINTOOLS};">
+        <tr>
+          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/admintools/index.php"> <img src="{THEME_URL}/icons/admintools.png" border="0" alt="{ADMINTOOLS}" /> </a> </td>
+          <td class="description" valign="top"> <a href="{ADMIN_URL}/admintools/index.php"><span class="title">{ADMINTOOLS}</span></a>
+		  {ADMINTOOLS_OVERVIEW}
+		  </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/templates.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/templates.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/templates.htt	(revision 1529)
@@ -0,0 +1,88 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
+		<td align="right">
+			{URL_MODULES}
+			-
+			{URL_LANGUAGES}
+			-
+			{URL_ADVANCED}
+		</td>
+     </tr>
+</table>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
+
+<h2>{HEADING_INSTALL_TEMPLATE}</h2>
+
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td>
+		<input type="file" name="userfile" size="82" />
+		<script type="text/javascript">
+		document.install.userfile.focus();
+		</script>
+	</td>
+	<td width="110" align="left">
+		<input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" />
+	</td>
+</tr>
+</table>
+
+<br />
+
+</form>
+
+<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
+{FTAN}
+
+<h2>{HEADING_UNINSTALL_TEMPLATE}</h2>
+
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td>
+		<select name="file" style="width: 97%;">
+		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN template_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+		<!-- END template_list_block -->
+		</select>
+	</td>
+	<td width="110">
+		<input type="submit" name="submit" value="{TEXT_UNINSTALL}" style="width: 100px;" />
+	</td>
+</tr>
+</table>
+
+<br />
+
+</form>
+
+<form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
+{FTAN}
+
+<h2>{HEADING_TEMPLATE_DETAILS}</h2>
+
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td>
+		<select name="file" style="width: 97%;">
+		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN template_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+		<!-- END template_list_block -->
+		</select>
+	</td>
+	<td width="110">
+		<input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
+	</td>
+</tr>
+</table>
+
+<br />
+</form>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/pages.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/pages.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/pages.htt	(revision 1529)
@@ -0,0 +1,90 @@
+<!-- BEGIN main_block -->
+<div class="{DISPLAY_ADD}">
+<h2>{HEADING_ADD_PAGE}</h2>
+<form name="add" action="add.php" method="post">
+{FTAN}
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
+  <tr>
+	<td width="70" height="20">{TEXT_TITLE}:</td>
+	<td width="240" height="20"><input type="text" name="title" style="width: 232px;" /></td>
+	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">{TEXT_ADMINISTRATORS}:
+		<ul style="list-style-type: none; margin: 0; padding: 0;">
+			<!-- BEGIN group_list_block -->
+			<li>
+			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+			<label for="admin_group_{TOGGLE}">{NAME}</label>
+			</li>
+			<!-- END group_list_block -->
+		</ul>
+	</td>
+	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
+		<div id="viewers" style="display: none;">{TEXT_REGISTERED_VIEWERS}:
+			<ul style="list-style-type: none; margin: 0; padding: 0;">
+				<!-- BEGIN group_list_block2 -->
+				<li>
+				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
+				</li>
+				<!-- END group_list_block2 -->
+			</ul>
+		</div>
+	</td>
+  </tr>
+  <tr>
+	<td width="70">{TEXT_TYPE}:</td>
+	<td width="240">
+		<select name="type" style="width: 240px;">
+			<!-- BEGIN module_list_block -->
+				<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END module_list_block -->
+		</select>
+	</td>
+  </tr>
+  <tr>
+	<td width="70">{TEXT_PARENT}:</td>
+	<td width="240">
+		<select  name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
+			<!-- BEGIN page_list_block2 -->
+			<option value="{ID}"{DISABLED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
+			<!-- END page_list_block2 -->
+		</select>
+	</td>
+  </tr>
+  <tr>
+	<td width="70">{TEXT_VISIBILITY}:</td>
+	<td width="240">
+		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
+			<option value="public"{SELECTED}>{TEXT_PUBLIC}</option>
+			<option value="private">{TEXT_PRIVATE}</option>
+			<option value="registered">{TEXT_REGISTERED}</option>
+			<option value="hidden">{TEXT_HIDDEN}</option>
+			<option value="none">{TEXT_NONE}</option>
+		</select>
+	</td>
+  </tr>
+  <tr>
+	<td width="70">&nbsp;</td>
+	<td colspan="4">
+		<input type="submit" name="submit" value="{TEXT_ADD}" style="width: 117px;" />
+		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
+	</td>
+  </tr>
+  <tr>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+  </tr>
+</table>
+</form>
+</div>
+<div class="{DISPLAY_INTRO}" style="padding-top: 10px;">
+<br />
+<h2>{HEADING_MODIFY_INTRO_PAGE}</h2>
+<a href="intro.php">{INTRO_LINK}</a>
+</div>
+<!-- Addition for remembering expanded state of pages -->
+<script type="text/javascript">
+var THEME_URL = '{THEME_URL}';
+var WB_URL = '{WB_URL}';
+</script>
+<script src="{ADMIN_URL}/pages/page_index.js" type="text/javascript"></script>
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/settings.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/settings.htt	(revision 1529)
@@ -0,0 +1,585 @@
+<!-- BEGIN main_block -->
+
+<form name="settings" action="save.php" method="post">
+<input type="hidden" name="advanced" value="{ADVANCED}" />
+{FTAN}
+
+<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
+<tr>
+	<td colspan="3"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
+</tr>
+<tr>
+	<td class="setting_name" width="200">{TEXT_WEBSITE_TITLE}:</td>
+	<td class="setting_value" colspan="3" width="700">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<select name="page_level_limit">
+		<!-- BEGIN page_level_limit_list_block -->
+			<option value="{NUMBER}"{SELECTED}>{NUMBER}</option>
+		<!-- END page_level_limit_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="page_trash_inline">{TEXT_INLINE}</label>
+		<div style="margin: 0; padding: 0;{DISPLAY_PAGE_TRASH_SEPARATE}">
+			<input type="radio" name="page_trash" id="page_trash_separate" style="width: 14px; height: 14px;" value="separate"{PAGE_TRASH_SEPARATE} />
+			<label for="page_trash_separate">{TEXT_SEPARATE}</label>
+		</div>
+	</td>
+</tr>
+<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} />
+                <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} />
+                <label for="page_languages_false">{TEXT_DISABLED}</label>
+		</td>
+</tr>
+<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} />
+		<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} />
+		<label for="multiple_menus_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="home_folders_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="manage_sections_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="section_blocks_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="intro_page_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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} />
+		<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} />
+		<label for="smart_login_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_LOGIN}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="frontend_login_false">{TEXT_DISABLED}</label>
+	</td>
+</tr>
+<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}" style="width:50%;" />
+		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_SIGNUP}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="frontend_signup">
+			<option value="false">{TEXT_DISABLED}</option>
+			<!-- BEGIN group_list_block -->
+				<option value="{ID}" {SELECTED}>{NAME}</option>
+			<!-- END group_list_block -->
+		</select>
+	</td>
+</tr>
+<tr{DISPLAY_ADVANCED}>
+	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="er_level">
+			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN error_reporting_list_block -->
+				<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END error_reporting_list_block -->
+		</select>
+	</td>
+</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>
+</tr>
+<tr{DISPLAY_ADVANCED}>
+	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="wysiwyg_editor">
+		<!-- BEGIN editor_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END editor_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_DEFAULT_SETTINGS}</h2></td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_LANGUAGE}:</td>
+	<td class="setting_value" colspan="3">
+		<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>
+			<!-- END language_list_block -->
+		</select>
+	</td>
+</tr>
+<tr{DISPLAY_ADVANCED}>
+	<td class="setting_name">{TEXT_CHARSET}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_charset">
+			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN charset_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END charset_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TIMEZONE}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_timezone">
+			<option value="0">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN timezone_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END timezone_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_date_format">
+			<option value="M d Y">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN date_format_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END date_format_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_time_format">
+			<option value="g:i A">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN time_format_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END time_format_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TEMPLATE}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_template">
+		<!-- BEGIN template_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END template_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_THEME}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="default_theme">
+		<!-- BEGIN theme_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END theme_list_block -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SEARCH_SETTINGS}</h2></td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_VISIBILITY}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="search">
+			<option value="public">{TEXT_PUBLIC}</option>
+			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
+			<option value="registered" {REGISTERED_SEARCH}>{TEXT_REGISTERED}</option>
+			<option value="none" {NONE_SEARCH}>{TEXT_NONE}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_TEMPLATE}:</td>
+	<td class="setting_value" colspan="3">
+		<select name="search_template">
+		<!-- BEGIN search_template_list_block -->
+			<option value="{FILE}"{SELECTED}>{NAME}</option>
+		<!-- END search_template_list_block -->
+		</select>
+	</td>
+</tr>
+<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}>
+	<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}" />
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SERVER_SETTINGS}</h2></td>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="operating_system_windows" onclick="javascript: change_os('windows');">{TEXT_WINDOWS}</label>
+	</td>
+</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">
+		<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">
+				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
+			</label>
+			<span class="warning">({WORLD_WRITEABLE_WARNING})</span>
+		</div>
+		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
+	</td>
+</tr>
+
+<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">
+		<tr>
+			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_FILES}:</td>
+		</tr>
+		<tr>
+			<td>{TEXT_USER}:</td>
+			<td>{TEXT_GROUP}:</td>
+			<td>{TEXT_OTHERS}:</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="file_u_r" id="file_u_r" value="true"{FILE_U_R_CHECKED} />
+				<label for="file_u_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_u_w" id="file_u_w" value="true"{FILE_U_W_CHECKED} />
+				<label for="file_u_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_u_e" id="file_u_e" value="true"{FILE_U_E_CHECKED} />
+				<label for="file_u_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="file_g_r" id="file_g_r" value="true"{FILE_G_R_CHECKED} />
+				<label for="file_g_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_g_w" id="file_g_w" value="true"{FILE_G_W_CHECKED} />
+				<label for="file_g_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_g_e" id="file_g_e" value="true"{FILE_G_E_CHECKED} />
+				<label for="file_g_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="file_o_r" id="file_o_r" value="true"{FILE_O_R_CHECKED} />
+				<label for="file_o_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="file_o_w" id="file_o_w" value="true"{FILE_O_W_CHECKED} />
+				<label for="file_o_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="file_o_e" id="file_o_e" value="true"{FILE_O_E_CHECKED} />
+				<label for="file_o_e">{TEXT_EXECUTE}</label>
+			</td>
+		</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">
+		<tr>
+			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_DIRECTORIES}:</td>
+		</tr>
+		<tr>
+			<td>{TEXT_USER}:</td>
+			<td>{TEXT_GROUP}:</td>
+			<td>{TEXT_OTHERS}:</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="dir_u_r" id="dir_u_r" value="true"{DIR_U_R_CHECKED} />
+				<label for="dir_u_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_u_w" id="dir_u_w" value="true"{DIR_U_W_CHECKED} />
+				<label for="dir_u_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_u_e" id="dir_u_e" value="true"{DIR_U_E_CHECKED} />
+				<label for="dir_u_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="dir_g_r" id="dir_g_r" value="true"{DIR_G_R_CHECKED} />
+				<label for="dir_g_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_g_w" id="dir_g_w" value="true"{DIR_G_W_CHECKED} />
+				<label for="dir_g_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_g_e" id="dir_g_e" value="true"{DIR_G_E_CHECKED} />
+				<label for="dir_g_e">{TEXT_EXECUTE}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="dir_o_r" id="dir_o_r" value="true"{DIR_O_R_CHECKED} />
+				<label for="dir_o_r">{TEXT_READ}</label>
+				<br />
+				<input type="checkbox" name="dir_o_w" id="dir_o_w" value="true"{DIR_O_W_CHECKED} />
+				<label for="dir_o_w">{TEXT_WRITE}</label>
+				<br />
+				<input type="checkbox" name="dir_o_e" id="dir_o_e" value="true"{DIR_O_E_CHECKED} />
+				<label for="dir_o_e">{TEXT_EXECUTE}</label>
+			</td>
+		</tr>
+		</table>
+	</td>
+</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>
+</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>
+</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>
+</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>
+</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>
+</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>
+</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>
+</tr>
+<!-- BASIC MAILER SETTINGS -->
+<tr>
+	<td colspan="3" style="padding-top: 10px;">
+		<h2>{HEADING_WBMAILER_SETTINGS}</h2>
+		<p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}</p>
+	</td>
+</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>
+</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>
+</tr>
+<tr>
+	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
+	<td class="setting_value" colspan="3">
+		<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} />
+		<label for="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');">{TEXT_WBMAILER_SMTP}</label>
+	</td>
+</tr>
+<!-- MORE ADVANCED SMTP MAILER SETTINGS -->
+<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"{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"{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} />
+		<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"{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"{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>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<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;">
+		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+	</td>
+</tr>
+</table>
+
+</form>
+
+<hr size="1" />
+
+<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
+<br />
+<font class="{DISPLAY_ADVANCED_BUTTON}">{MODE_SWITCH_WARNING}</font>
+<script src="{ADMIN_URL}/settings/setting.js" type="text/javascript"></script>
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/media_browse.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/media_browse.htt	(revision 1529)
@@ -0,0 +1,59 @@
+<!-- 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="120">
+		<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}&amp;id={TEMP_ID}');"><img src="{THEME_URL}/images/delete_16.png" alt="{TEXT_DELETE}" border="0" /></a>&nbsp;&nbsp;
+	</td>
+   <td width="16" align="right" class="">
+	   <img src="{THEME_URL}/images/{IMAGE_EXIST}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" />
+   </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/backup/users.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/users.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/users.htt	(revision 1529)
@@ -0,0 +1,32 @@
+<!-- BEGIN main_block -->
+
+<form name="users" action="users.php" method="post">
+<input type="hidden" name="userstatus" value="{USER_STATUS}" />
+{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_USER}</h2></td>
+		<td align="right">
+		<!-- BEGIN manage_groups_block -->
+		<a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a>
+		<!-- END manage_groups_block -->
+		</td>
+     </tr>
+</table>
+<button type="button" name="status" title="{TEXT_USERS}" style="width: 30px; background: {STATUS_ICON} no-repeat center" value="{USER_STATUS}" onclick="javascript: window.location = 'index.php?status={USER_STATUS}';" class="status {DISPLAY_MODIFY}" >&nbsp;</button>
+<select name="user_id" style="width: 500px;">
+<!-- BEGIN list_block -->
+	<option value="{VALUE}" {STATUS}>{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 style="margin-top: 20px;" class="{DISPLAY_ADD}">{HEADING_ADD_USER}</h2>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/preferences.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/preferences.htt	(revision 1529)
@@ -0,0 +1,114 @@
+<!-- BEGIN main_block -->
+<h2>{HEADING_MY_SETTINGS}</h2>
+<div class="content_box">
+	<form name="{FORM_NAME}" id="{FORM_NAME}" action="{ACTION_URL}" method="post">
+		{FTAN}
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_USERNAME}:</label><br />
+				</div>
+				<div class="c60l">
+					<div id="username">{USERNAME}</div><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_DISPLAY_NAME}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="text" id="display_name" name="display_name" value="{DISPLAY_NAME}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_LANGUAGE}:</label><br />
+				</div>
+				<div class="c60l">
+				<select name="language" id="language">
+					<!-- BEGIN language_list_block -->
+						<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
+					<!-- END language_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_TIMEZONE}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="timezone" id="timezone">
+						<!-- BEGIN timezone_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END timezone_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_DATE_FORMAT}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="date_format" id="date_format">
+						<!-- BEGIN date_format_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END date_format_list_block -->
+					</select>
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_TIME_FORMAT}:</label><br />
+				</div>
+				<div class="c60l">
+					<select name="time_format" id="time_format">
+						<!-- BEGIN time_format_list_block -->
+							<option value="{VALUE}"{SELECTED}>{NAME}</option>
+						<!-- END time_format_list_block -->
+					</select>
+				</div>
+			</div>
+
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_EMAIL}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="text" id="email" name="email" value="{EMAIL}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_NEW_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="new_password_1" name="new_password_1" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_RETYPE_NEW_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<hr />
+			<div class="subcolumns">
+				<div class="c25l">
+					<label>{TEXT_NEED_CURRENT_PASSWORD}:</label><br />
+				</div>
+				<div class="c60l">
+					<input type="password" id="current_password" name="current_password" value="{EMPTY_STRING}" /><br />
+				</div>
+			</div>
+			<div class="subcolumns save_section">
+				<div class="c60l">
+					<input type="submit" id="submit" name="submit" value="{TEXT_SAVE}" />
+					<input type="reset" id="reset" name="reset" value="{TEXT_RESET}" />
+				</div>
+				<div class="c25l">&nbsp;</div>
+			</div>
+	</form>
+</div>
+
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/access.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/access.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/access.htt	(revision 1529)
@@ -0,0 +1,33 @@
+<!-- BEGIN main_block -->
+<h2>{ACCESS}</h2>
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+	<tr>
+		<td align="center" valign="top">
+			<!-- BEGIN users_block -->	
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_USERS} >
+				<tr>
+					<td class="graphic" align="center" valign="top" rowspan="2">
+						<a href="{ADMIN_URL}/users/index.php"><img src="{THEME_URL}/icons/users.png" alt="{USERS}" /></a>
+					</td>
+					<td class="description" valign="top">
+						<a href="{ADMIN_URL}/users/index.php"><span class="title">{USERS}</span></a><p>{USERS_OVERVIEW}</p>
+					</td>
+				</tr>
+			</table>	
+			<!-- END users_block -->
+			<!-- BEGIN groups_block -->		
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_GROUPS} >
+				<tr>
+					<td class="graphic" align="center" valign="top" rowspan="2">
+						<a href="{ADMIN_URL}/groups/index.php"><img src="{THEME_URL}/icons/groups.png" alt="{GROUPS}" /></a>
+					</td>
+					<td class="description" valign="top">
+						<a href="{ADMIN_URL}/groups/index.php"><span class="title">{GROUPS}</span></a><p>{GROUPS_OVERVIEW}</p>
+					</td>
+				</tr>
+			</table>
+			<!-- END groups_block -->
+		</td>
+	</tr>
+</table>
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/groups_form.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/groups_form.htt	(revision 1529)
@@ -0,0 +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 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 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="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 summary="" cellpadding="2" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
+<tr>
+	<td valign="top" align="left" width="150">{TEXT_MODULE_PERMISSIONS}:</td>
+	<td valign="top" align="left">
+		<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="save" 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_LINK}" method="post">
+<input type="hidden" name="group_id" value="{GROUP_ID}" />
+<input type="hidden" name="action" value="modify" />
+{FTAN}
+<table summary="" 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/backup/templates_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/templates_details.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/templates_details.htt	(revision 1529)
@@ -0,0 +1,32 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_TEMPLATE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+<tr>
+	<td valign="top">{TEXT_DESCRIPTION}:</td>
+	<td style="text-align: justify;">{DESCRIPTION}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/languages.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/languages.htt	(revision 1529)
@@ -0,0 +1,74 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="left">{CHANGE_TEMPLATE_NOTICE}</td>
+		<td align="right">
+			{URL_MODULES}
+			-
+			{URL_TEMPLATES}
+			-
+			{URL_ADVANCED}
+		</td>
+     </tr>
+</table>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
+  <h2>{HEADING_INSTALL_LANGUAGE}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td>
+        <input type="file" name="userfile" size="97" />
+        <script type="text/javascript">
+		document.install.userfile.focus();
+		</script>
+      </td>
+      <td width="110" align="left">
+        <input type="submit" name="submit" value="{TEXT_INSTALL}" style="width: 100px;" />
+      </td>
+    </tr>
+  </table>
+  <br />
+</form>
+<form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
+{FTAN}
+  <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}">
+{FTAN}
+  <h2>{HEADING_LANGUAGE_DETAILS}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td>
+        <select name="code" style="width: 97%;">
+		<option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+		<!-- BEGIN language_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+          <!-- END language_list_block -->
+        </select>
+      </td>
+      <td width="110">
+        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
+      </td>
+    </tr>
+  </table>
+  <br />
+</form>
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/media_rename.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/media_rename.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/media_rename.htt	(revision 1529)
@@ -0,0 +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 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/backup/pages_modify.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_modify.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_modify.htt	(revision 1529)
@@ -0,0 +1,25 @@
+<!-- BEGIN main_block -->
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+<tr style="background:#f0f0f0;">
+	<td valign="middle" align="left"><h2>{HEADING_MODIFY_PAGE}</h2></td>
+	<td align="left" width="20%">ID: {PAGE_ID}</td>
+	<td align="right">
+		{TEXT_CURRENT_PAGE}:
+		<b>{PAGE_TITLE}</b>
+		- 
+		<a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}">{TEXT_CHANGE_SETTINGS}</a>
+<!-- BEGIN show_section_block -->
+		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
+		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
+<!-- END show_section_block -->
+		<font style="color:#999;" class="{CLASS_DISPLAY_MODIFIED}"><br />
+<!-- BEGIN show_modify_block -->
+		{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
+<!-- END show_modify_block -->
+		</font>
+	</td>
+</tr>
+</table>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_sections.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_sections.htt	(revision 1529)
@@ -0,0 +1,115 @@
+<!-- BEGIN main_block -->
+<div class="jsadmin jcalendar hide"></div>
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td valign="middle" align="left"><h2>{HEADING_MANAGE_SECTIONS}</h2></td>
+		<td align="left" width="20%">ID: {PAGE_ID}</td>
+		<td align="right">{TEXT_CURRENT_PAGE}: <b>{PAGE_TITLE}</b>
+			-
+			<a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{HEADING_MODIFY_PAGE}</a>
+			-
+			<a href="{ADMIN_URL}/pages/settings.php?page_id={PAGE_IDKEY}">{TEXT_CHANGE_SETTINGS}</a>
+		</td>
+     </tr>
+</table>
+
+        <form name="section_properties" action="{ADMIN_URL}/pages/sections_save.php?page_id={PAGE_IDKEY}" method="post">
+		{FTAN}
+		
+        <table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" class="img_noborder">
+			<tr class="sections_list">
+				<td class="header_list_type">{TEXT_TYPE}</td>
+				<td class="header_list_block"><span {STYLE_DISPLAY_SECTION_BLOCK}>{TEXT_BLOCK}&nbsp;</span></td>
+				<td class="header_list_pubdate_start">{TEXT_PUBL_START_DATE}</td>
+				<td class="header_list_pubdate_end">{TEXT_PUBL_END_DATE}</td>
+				<td class="header_list_sections_actions" colspan="3">{TEXT_ACTIONS}</td>
+				<td class="header_list_section_id">ID</td>
+				<td {DISPLAY_DEBUG}>{TEXT_PID}</td>
+			</tr>
+<!-- BEGIN section_block -->
+            	<tr class="sectionrow">
+    				<td align="right" style="display:none;">
+                      <input type="hidden" name="page_id" value="{PAGE_IDKEY}"  />
+                      <input type="hidden" name="section_id" value="{VAR_SECTION_ID}"  />
+                      {VAR_SECTION_ID}
+                    </td>
+					
+                    <td>{LINK_MODIFY_URL_VAR_MODUL_NAME}</td>
+					
+                    <td class="{INPUT_ATTRIBUTE}"><span {STYLE_DISPLAY_SECTION_BLOCK}>
+                    	<select name="block{VAR_SECTION_ID}" class="input_normal">
+                        {SET_NONE_DISPLAY_OPTION}
+                    	<!-- BEGIN block_block -->
+                    		<option value="{VALUE}"{SELECTED}>{NAME}</option>
+                    	<!-- END block_block -->
+                    	</select></span>&nbsp;
+                    </td>
+					
+                    <td class="list_pubdate_start"><input type="text" id="start_date{VAR_SECTION_ID}" name="start_date{VAR_SECTION_ID}" value="{VALUE_PUBL_START}" class="input_normal" />
+                        <img src="{THEME_URL}/images/calendar_16.png" id="trigger_start{VAR_SECTION_ID}" style="cursor:pointer;" title="{TEXT_CALENDAR}" alt="{TEXT_CALENDAR}"  />
+                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor:pointer;" alt="{TEXT_DELETE_DATE}" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.start_date{VAR_SECTION_ID}.value=''" />
+                    </td>
+					
+                    <td class="list_pubdate_end"><input type="text" id="end_date{VAR_SECTION_ID}" name="end_date{VAR_SECTION_ID}" value="{VALUE_PUBL_END}" class="input_normal" />
+                        <img src="{THEME_URL}/images/calendar_16.png" id="trigger_stop{VAR_SECTION_ID}" alt="{TEXT_CALENDAR}" style="cursor: pointer;" title="{TEXT_CALENDAR}"  />
+                        <img src="{THEME_URL}/images/{CLOCK_DEL_16_PNG}" style="cursor:pointer;" alt="{TEXT_DELETE_DATE}" title="{TEXT_DELETE_DATE}" onclick="document.section_properties.end_date{VAR_SECTION_ID}.value=''" />
+                    </td>
+
+					<td>{VAR_MOVE_UP_URL}</td>
+					
+                    <td>{VAR_MOVE_DOWN_URL}</td>
+
+                    <td>
+                        <a href="#" onclick="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_IDKEY}');">
+                        <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="{TEXT_DELETE}" border="0" />
+                        </a>
+                    </td>
+
+                    <td class="list_section_id">{VAR_SECTION_ID}</td>
+
+                    <td {DISPLAY_DEBUG}>{POSITION}</td>
+                </tr>
+<!-- END section_block -->
+                <tr>
+                    <td align="left" colspan="{DEBUG_COLSPAN_SIZE}">
+					<br />
+					<input type="submit" name="save" value="{TEXT_SAVE}" class="input_medium" />
+					</td>
+    	        </tr>
+	    </table>
+    </form>
+<br />
+	<h2>{TEXT_ADD_SECTION}</h2>
+	<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 summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%">
+    	<tr>
+    		<td width="50%" valign="middle">
+    			<select name="module" class="input_large">
+                <!-- BEGIN module_block -->
+    			 <option value="{VALUE}"{SELECTED}>{NAME}</option>
+                 <!-- END module_block -->
+    			</select>
+				&nbsp;&nbsp;
+				<input type="submit" name="submit" value="{TEXT_ADD}" class="input_medium" />
+   		  </td>
+    	</tr>
+   	  </table>
+	</form>
+    <!-- BEGIN calendar_block -->
+    <script type="text/javascript" >
+         var section_id = '{VAR_SECTION_ID}';
+         var start_date = '{start_date}';
+         var end_date = '{end_date}';
+         var trigger_start = '{trigger_start}';
+         var trigger_end = '{trigger_end}';
+         var jscal_today = '{jscal_today}';
+         var jscal_ifformat = '{jscal_ifformat}';
+         var jscal_firstday = {jscal_firstday};
+         var showsTime = {showsTime};
+         var timeFormat = {timeFormat};
+    </script>
+    <script type="text/javascript" src="{ADMIN_URL}/pages/page_calendar.js" ></script>
+    <!-- END calendar_block -->
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/modules.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/modules.htt	(revision 1529)
@@ -0,0 +1,136 @@
+<!-- BEGIN main_block -->
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="right">
+			{URL_TEMPLATES}
+			-
+			{URL_LANGUAGES}
+			-
+			{URL_ADVANCED}
+		</td>
+     </tr>
+</table>
+
+<form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
+  <h2>{HEADING_INSTALL_MODULE}</h2>
+  <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
+    <tr>
+      <td valign="middle">
+        <input type="file" name="userfile" size="97" />
+        <script type="text/javascript">
+		document.install.userfile.focus();
+		</script><br />
+        <input type="checkbox" name="overwrite" value="false"  />
+		<span>{OVERWRITE_NEWER_FILES}</span>
+      </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_MODULE}</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 module_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+          <!-- END module_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_MODULE_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 module_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+          <!-- END module_list_block -->
+        </select>
+      </td>
+      <td width="110">
+        <input type="submit" name="submit" value="{TEXT_VIEW_DETAILS}" style="width: 100px;" />
+      </td>
+    </tr>
+  </table>
+  <br />
+</form>
+<div class="{DISPLAY_MANUAL_INSTALL}">
+  <h2>{HEADING_INVOKE_MODULE_FILES}</h2>
+  <p>{TEXT_MANUAL_INSTALLATION}</p>
+  <form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
+{FTAN}
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
+	  <tr>
+		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "install.php"</td>
+		<td valign="middle">
+			<input type="hidden" name="action" value="install" />
+			<select name="file" style="width: 250px;">
+	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN install_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+			<!-- END install_list_block -->
+			</select>
+			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
+		</td>
+	  </tr>
+  </table>
+  </form>
+  
+  <form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
+{FTAN}
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
+	  <tr>
+		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "upgrade.php"</td>
+		<td valign="middle" >
+			<input type="hidden" name="action" value="upgrade" />
+			<select name="file" style="width: 250px;">
+	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN install_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+			<!-- END install_list_block -->
+			</select>
+			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
+		</td>
+	  </tr>
+  </table>
+  </form>
+
+  <form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
+{FTAN}
+  <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
+	  <tr>
+		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "uninstall.php"</td>
+		<td valign="middle">
+			<input type="hidden" name="action" value="uninstall" />
+			<select name="file" style="width: 250px;">
+	        <option value="" selected="selected">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN install_list_block -->
+			<option value="{VALUE}">{NAME}</option>
+			<!-- END install_list_block -->
+			</select>
+			<input type="submit" name="submit" value="{TEXT_EXECUTE}" style="width:100px;" />
+			</td>
+	  </tr>
+  </table>
+  </form>
+
+  <p style="color:red;">{TEXT_MANUAL_INSTALLATION_WARNING}</p>
+</div>
+<!-- END main_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/login.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/login.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/login.htt	(revision 1529)
@@ -0,0 +1,83 @@
+<!-- BEGIN mainBlock -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>{TEXT_LOGIN}</title>
+<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
+<meta http-equiv="content-language" content="{LANGUAGE}" />
+<meta name="description" content="{TEXT_LOGIN}" />
+<meta name="keywords" content="{TEXT_LOGIN}" />
+<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
+</head>
+<body onload="document.login.{USERNAME_FIELDNAME}.focus();">
+<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
+	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
+	{TEXT_LOGIN}
+</div> 
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
+  <tr>
+    <td class="content">
+      <form name="login" action="{ACTION_URL}" method="post">
+        <input type="hidden" name="url" value="{URL}" />
+        <input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
+        <input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
+        <table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
+          <tr>
+            <td height="40" align="center" colspan="2">{MESSAGE}</td>
+          </tr>
+          <tr>
+            <td height="10" colspan="2"></td>
+          </tr>
+          <tr>
+            <td width="170" height="30" align="right">{TEXT_USERNAME}:</td>
+            <td>
+              <input type="text" maxlength="{MAX_USERNAME_LEN}" name="{USERNAME_FIELDNAME}" value="{USERNAME}" style="width: 180px;" />
+            </td>
+          </tr>
+          <tr>
+            <td width="170" height="30" align="right">{TEXT_PASSWORD}:</td>
+            <td>
+              <input type="password" maxlength="{MAX_PASSWORD_LEN}" name="{PASSWORD_FIELDNAME}" style="width: 180px;" />
+            </td>
+          </tr>
+          <tr style="{DISPLAY_REMEMBER_ME}">
+            <td>&nbsp;</td>
+            <td>
+              <input type="checkbox" name="remember" id="remember" value="true" />
+              <label for="remember">{TEXT_REMEMBER_ME}</label>
+            </td>
+          </tr>
+          <tr>
+            <td>&nbsp;</td>
+            <td>
+              <input type="submit" name="submit" value="{TEXT_LOGIN}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" />
+            </td>
+          </tr>
+          <tr>
+            <td height="10" colspan="2"></td>
+          </tr>
+        </table>
+      </form>
+      <center>
+        <a href="{FORGOTTEN_DETAILS_APP}">{TEXT_FORGOTTEN_DETAILS}</a> 
+		<br />
+        <br />
+        <br />
+        <a href="{WB_URL}/">{TEXT_HOME}</a>
+      </center>
+    </td>
+  </tr>
+</table>
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding:10px 0;">
+  <tr>
+    <td style="font-size:10px;text-align:center;">
+      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
+      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+<!-- END mainBlock -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/addons.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/addons.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/addons.htt	(revision 1529)
@@ -0,0 +1,60 @@
+<!-- BEGIN main_block -->
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td valign="middle" align="left"><h2>{ADDONS_OVERVIEW}</h2></td>
+		<td align="right">{URL_ADVANCED}</td>
+	</tr>
+</table>
+
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+	<tr>
+		<td align="center" valign="top">
+			<!-- BEGIN modules_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_MODULES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/modules/index.php"><img src="{THEME_URL}/icons/modules.png" alt="0" /> </a> </td>
+					<td class="description" valign="top"><a href="{ADMIN_URL}/modules/index.php"><span class="title">{MODULES}</span></a><p>{MODULES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END modules_block -->
+			<!-- BEGIN templates_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_TEMPLATES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/templates/index.php"><img src="{THEME_URL}/icons/templates.png" alt="{TEMPLATES}" /> </a> </td>
+					<td class="description" valign="top"><a href="{ADMIN_URL}/templates/index.php"><span class="title">{TEMPLATES}</span></a><p>{TEMPLATES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END templates_block -->
+			<!-- BEGIN languages_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_LANGUAGES} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><a href="{ADMIN_URL}/languages/index.php"><img src="{THEME_URL}/icons/languages.png" alt="{LANGUAGES}" /> </a> </td>
+					<td class="description" valign="top"> <a href="{ADMIN_URL}/languages/index.php"><span class="title">{LANGUAGES}</span></a><p>{LANGUAGES_OVERVIEW}</p></td>
+				</tr>
+			</table>
+			<!-- END languages_block -->
+			<!-- BEGIN reload_block -->
+			<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" {DISPLAY_RELOAD} >
+				<tr>
+					<td class="graphic" align="center" valign="middle" rowspan="2"><img src="{THEME_URL}/icons/admintools.png" alt="{TXT_ADMIN_SETTINGS}" /> </td>
+					<td class="description" valign="top"><span class="title">{TXT_ADMIN_SETTINGS}</span>
+						<form action="{RELOAD_URL}" method="post">
+						{FTAN}
+							{MESSAGE_RELOAD_ADDONS}
+							<br style="margin-bottom: 0.5em" />
+							<input {DISPLAY_MODULES} type="checkbox" name="reload_modules" id="reload_modules" value="true" />
+							<label {DISPLAY_MODULES} for="reload_modules">{MODULES}</label>
+							<input {DISPLAY_TEMPLATES} type="checkbox" name="reload_templates" id="reload_templates" value="true" />
+							<label {DISPLAY_TEMPLATES} for="reload_templates">{TEMPLATES}</label>
+							<input {DISPLAY_LANGUAGES} type="checkbox" name="reload_languages" id="reload_languages" value="true" />
+							<label {DISPLAY_LANGUAGES} for="reload_languages">{LANGUAGES}</label>
+							<input type="submit" name="submit" value="{TEXT_RELOAD}" />
+						</form>
+					</td>
+				</tr>
+			</table>
+			<!-- END reload_block -->
+		</td>
+	</tr>
+</table>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/success.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/success.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/success.htt	(revision 1529)
@@ -0,0 +1,11 @@
+<!-- BEGIN main_block -->
+<div class="msg-box rounded">
+	<p>{MESSAGE}</p>
+<!-- BEGIN show_redirect_block -->
+ <script type="text/javascript">
+  setTimeout("location.href='{REDIRECT}'", {REDIRECT_TIMER});
+ </script>
+<!-- END show_redirect_block -->
+<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{REDIRECT}';" />
+</div>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/admintools.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/admintools.htt	(revision 1529)
@@ -0,0 +1,22 @@
+<!-- BEGIN main_block -->
+<h2>{HEADING_ADMINISTRATION_TOOLS} </h2>
+<div id="admintools">
+	<ul>
+	<!-- BEGIN tool_list_block -->
+	<li>
+		<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" alt="{TOOL_NAME}" align="left" /></a>
+			</td>
+			<td class="description" valign="top">
+				<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}"><span class="title">{TOOL_NAME}</span></a>{TOOL_DESCRIPTION}
+			</td>
+		</tr>
+		</table>
+	</li>
+	<!-- END tool_list_block -->
+	</ul>
+	{TOOL_LIST}
+</div>
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/languages_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/languages_details.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/languages_details.htt	(revision 1529)
@@ -0,0 +1,32 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_LANGUAGE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_CODE}:</td>
+	<td>{CODE}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/modules_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/modules_details.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/modules_details.htt	(revision 1529)
@@ -0,0 +1,36 @@
+<!-- BEGIN main_block -->
+
+<h2>{HEADING_MODULE_DETAILS}</h2>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0">
+<tr>
+	<td width="100">{TEXT_NAME}:</td>
+	<td>{NAME}</td>
+</tr>
+<tr>
+	<td>{TEXT_TYPE}:</td>
+	<td>{TYPE}</td>
+</tr>
+<tr>
+	<td>{TEXT_AUTHOR}:</td>
+	<td>{AUTHOR}</td>
+</tr>
+<tr>
+	<td>{TEXT_VERSION}:</td>
+	<td>{VERSION}</td>
+</tr>
+<tr>
+	<td>{TEXT_DESIGNED_FOR}:</td>
+	<td>Website Baker {DESIGNED_FOR}</td>
+</tr>
+<tr>
+	<td valign="top">{TEXT_DESCRIPTION}:</td>
+	<td style="text-align: justify;">{DESCRIPTION}</td>
+</tr>
+</table>
+
+<br />
+
+<button onclick="window.location = 'index.php';">{TEXT_BACK}</button>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/media.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/media.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/media.htt	(revision 1529)
@@ -0,0 +1,123 @@
+<!-- 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>
Index: branches/2.8.x/wb/templates/argos_theme/templates/backup/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/groups.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/groups.htt	(revision 1529)
@@ -0,0 +1,30 @@
+<!-- BEGIN main_block -->
+
+<form name="groups" action="groups.php" method="post">
+ {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/backup/pages_settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_settings.htt	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_settings.htt	(revision 1529)
@@ -0,0 +1,178 @@
+<!-- BEGIN main_block -->
+
+<script src="{ADMIN_URL}/pages/page_settings.js" type="text/javascript"></script>
+
+<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+  <tr style="background:#f0f0f0;">
+	<td valign="middle" align="left"><h2>{HEADING_MODIFY_PAGE_SETTINGS}</h2></td>
+	<td nowrap="nowrap">ID: {PAGE_ID}</td>
+	<td align="right">
+		{TEXT_CURRENT_PAGE}:
+		<b>{PAGE_TITLE}</b>
+		-
+		<a href="{ADMIN_URL}/pages/modify.php?page_id={PAGE_IDKEY}">{TEXT_MODIFY_PAGE}</a>
+		<font style="{DISPLAY_MANAGE_SECTIONS}">-</font>
+		<a href="{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}" style="{DISPLAY_MANAGE_SECTIONS}">{TEXT_MANAGE_SECTIONS}</a>
+		<br />
+		<font style="color:#999;" class="{DISPLAY_MODIFIED}">
+			{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}
+		</font>
+	</td>
+  </tr>
+</table>
+
+<form name="settings" action="settings2.php" method="post">
+{FTAN}
+<input type="hidden" name="page_id" value="{PAGE_ID}" />
+<table summary="" cellpadding="2" cellspacing="0" border="0" width="100%" align="center">
+<tr>
+	<td width="100" height="20">{TEXT_PAGE_TITLE}:</td>
+	<td width="240" height="20">
+		<input type="text" name="page_title" value="{PAGE_TITLE}" style="width: 232px;" />
+	</td>
+	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
+		{TEXT_ADMINISTRATORS}:
+		<ul style="list-style-type: none; margin: 0; padding: 0;">
+			<!-- BEGIN group_list_block -->
+			<li>
+			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+			<label for="admin_group_{TOGGLE}">{NAME}</label>
+			</li>
+			<!-- END group_list_block -->
+		</ul>
+	</td>
+	<td rowspan="10" valign="top" style="padding:8px 0 0 20px;">
+		<div id="allowed_viewers" style="{DISPLAY_VIEWERS}">
+			{TEXT_ALLOWED_VIEWERS}:
+			<ul style="list-style-type:none;margin:0;padding:0;">
+				<!-- BEGIN group_list_block2 -->
+				<li>
+				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
+				</li>
+				<!-- END group_list_block2 -->
+			</ul>
+		</div>
+	</td>
+</tr>
+<tr>
+	<td width="100" height="20">{TEXT_MENU_TITLE}:</td>
+	<td width="240" height="20">
+		<input type="text" name="menu_title" value="{MENU_TITLE}" style="width: 232px;" />
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_PARENT}:</td>
+	<td width="240">
+		<select name="parent" style="width: 240px;" onchange="return disabled_hack_for_ie(this);">
+			<!-- BEGIN page_list_block2 -->
+			<option value="{ID}"{SELECTED} style="background: {FLAG_ROOT_ICON} no-repeat center left; padding-left: 20px;">{TITLE}</option>
+			<!-- END page_list_block2 -->
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_VISIBILITY}:</td>
+	<td width="240">
+		<select name="visibility" onchange="javascript: toggle_viewers();" style="width: 240px;">
+			<option value="public"{PUBLIC_SELECTED}>{TEXT_PUBLIC}</option>
+			<option value="private"{PRIVATE_SELECTED}>{TEXT_PRIVATE}</option>
+			<option value="registered"{REGISTERED_SELECTED}>{TEXT_REGISTERED}</option>
+			<option value="hidden"{HIDDEN_SELECTED}>{TEXT_HIDDEN}</option>
+			<option value="none"{NO_VIS_SELECTED}>{TEXT_NONE}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100" valign="top">{TEXT_DESCRIPTION}:</td>
+	<td>
+		<textarea name="description" rows="10" cols="1" style="width:236px;height:50px;">{DESCRIPTION}</textarea>
+	</td>
+</tr>
+<tr>
+	<td width="100" valign="top">{TEXT_KEYWORDS}:</td>
+	<td>
+		<textarea name="keywords" rows="10" cols="1" style="width:236px;height:50px;">{KEYWORDS}</textarea>
+	</td>
+</tr>
+<tr>
+	<td>
+		{TEXT_TARGET}:
+	</td>
+	<td>
+		<select name="target" style="width: 240px;" ><!--  value="{TARGET}" -->
+			<option value="_blank"{BLANK_SELECTED}>{TEXT_NEW_WINDOW}</option>
+			<option value="_self"{SELF_SELECTED}>{TEXT_SAME_WINDOW}</option>
+			<option value="_top"{TOP_SELECTED}>{TEXT_TOP_FRAME}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">{TEXT_TEMPLATE}:</td>
+	<td width="240">
+		<select name="template" style="width: 240px;">
+			<option value="">{TEXT_SYSTEM_DEFAULT}</option>
+			<option value="">----------------------</option>
+			<!-- BEGIN template_list_block -->
+			<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END template_list_block -->
+		</select>
+	</td>
+</tr>
+<tr style="{DISPLAY_MENU_LIST}">
+	<td width="100">{TEXT_MENU}:</td>
+	<td width="240">
+		<select name="menu" style="width: 240px;">
+			<!-- BEGIN menu_list_block -->
+			<option value="{VALUE}"{SELECTED}>{NAME}</option>
+			<!-- END menu_list_block -->
+		</select>
+	</td>
+</tr>
+<tr style="{DISPLAY_LANGUAGE_LIST}">
+	<td width="100">{TEXT_LANGUAGE}:</td>
+	<td width="240">
+		<select name="language" style="width: 240px;">
+			<!-- BEGIN language_list_block -->
+			<option value="{VALUE}"{SELECTED} style="background: {FLAG_LANG_ICONS} no-repeat center left; padding-left: 20px;">{NAME}</option>
+			<!-- END language_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- insert page_code 20090904-->
+<tr{DISPLAY_CODE_PAGE_LIST}>
+	<td width="100">{TEXT_PAGE_CODE}:</td>
+	<td class="list_page_code">
+		<select name="page_code" class="value_page_code">
+			<!-- BEGIN page_code_list_block -->
+			<option value="{VALUE}"{SELECTED} style="background: {FLAG_CODE_ICON} no-repeat center left; padding-left: 20px;">&nbsp;{PAGE_VALUE}</option>
+			<!-- END page_code_list_block -->
+		</select>
+	</td>
+</tr>
+<!-- page code -->
+<tr>
+	<td width="100">{TEXT_SEARCHING}:</td>
+	<td width="240">
+		<select name="searching" style="width: 240px;">
+			<option value="1">{TEXT_ENABLED}</option>
+			<option value="0"{SEARCHING_DISABLED}>{TEXT_DISABLED}</option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td width="100">&nbsp;</td>
+	<td colspan="4">
+		<input type="submit" name="submit" value="{TEXT_SAVE} {SECTION_SETTINGS}" style="width: 117px;" />
+		<input type="reset" name="reset" value="{TEXT_RESET}" style="width: 117px;" />
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+</form>
+
+<!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/install/stylesheet.css
===================================================================
--- branches/2.8.x/wb/install/stylesheet.css	(revision 1528)
+++ branches/2.8.x/wb/install/stylesheet.css	(revision 1529)
@@ -1,75 +1,16 @@
-body,td,th,input,textarea {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #000000;
-}
-body {
-	background-color: #A8BCCB;
-	background-image: url(../templates/wb_theme/images/background.png);
-	background-repeat: repeat-x;
-	margin: 0px;
-}
-form {
-	margin: 0;
-}
-
-input:focus, select:focus {
-	background: #F1F8FD;
-}
-
-.wrong {
-	background-color: #FFDBDB;
-}
-
-.submit {
-	border : solid 1px #CCCCCC;
-	background: #E9ECEF;
-	color : #003366;
-	font-weight : bold;
-	font-size : 11px;
-	padding: 4px;
-	width: 100%;
-}
-.content {
-	background-color: #FFFFFF;
-	padding: 15px;
-	height: 350px;
-	width: 850px;
-	text-align: justify;
-	vertical-align: top;
-}
-hr {
-	margin: 15px 0px 15px 0px;
-	color: #003366;
-	height: 1px;
-}
-h1 {
-	font-size: 15px;
-	color: #336699;
-	margin: 0px 0px 5px 0px;
-	border-bottom: 1px solid #CCCCCC;
-}
-a:link, a:visited, a:active {
-	color: #003366;
-	text-decoration: none;
-}
-a:hover {
-	text-decoration: none;
-	color: #336699;
-}
-.bad {
-	color: #FF0000;
-	font-weight: bold;
-}
-.good {
-	color: #009900;
-	font-weight: bold;
-}
-.note {
-	color: #666666;
-	font-size: 10px;
-}
-.hide {
-	display: none;
-}
-.warning { border: 2px #844 solid; padding: 1px; margin: 5px auto; background: #fee; color: #ee0000; text-align: center; font-size: 1.2em; line-height: 1em; }
+body,td,th,input,textarea { font-family :Verdana, Arial, Helvetica, sans-serif; font-size :12px; color :#000000; }
+body { background-color :#a8bccb; background-image :url(../templates/wb_theme/images/background.png); background-repeat :repeat-x; margin :0px; }
+form { margin :0; }
+input:focus, select:focus { background :#f1f8fd; }
+.wrong { background-color :#ffdbdb; }
+.submit { border :solid 2px #cccccc; background :#ffeeee; color :#ee0000; font-weight :bold; font-size :11px; padding :4px; width :100%; }
+.content { background-color :#ffffff; padding :15px; height :350px; width :850px; text-align :justify; vertical-align :top; }
+hr { margin :1em auto; color :#003366; height :1px; }
+h1 { font-size :130%; color :#336699; margin :0px 0px 5px 0px; border-bottom :1px solid #cccccc; }
+a:link, a:visited, a:active { color :#003366; text-decoration :none; }
+a:hover { text-decoration :none; color :#336699; }
+.bad { color :#ff0000; font-weight :bold; }
+.good { color :#009900; font-weight :bold; }
+.note { color :#666666; font-size :10px; }
+.hide { display :none; }
+.warning { border :2px #884444 solid; padding :1px; margin :5px auto; background :#ffeeee; color :#ee0000; text-align :center; font-size :1.2em; line-height :1em; }
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php	(revision 1528)
+++ branches/2.8.x/wb/install/save.php	(revision 1529)
@@ -81,17 +81,8 @@
 		exit();
 	}
 }
+/* */
 
-// Dummy class to allow modules' install scripts to call $admin->print_error
-class admin_dummy
-{
-	var $error='';
-	function print_error($message)
-	{
-		$this->error=$message;
-	}
-}
-
 // Function to workout what the default permissions are for files created by the webserver
 function default_file_mode($temp_dir) {
 	$v = explode(".",PHP_VERSION);
@@ -295,19 +286,19 @@
 "\n".
 "define('DB_TYPE', 'mysql');\n".
 "define('DB_HOST', '$database_host');\n".
+"define('DB_NAME', '$database_name');\n".
 "define('DB_USERNAME', '$database_username');\n".
 "define('DB_PASSWORD', '$database_password');\n".
-"define('DB_NAME', '$database_name');\n".
 "define('TABLE_PREFIX', '$table_prefix');\n".
 "\n".
 "define('WB_PATH', dirname(__FILE__));\n".
 "define('WB_URL', '$wb_url');\n".
 "define('ADMIN_PATH', WB_PATH.'/admin');\n".
-"define('ADMIN_URL', '$wb_url/admin');\n".
+"define('ADMIN_URL', WB_URL.'/admin');\n".
 "\n".
 "require_once(WB_PATH.'/framework/initialize.php');\n".
 "\n".
-"?>";
+"";
 
 $config_filename = '../config.php';
 
@@ -329,9 +320,9 @@
 // Define configuration vars
 define('DB_TYPE', 'mysql');
 define('DB_HOST', $database_host);
+define('DB_NAME', $database_name);
 define('DB_USERNAME', $database_username);
 define('DB_PASSWORD', $database_password);
-define('DB_NAME', $database_name);
 define('TABLE_PREFIX', $table_prefix);
 define('WB_PATH', str_replace(array('/install','\install'), '',dirname(__FILE__)));
 define('WB_URL', $wb_url);
@@ -358,11 +349,24 @@
 $sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php';
 require_once($sSecMod);
 
+require_once(WB_PATH.'/framework/class.admin.php');
+
+// Dummy class to allow modules' install scripts to call $admin->print_error
+class admin_dummy extends admin
+{
+	var $error='';
+	function print_error($message)
+	{
+		$this->error=$message;
+	}
+}
+
 // Include WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 
 // Re-connect to the database, this time using in-build database class
 require_once(WB_PATH.'/framework/class.login.php');
+
 $database=new database();
 
 // Check if we should install tables
@@ -419,7 +423,7 @@
 	       . ' `modified_when` INT NOT NULL DEFAULT \'0\','
 	       . ' `modified_by` INT NOT NULL  DEFAULT \'0\','
 	       . ' PRIMARY KEY ( `page_id` ) '
-	       . ' )';
+	       . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($pages);
 	
 	// Sections table
@@ -431,7 +435,7 @@
 	       . ' `publ_start` VARCHAR( 255 ) NOT NULL DEFAULT \'0\' ,'
 	       . ' `publ_end` VARCHAR( 255 ) NOT NULL DEFAULT \'0\' ,' 
 	       . ' PRIMARY KEY ( `section_id` ) '
-	       . ' )';
+	       . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($pages);
 
 	require(ADMIN_PATH.'/interface/version.php');
@@ -441,7 +445,7 @@
 		. ' `name` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
 		. ' `value` TEXT NOT NULL ,'
 		. ' PRIMARY KEY ( `setting_id` ) '
-		. ' )';
+		. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($settings);
 
 	$settings_rows=	"INSERT INTO `".TABLE_PREFIX."settings` "
@@ -453,7 +457,6 @@
 	." ('website_header', ''),"
 	." ('website_footer', ''),"
 	." ('wysiwyg_style', 'font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;'),"
-	." ('rename_files_on_upload', 'php,asp,phpx,aspx'),"
 	." ('er_level', ''),"
 	." ('default_language', '$default_language'),"
 	." ('app_name', 'wb_$session_rand'),"
@@ -519,7 +522,7 @@
 	       . ' `login_when` INT NOT NULL  DEFAULT \'0\','
 	       . ' `login_ip` VARCHAR( 15 ) NOT NULL DEFAULT \'\' ,'
 	       . ' PRIMARY KEY ( `user_id` ) '
-	       . ' )';
+	       . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($users);
 	
 	// Groups table
@@ -529,7 +532,7 @@
 	        . ' `module_permissions` TEXT NOT NULL ,'
 	        . ' `template_permissions` TEXT NOT NULL ,'
 	        . ' PRIMARY KEY ( `group_id` ) '
-	        . ' )';
+	        . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($groups);
 	
 	// Search settings table
@@ -538,7 +541,7 @@
 	        . ' `value` TEXT NOT NULL ,'
 	        . ' `extra` TEXT NOT NULL ,'
 	        . ' PRIMARY KEY ( `search_id` ) '
-	        . ' )';
+	        . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($search);
 	
 	// Addons table
@@ -554,7 +557,7 @@
 			.'`author` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
 			.'`license` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
 			.' PRIMARY KEY ( `addon_id` ) '
-			.' )';
+			.' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($addons);
 
 	// Insert default data
@@ -654,7 +657,7 @@
 
 	// Include the PclZip class file (thanks to
 	require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');
-			
+
 	// Install add-ons
 	if(file_exists(WB_PATH.'/install/modules')) {
 		// Unpack pre-packaged modules
@@ -668,8 +671,9 @@
 		// Unpack pre-packaged languages
 		
 	}
-	
-	$admin=new admin_dummy();
+
+	$admin=new admin_dummy('Start','',false,false);
+
 	// Load addons into DB
 	$dirs['modules'] = WB_PATH.'/modules/';
 	$dirs['templates'] = WB_PATH.'/templates/';
@@ -774,22 +778,27 @@
 	 	}
 	}
 }
+
+$ThemeUrl = WB_URL.$admin->correct_theme_source('warning.html');
+// Setup template object, parse vars to it, then parse it
+$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('login.htt'));
+
 // Log the user in and go to Website Baker Administration
 $thisApp = new Login(
 		array(
 				"MAX_ATTEMPS" => "50",
-				"WARNING_URL" => ADMIN_URL."/login/warning.html",
+				"WARNING_URL" => $ThemeUrl."/warning.html",
 				"USERNAME_FIELDNAME" => 'admin_username',
 				"PASSWORD_FIELDNAME" => 'admin_password',
 				"REMEMBER_ME_OPTION" => SMART_LOGIN,
 				"MIN_USERNAME_LEN" => "2",
-				"MIN_PASSWORD_LEN" => "2",
+				"MIN_PASSWORD_LEN" => "3",
 				"MAX_USERNAME_LEN" => "30",
 				"MAX_PASSWORD_LEN" => "30",
 				'LOGIN_URL' => ADMIN_URL."/login/index.php",
 				'DEFAULT_URL' => ADMIN_URL."/start/index.php",
-				'TEMPLATE_DIR' => ADMIN_PATH."/login",
-				'TEMPLATE_FILE' => "template.html",
+				'TEMPLATE_DIR' => $ThemePath,
+				'TEMPLATE_FILE' => 'login.htt',
 				'FRONTEND' => false,
 				'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php",
 				'USERS_TABLE' => TABLE_PREFIX."users",
@@ -796,4 +805,3 @@
 				'GROUPS_TABLE' => TABLE_PREFIX."groups",
 		)
 );
-?>
Index: branches/2.8.x/wb/install/index.php
===================================================================
--- branches/2.8.x/wb/install/index.php	(revision 1528)
+++ branches/2.8.x/wb/install/index.php	(revision 1529)
@@ -4,7 +4,6 @@
  * @category        backend
  * @package         install
  * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -36,6 +35,7 @@
 	}
 }
 
+$installFlag = true;
 // Check if the page has been reloaded
 if(!isset($_GET['sessions_checked']) OR $_GET['sessions_checked'] != 'true') {
 	// Set session variable
@@ -47,11 +47,11 @@
 	// Check if session variable has been saved after reload
 	if(isset($_SESSION['session_support'])) {
 		$session_support = $_SESSION['session_support'];
-	} else {   
+	} else {
+		$installFlag = false;
 		$session_support = '<font class="bad">Disabled</font>';
 	}
 }
-
 // Check if AddDefaultCharset is set
 $e_adc=false;
 $sapi=php_sapi_name();
@@ -67,8 +67,7 @@
 	}
 }
 
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+?><!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>Website Baker Installation Wizard</title>
@@ -95,14 +94,14 @@
 </head>
 <body>
 
-<table cellpadding="0" cellspacing="0" border="0" width="850" align="center">
+<table cellpadding="0" cellspacing="0" border="0" width="998px" align="center">
 <tr>
 	<td width="60" valign="top">
 		<img src="../templates/wb_theme/images/logo.png" alt="Logo" />
 	</td>
 	<td width="5">&nbsp;</td>
-	<td style="font-size: 20px;">
-		<font style="color: #FFF;">Installation Wizard</font>
+	<td>
+		<h1 style="border:none; margin-top:1em;font-size:150%;">Installation Wizard</h1>
 	</td>
 </tr>
 </table>
@@ -113,7 +112,7 @@
 <input type="hidden" name="password_fieldname" value="admin_password" />
 <input type="hidden" name="remember" id="remember" value="true" />
 
-<table cellpadding="0" cellspacing="0" border="0" width="850" align="center" style="margin-top: 10px;">
+<table cellpadding="0" cellspacing="0" border="0" width="998px" align="center" style="margin-top: 10px;">
 <tr>
 	<td class="content">
 	
@@ -143,6 +142,7 @@
 			   {
 					?><font class="good">Yes</font><?php
 				} else {
+					$installFlag = false;
 					?><font class="bad">No</font><?php
 				}
 				?>
@@ -155,6 +155,7 @@
 				if(ini_get('safe_mode')=='' || strpos(strtolower(ini_get('safe_mode')), 'off')!==FALSE || ini_get('safe_mode')==0) {
 					?><font class="good">Disabled</font><?php
 				} else {
+					$installFlag = false;
 					?><font class="bad">Enabled</font><?php
 				}
 				?>
@@ -165,6 +166,7 @@
 			<td width="60">
 				<?php
 					if($e_adc) {
+						$installFlag = false;
 						?><font class="bad">No</font><?php
 					} else {
 						?><font class="good">Yes</font><?php
@@ -173,7 +175,9 @@
 			</td>
 			<td colspan="4">&nbsp;</td>
 		</tr>
-		<?php if($e_adc) { ?>
+		<?php if($e_adc) {
+			$installFlag = false;
+		?>
 		<tr>
 			<td colspan="6" style="font-size: 10px;" class="bad">Please note: AddDefaultCharset is set to <?php echo $e_adc;?> in apache.conf.<br />If you have to use umlauts (e.g. &auml; &aacute;) please change this to Off. - Or use <?php echo $e_adc;?> inside website baker, too.</td>
 		</tr>
@@ -184,22 +188,47 @@
 			<td colspan="8"><h1>Step 2</h1>Please check the following files/folders are writeable before continuing...</td>
 		</tr>
 		<tr>
-			<td style="color: #666666;"><?php print $wb_root ?>/config.php</td>
-			<td><?php if(is_writable('../config.php')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../config.php')) { echo '<font class="bad">File Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
-			<td style="color: #666666;"><?php print $wb_root ?>/pages/</td>
-			<td><?php if(is_writable('../pages/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../pages/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
-			<td style="color: #666666;"><?php print $wb_root ?>/media/</td>
-			<td><?php if(is_writable('../media/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../media/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
-			<td style="color: #666666;"><?php print $wb_root ?>/templates/</td>
-			<td><?php if(is_writable('../templates/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../templates/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+<?php
+$config = '<font class="good">Writeable</font>';
+$configFile = '/config.php';
+if(!isset($_SESSION['config_rename'])) {
+	if( ( file_exists($wb_path.$configFile)==false ) && (file_exists($wb_path.'/config.php.new')==true ) ){
+		if( (is_writeable($wb_path.'/config.php.new')==true) && (rename($wb_path.'/config.php.new',$wb_path.'/config.php')) ) {
+			$config = '<font class="good">Writeable</font>';
+			$_SESSION['config_rename'] = true;
+		} else {
+			$installFlag = false;
+			$configFile = '/config.php.new';
+			$config = '<font class="bad">Unwriteable</font>';
+		}
+	} elseif( (file_exists($wb_path.'/config.php.new')==true) && ( file_exists($wb_path.$configFile)==true ) ) {
+		if( (file_exists($wb_path.$configFile)==true) ) {
+			$installFlag = false;
+			$config = '<font class="bad">Already installed?</font>';
+		}
+	} elseif( (is_writeable($wb_path.'/config.php.new')==false) ) {
+			$installFlag = false;
+			$configFile = '/config.php.new';
+			$config = '<font class="bad">Unwriteable</font>';
+	}
+}
+?>
+			<td width="150px" style="color: #666666;"><?php print $wb_root.$configFile ?></td>
+			<td width="150px"><?php echo $config ?></td>
+			<td width="140px" style="color: #666666;"><?php print $wb_root ?>/pages/</td>
+			<td width="120px"><?php if(is_writable('../pages/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../pages/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+			<td width="140px" style="color: #666666;"><?php print $wb_root ?>/media/</td>
+			<td width="120px"><?php if(is_writable('../media/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../media/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+			<td width="140px" style="color: #666666;"><?php print $wb_root ?>/templates/</td>
+			<td width="120px"><?php if(is_writable('../templates/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../templates/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
 		</tr>
 		<tr>
 			<td style="color: #666666;"><?php print $wb_root ?>/modules/</td>
-			<td><?php if(is_writable('../modules/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../modules/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+			<td><?php if(is_writable('../modules/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../modules/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
 			<td style="color: #666666;"><?php print $wb_root ?>/languages/</td>
-			<td><?php if(is_writable('../languages/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../languages/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+			<td><?php if(is_writable('../languages/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../languages/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
 			<td style="color: #666666;"><?php print $wb_root ?>/temp/</td>
-			<td><?php if(is_writable('../temp/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../temp/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+			<td><?php if(is_writable('../temp/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../temp/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
 			<td>&nbsp;</td>
 			<td>&nbsp;</td>
 		</tr>
@@ -337,18 +366,18 @@
     		<tr>
     			<td style="color: #666666;">Database Name:<br />[a-zA-Z0-9_-]</td>
     			<td>
-    				<input <?php echo field_error('database_name');?> type="text" tabindex="8" name="database_name" style="width: 98%;" value="<?php if(isset($_SESSION['database_name'])) { echo $_SESSION['database_name']; } else { echo 'wb'; } ?>" />
+    				<input <?php echo field_error('database_name');?> type="text" tabindex="8" name="database_name" style="width: 98%;" value="<?php if(isset($_SESSION['database_name'])) { echo $_SESSION['database_name']; } else { echo 'DatabaseName'; } ?>" />
     			</td>
     			<td>&nbsp;</td>
     			<td style="color: #666666;">Password:</td>
     			<td>
-    				<input type="password" tabindex="10" name="database_password" style="width: 98%;"<?php if(isset($_SESSION['database_password'])) { echo ' value = "'.$_SESSION['database_password'].'"'; } ?> />
+    				<input type="password" tabindex="10" name="database_password" style="width: 98%;" value="<?php if(isset($_SESSION['database_password'])) { echo $_SESSION['database_password']; } ?>" />
     			</td>
     		</tr>
 		<tr>
 			<td style="color: #666666;">Table Prefix:<br />[a-zA-Z0-9_]</td>
 			<td>
-				<input <?php echo field_error('table_prefix');?> type="text" tabindex="11" name="table_prefix" style="width: 250px;"<?php if(isset($_SESSION['table_prefix'])) { echo ' value = "'.$_SESSION['table_prefix'].'"'; } ?> />
+				<input <?php echo field_error('table_prefix');?> type="text" tabindex="11" name="table_prefix" style="width: 250px;" value="<?php if(isset($_SESSION['table_prefix'])) { echo $_SESSION['table_prefix']; } else { echo 'wb_'; } ?>" />
 			</td>
 			<td>&nbsp;</td>
 			<td colspan="2">
@@ -364,7 +393,7 @@
 		<tr>
 			<td style="color: #666666;" colspan="1">Website Title:</td>
 			<td colspan="4">
-				<input <?php echo field_error('website_title');?> type="text" tabindex="13" name="website_title" style="width: 99%;" value="<?php if(isset($_SESSION['website_title'])) { echo $_SESSION['website_title']; } ?>" />
+				<input <?php echo field_error('website_title');?> type="text" tabindex="13" name="website_title" style="width: 99%;" value="<?php if(isset($_SESSION['website_title'])) { echo $_SESSION['website_title']; } else { echo 'Enter your website title'; } ?>" />
 			</td>
 		</tr>
 		<tr>
@@ -378,18 +407,18 @@
 			<td>&nbsp;</td>
 			<td style="color: #666666;">Password:</td>
 			<td>
-				<input <?php echo field_error('admin_password');?> type="password" tabindex="16" name="admin_password" style="width: 98%;"<?php if(isset($_SESSION['admin_password'])) { echo ' value = "'.$_SESSION['admin_password'].'"'; } ?> />
+				<input <?php echo field_error('admin_password');?> type="password" tabindex="16" name="admin_password" style="width: 98%;" value="" />
 			</td>
 		</tr>
 		<tr>
 			<td style="color: #666666;">Email:</td>
 			<td>
-				<input <?php echo field_error('admin_email');?> type="text" tabindex="15" name="admin_email" style="width: 98%;"<?php if(isset($_SESSION['admin_email'])) { echo ' value = "'.$_SESSION['admin_email'].'"'; } ?> />
+				<input <?php echo field_error('admin_email');?> type="text" tabindex="15" name="admin_email" style="width: 98%;" value="<?php if(isset($_SESSION['admin_email'])) { echo $_SESSION['admin_email']; } ?>" />
 			</td>
 			<td>&nbsp;</td>
 			<td style="color: #666666;">Re-Password:</td>
 			<td>
-				<input <?php echo field_error('admin_repassword');?> type="password" tabindex="17" name="admin_repassword" style="width: 98%;"<?php if(isset($_SESSION['admin_repassword'])) { echo ' value = "'.$_SESSION['admin_repassword'].'"'; } ?> />
+				<input <?php echo field_error('admin_repassword');?> type="password" tabindex="17" name="admin_repassword" style="width: 98%;" value=""  />
 			</td>
 		</tr>
 		<tr>
@@ -401,7 +430,7 @@
 				<tr valign="top">
 					<td>Please note: &nbsp;</td>
 					<td>
-						Website Baker is released under the 
+						Website Baker is released under the
 						<a href="http://www.gnu.org/licenses/gpl.html" target="_blank" tabindex="19">GNU General Public License</a>
 						<br />
 						By clicking install, you are accepting the license.
@@ -410,7 +439,11 @@
 				</table>
 			</td>
 			<td colspan="1" align="right">
-				<input type="submit" tabindex="20" name="submit" value="Install Website Baker" class="submit" />
+				<?php if($installFlag == true) { ?>
+				<input type="submit" tabindex="20" name="submit" value="Install WebsiteBaker" />
+				<?php } else { ?>
+				<input type="button" tabindex="20" name="submit" value="Check your Settings in Step1 or Step2" class="submit" />
+				<?php } ?>
 			</td>
 		</tr>
 		</table>
Index: branches/2.8.x/wb/modules/admin.php
===================================================================
--- branches/2.8.x/wb/modules/admin.php	(revision 1528)
+++ branches/2.8.x/wb/modules/admin.php	(revision 1529)
@@ -4,7 +4,6 @@
  * @category        backend
  * @package         modules
  * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
  * @copyright       2009-2010, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -96,8 +95,11 @@
 		$modified_ts = 'Unknown';
 	}
 
-	// Include page info script
-	$template = new Template(THEME_PATH.'/templates');
+	// Setup template object, parse vars to it, then parse it
+	$ThemePath = realpath(WB_PATH.$admin->correct_theme_source('pages_modify.htt'));
+	// Create new template object
+	$template = new Template($ThemePath);
+	// $template->debug = true;
 	$template->set_file('page', 'pages_modify.htt');
 	$template->set_block('page', 'main_block', 'main');
 	$template->set_block('main_block', 'section_block', 'section_list');
Index: branches/2.8.x/wb/modules
===================================================================
--- branches/2.8.x/wb/modules	(revision 1528)
+++ branches/2.8.x/wb/modules	(revision 1529)

Property changes on: branches/2.8.x/wb/modules
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+loginbox
Index: branches/2.8.x/wb
===================================================================
--- branches/2.8.x/wb	(revision 1528)
+++ branches/2.8.x/wb	(revision 1529)

Property changes on: branches/2.8.x/wb
___________________________________________________________________
Modified: svn:ignore
## -4,3 +4,4 ##
 pages
 pwgen.php
 robots.txt
+warten.gif
