Index: branches/2.8.x/INSTALL
===================================================================
--- branches/2.8.x/INSTALL	(revision 1532)
+++ branches/2.8.x/INSTALL	(revision 1533)
@@ -7,6 +7,8 @@
 Step 2 - Download WebsiteBaker from http://www.websitebaker2.org/en/download/latest-version.php
 - Download "WebsiteBaker 2.8.2 [R1528] including ServicePack 2"
 - Unzip the package to your lokal machine
+- Download "Hotfix 2011/11/29"
+- Unzip the package to your lokal machine and overwrite "WebsiteBaker 2.8.2 [R1528] including ServicePack 2"
 - rename config.php.new to config.php
 - change favicon to your own
 - upload all files to your Webspace.
@@ -21,8 +23,9 @@
 Step 5 - Upgrade-script:
 - Delete File upgrade-script.php
 
-Step 6 Fill in Admintool Droplets
-- After login to the backend, go to Menu Add-ons advanced
+Step 6 Fill in Admintool Droplets if empty after install
+- After login to the backend, check droplet by menu admin-tools
+- if droplet is empty go to Menu Add-ons advanced
 - in Execute module files manually File: "upgrade.php" or File: "install.php"
 - select droplets and click Execute
 
Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1532)
+++ branches/2.8.x/CHANGELOG	(revision 1533)
@@ -11,6 +11,9 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
+08 Dez-2011 Build 1533 Dietmar Woellbrink (Luisehahne)
++ new backend theme handling (Tks to Stefek)
+# some fixes in install
 28 Nov-2011 Build 1532 Dietmar Woellbrink (Luisehahne)
 ! small changes in INSTALL and UPGRADE (Tks to unawave2)
 ! update upgrade-script showing from Version to Version (Tks to unawave2)
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 1532)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 1533)
@@ -373,7 +373,7 @@
     $drops = (!in_array ( "mod_droplets", $all_tables)) ? "<br />Install droplets<br />" : "<br />Upgrade droplets<br />";
     echo $drops;
 
-     $file_name = (!in_array ( "mod_droplets", $all_tables)) ? "install.php" : "upgrade.php";
+     $file_name = (!in_array ( "mod_droplets", $all_tables) ? "install.php" : "upgrade.php");
      require_once (WB_PATH."/modules/droplets/".$file_name);
 
 // check again all tables, to get a new array
@@ -641,6 +641,8 @@
 		'[ADMIN]',
 		'[MEDIA]',
 		'[PAGES]',
+		'[FRAMEWORK]',
+		'[MODULES]',
 		'[TEMPLATE]'
 	);
 	$replacements = array(
@@ -647,7 +649,9 @@
 		substr(ADMIN_PATH, strlen(WB_PATH)+1),
 		MEDIA_DIRECTORY,
 		PAGES_DIRECTORY,
-		'/templates',
+		'/framework',
+		'/modules',
+		'/templates'
 	);
 
 	foreach( $filesRemove as $filesId )
@@ -781,7 +785,6 @@
 }
 echo '<br />Languages reloaded<br />';
 
-
 /**********************************************************
  *  - End of upgrade script
  */
Index: branches/2.8.x/wb/include/editarea/wb_wrapper_edit_area.php
===================================================================
--- branches/2.8.x/wb/include/editarea/wb_wrapper_edit_area.php	(revision 1532)
+++ branches/2.8.x/wb/include/editarea/wb_wrapper_edit_area.php	(revision 1533)
@@ -87,7 +87,7 @@
 				min_width:			$min_width,
 				min_height:		    $min_height,
 				allow_resize: 		'$allow_resize',
-				allow_toggle: 		$allow_toggle,
+				allow_toggle: 		'$allow_toggle',
 				toolbar: 			'$toolbar',
 				language:			'$language'
 			});
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1532)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1533)
@@ -52,5 +52,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.2');
-if(!defined('REVISION')) define('REVISION', '1532');
+if(!defined('REVISION')) define('REVISION', '1533');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/framework/class.msg_queue.php
===================================================================
--- branches/2.8.x/wb/framework/class.msg_queue.php	(nonexistent)
+++ branches/2.8.x/wb/framework/class.msg_queue.php	(revision 1533)
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Description of class
+ *
+ * @author wkl
+ */
+class msgQueue {
+
+	const RETVAL_ARRAY  = 0;
+	const RETVAL_STRING = 1; // (default)
+
+	private static $_instance;
+
+	private $_error = array();
+	private $_success = array();
+
+	protected function __construct() {
+		$this->_error = array();
+		$this->_success = array();
+	}
+	private function __clone() { throw new Exception('cloning Class '.__CLASS__.' is illegal'); }
+
+    public static function handle()
+    {
+        if (!isset(self::$_instance)) {
+            $c = __CLASS__;
+            self::$_instance = new $c;
+        }
+        return self::$_instance;
+	}
+
+	public static function add($message = '', $type = false)
+	{
+		if($type)
+		{
+			self::handle()->_success[] = $message;
+		}else
+		{
+			self::handle()->_error[] = $message;
+		}
+	}
+
+	public static function clear()
+	{
+		self::handle()->_error = array();
+		self::handle()->_success = array();
+	}
+
+	public static function isEmpty()
+	{
+		return (sizeof(self::handle()->_success) == 0 && sizeof(self::handle()->_error) == 0 );
+	}
+	
+	public static function getError($retval_type = self::RETVAL_STRING)
+	{
+		if(sizeof(self::handle()->_error))
+		{
+			if($retval_type == self::RETVAL_STRING)
+			{
+				return implode('<br />', self::handle()->_error);
+			}else
+			{
+				return self::handle()->_error;
+			}
+		}
+	}
+
+	public static function getSuccess($retval_type = self::RETVAL_STRING)
+	{
+		if(sizeof(self::handle()->_success))
+		{
+			if($retval_type == self::RETVAL_STRING)
+			{
+				return implode('<br />', self::handle()->_success);
+			}else
+			{
+				return self::handle()->_success;
+			}
+		}
+	}
+
+
+}
+?>

Property changes on: branches/2.8.x/wb/framework/class.msg_queue.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/framework/class.logfile.php
===================================================================
--- branches/2.8.x/wb/framework/class.logfile.php	(nonexistent)
+++ branches/2.8.x/wb/framework/class.logfile.php	(revision 1533)
@@ -0,0 +1,240 @@
+<?php
+/**
+ *
+ * @category        event logging
+ * @package         core
+ * @author          Independend-Software-Team
+ * @author          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.2
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ * @description     definition of all core constants.
+ */
+
+/**
+ * Description of classlog
+ *
+ * @author wkl
+ */
+class LogFile {
+
+	private $_fh;                  // file-handle for logfile
+	private $_log_path;            // path to logfile
+	private $_log_file;            // name of logfile
+	private $_error = false;       // store internal errors
+/*
+ * class can not be instanciated standalone
+ */
+	protected function __construct( $log_file )
+	{
+		$this->_log_file = $log_file;
+	}
+
+/*
+ * open the logfile for append
+ */
+	private function openLogFile()
+	{
+		$this->_fh = fopen($this->_log_path.$this->_log_file, 'ab');
+		return isset($this->_fh);
+	}
+/*
+ * provide read-only properties
+ */
+	public function __get($property)
+	{
+		switch(strtolower($property)):
+			case 'error':
+				return $this->_error;
+				break;
+			default:
+				return null;
+		endswitch;
+	}
+/*
+ * flush and close logfile
+ */
+	private function closeLogFile()
+	{
+		if( isset($this->_fh) )
+		{
+			fflush($this->_fh);
+			fclose($this->_fh);
+			unset($this->_fh);
+		}
+	}
+
+/*
+ * @param  string $logdir: directory to place the logfile
+ * @return bool: true if directory is valid and writeable
+ * @description:
+ */
+	public function setLogDir( $logdir )
+	{
+		$this->_error = false;
+		$retval = false;
+		if( ($logdir = realpath($logdir)) )
+		{
+			$logdir = rtrim(str_replace('\\', '/', $logdir), '/');
+			if( defined('WB_PATH') )
+			{
+				$sysroot = WB_PATH;
+			}
+			else
+			{
+				$script_filename = str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME']);
+				$script_name = str_replace('\\', '/', $_SERVER['SCRIPT_NAME']);
+				$sysroot = str_replace($script_name, '', $script_filename);
+			}
+			if( stripos($logdir, $sysroot) === 0 )
+			{
+				if( is_writable($logdir))
+				{
+					if( file_exists($logdir.'/'.$this->_log_file) )
+					{
+						if( is_writable($logdir.'/'.$this->_log_file) )
+						{
+							$this->_log_path = $logdir.'/';
+							$retval = true;
+						}else
+						{
+							$this->_error = 'existing logfile is not writable! ['.$logdir.$this->_log_file.']';
+						}
+					}
+					else
+					{
+						$this->_log_path = $logdir.'/';
+						$retval = true;
+					}
+				}else
+				{
+					$this->_error = 'access denied for directory ['.$logdir.']';
+				}
+			}else
+			{
+				$this->_error = 'logdir [ '.$logdir.' ] points outside of DOCUMENT_ROOT [ '.$sysroot.' ]';
+			}
+		}else
+		{
+			$this->_error = 'logdir can not be resolved ['.$logdir.']';
+		}
+		return $retval;
+	}
+
+/*
+ * @param string $line: preformatted message to write into the logfile
+ * @return none: an error will throw a exception
+ */
+	protected function writeRaw( $message )
+	{
+		array_unshift( $message, (defined($_SESSION['USER_ID'])?$_SESSION['USER_ID']:0) );
+		array_unshift( $message, (isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:'#') );
+		array_unshift( $message, gmdate(DATE_W3C) );
+		if( isset($this->_log_path) ){
+			if($this->openLogFile())
+			{
+				if( fputcsv($this->_fh, $message, ',', '"') !== false )
+				{
+					$this->closeLogFile();
+				}
+				else
+				{
+					throw new Exception('unable to append line ['.$this->_log_path.$this->_log_file.']');
+				}
+			}
+			else
+			{
+				throw new Exception('unable to open logfile ['.$this->_log_path.$this->_log_file.']');
+			}
+		}else
+		{
+			throw new Exception('undefined path for logfile ['.$this->_log_file.']');
+		}
+	}
+
+} // end of class
+
+/*
+ *  Errorlog handler
+ */
+class ErrorLog extends LogFile{
+
+	private static $_instance;
+
+	protected function __construct()
+	{
+		parent::__construct('error.log');
+	}
+
+	private function __clone() {}
+
+    public static function handle()
+    {
+        if (!isset(self::$_instance)) {
+            $c = __CLASS__;
+            self::$_instance = new $c;
+        }
+        return self::$_instance;
+    }
+
+/*
+ * @param string $message: message to write into the logfile
+ * @param string $file: (optional) name of the file where the error occures
+ * @param string $function: (optional) name of the function where the error occures
+ * @param string $line: (optional) number of the line where the error occures
+ * @return none: an error will throw a exception
+ */
+	public function write( $message, $file = '#', $function = '#', $line = '#' )
+	{
+		if( !is_array($message) )
+		{
+			$message = array($file, $function, $line, $message);
+		}
+		self::handle()->writeRaw( $message );
+	}
+} // end of class
+
+/*
+ *  Accesslog handler
+ */
+class AccessLog extends LogFile{
+
+	private static $_instance;
+
+	protected function __construct()
+	{
+		parent::__construct('access.log');
+	}
+
+	private function __clone() {}
+
+    public static function handle()
+    {
+        if (!isset(self::$_instance)) {
+            $c = __CLASS__;
+            self::$_instance = new $c;
+        }
+        return self::$_instance;
+    }
+
+/*
+ * @param string $message: message to write into the logfile
+ * @return none: an error will throw a exception
+ */
+	public function write( $message )
+	{
+		if( !is_array($message) )
+		{
+			$message = array($message);
+		}
+		self::handle()->writeRaw( $message );
+	}
+} // end of class
+
+
+?>

Property changes on: branches/2.8.x/wb/framework/class.logfile.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/templates/allcss/editor.css
===================================================================
--- branches/2.8.x/wb/templates/allcss/editor.css	(nonexistent)
+++ branches/2.8.x/wb/templates/allcss/editor.css	(revision 1533)
@@ -0,0 +1,189 @@
+/**
+ * $Id$
+ * Website Baker template: allcss
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file contains all CSS definitions required to display the template
+ * in the Website Baker frontend. 
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
+body,td,th {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000;
+}
+body {
+   background-color: #F0F0F0;
+   background-image: none;
+   margin: 0;
+}
+a:link, a:visited, a:active {
+	color: #603;
+	text-decoration: none;
+}
+a:hover {
+	color: #936;
+	text-decoration: none;
+}
+hr {
+	margin: 5px 0px 5px 0px;
+	color: #603;
+	border: 0;
+	border-top: 1px solid #603;
+	height: 1px;
+	width: 580px;
+}
+h1 {
+	font-size: 16px;
+	color: #993366;
+	text-align: left;
+	margin: 8px 2px 8px 2px;
+}
+form {
+	margin: 0;
+}
+.main {
+	width: 750px;
+	margin: auto;
+	padding: 0;
+	background-color: #FFF;
+}
+.banner, .search_box {
+	height: 80px;
+	background-image: url(images/header.jpg);
+	background-repeat: repeat-x;
+	font-size: 20px;
+	font-weight: bold;
+	color: #FFF;
+	text-align: center;
+	padding-top: 20px;
+}
+
+.banner {
+	width: 530px;
+	padding-left: 20px;
+	float: left;
+	text-align: left;
+}
+.search_box {
+	float: right;
+	clear: right;
+	width: 200px;
+}
+.search_string {
+	width: 100px;
+	height: 16px;
+	font-size: 10px;
+	vertical-align: middle;
+}
+.search_submit {
+	width: 50px;
+	height: 22px;
+	font-size: 10px;
+	vertical-align: middle;
+}
+.highlight {
+	background-color: #D0D0D0;
+}
+.banner a {
+	color: #FFF;
+}
+.banner span {
+	color: #D0D0D0;
+}
+
+.menu {
+	float: left;
+	width: 140px;
+	margin: 10px;
+	margin-top: 3px;
+}
+.menu ul, .menu li {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+	margin-bottom: 5px;
+}
+.menu ul ul {
+	padding-left: 8px;
+}
+.menu a:link, .menu a:visited, .menu a:active, .menu a:hover {
+	display: block;
+	padding: 2px;
+}
+.menu-default a:link, .menu-default a:visited, .menu-default a:active {
+	border-bottom: 1px dashed #999;
+}
+.menu-default a:hover {
+	border-bottom: 1px dashed #333;
+}
+
+.menu-current  {
+	border-bottom: 1px dashed #999;
+	font-weight:bold;
+}
+
+.menu fieldset {
+	border: 1px solid #D0D0D0;
+	margin-top: 20px;
+	margin-bottom: 5px;
+	text-align: center;
+	padding-bottom: 3px;
+}
+
+.menu legend {
+	color: #603;
+	font-size: 12px;
+	text-transform: uppercase;
+	font-weight: bold;
+	text-align: center;
+}
+
+.menu input {
+	text-transform: uppercase;
+	font-size: 10px;
+	margin: 5px 0px 1px 0px;
+	width: 100px;
+}
+
+.content {
+	margin-left: 150px;
+	padding: 4px 10px 14px 10px;
+	text-align: justify;
+	clear: right;
+}
+.footer {
+	background-color: #FFF;
+	clear: both;
+	height: 20px;
+	background-image: url(images/footer.jpg);
+	background-repeat: repeat-x;
+	font-size: 10px;
+	color: #666;
+	text-align: center;
+	line-height: 18px;
+}
+.powered_by {
+	text-align: center;
+	font-size: 10px;
+	padding-top: 2px;
+}
\ No newline at end of file

Property changes on: branches/2.8.x/wb/templates/allcss/editor.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/templates/round/editor.css
===================================================================
--- branches/2.8.x/wb/templates/round/editor.css	(nonexistent)
+++ branches/2.8.x/wb/templates/round/editor.css	(revision 1533)
@@ -0,0 +1,148 @@
+/**
+ * $Id$
+ * Website Baker template: allcss
+ * This template is one of four basis templates distributed with Website Baker.
+ * Feel free to modify or build up on this template.
+ *
+ * This file contains all CSS definitions required to display the template
+ * in the Website Baker frontend. 
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Ryan Djurovich, C. Sommer
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.70
+ * @platform   Website Baker 2.7
+ *
+ * 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.
+*/
+
+body,td,th {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000;
+}
+body {
+   background-color: #F0F0F0;
+   background-image: none;
+   background-repeat: repeat-x;
+   margin: 10px;
+}
+a:link, a:visited, a:active {
+	color: #036;
+	text-decoration: none;
+}
+a:hover {
+	color: #369;
+	text-decoration: none;
+}
+hr {
+	margin: 15px 0px 15px 0px;
+	color: #036;
+	height: 1px;
+	width: 100%;
+}
+h1 {
+	font-size: 18px;
+	color: #036;
+	margin: 5px 0px 5px 0px;
+}
+h2 {
+	font-size: 15px;
+	color: #369;
+	margin: 15px 0px 5px 0px;
+}
+form {
+	margin: 0;
+}
+.header {
+	width: 750px;
+	height: 80px;
+	background-color: #FFF;
+	vertical-align: top;
+}
+.menu {
+	vertical-align: top;
+	background-color: #FFF;
+	width: 170px;
+	padding: 0px;
+}
+.menu ul, .menu li{
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+}
+.menu ul {
+	border-bottom: 0px;
+	background-color: #036;
+}
+.menu ul ul {
+	padding-left: 10px;
+}
+.menu a:link, .menu a:visited, .menu a:active {
+	padding: 4px 10px 4px 10px;
+	color: #FFF;
+	display: block;
+	background-color: #036;
+	text-decoration: none;
+}
+.menu a:hover {
+	background-color: #369;
+	text-decoration: none;
+}
+.menu-current {
+	font-weight: bold;
+}
+.highlight {
+	background-color: #D0D0D0;
+}
+.border {
+	font-size: 1px;
+	height: 10px;
+}
+.login {
+	padding: 2px 10px 2px 10px;
+	font-size: 10px;
+	background-color: #036;
+	color: #FFF;
+	text-align: center;
+}
+.login input {
+	width: 95%;
+	font-size: 10px;
+}
+.login a:link, .login a:visited, .login a:active {
+	color: #DDD;
+	text-decoration: none;
+}
+.login a:hover {
+	color: #FFF;
+	text-decoration: none;
+}
+.powered_by {
+	padding: 3px 0px 0px 15px;
+	background-color: #FFF;
+}
+.content {
+	padding: 10px;
+	background-color: #FFF;
+	height: 300px;
+	vertical-align: top;
+	text-align: left;
+}
+.footer {
+	padding: 5px;
+	height: 20px;
+	color: #FFF;
+	vertical-align: middle;
+	text-align: center;
+}
\ No newline at end of file

Property changes on: branches/2.8.x/wb/templates/round/editor.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
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	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/media_browse.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/users.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/users.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/access.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/access.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/preferences.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/media_rename.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/media_rename.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/languages.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/admintools.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/media.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/media.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/templates.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/templates.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/pages_modify.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_modify.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/groups.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/settings.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/login_forgot.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/success.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/success.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/groups_form.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/languages_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/languages_details.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_sections.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/modules_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/modules_details.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/modules.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/login.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/login.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/error.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/error.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/templates_details.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/templates_details.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/pages_settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/pages_settings.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/pages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/pages.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/users_form.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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/backup/start.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/backup/start.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates/backup/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
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates	(revision 1532)
+++ branches/2.8.x/wb/templates/wb_theme/templates	(revision 1533)

Property changes on: branches/2.8.x/wb/templates/wb_theme/templates
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+backup
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	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/media_browse.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/users.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/users.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/access.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/access.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/preferences.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/media_rename.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/media_rename.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/languages.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/admintools.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/admintools.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/media.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/media.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/templates.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/templates.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/pages_modify.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_modify.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/groups.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/settings.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/login_forgot.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/success.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/success.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/groups_form.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/languages_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/languages_details.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_sections.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/modules_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/modules_details.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/modules.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/login.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/login.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/error.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/error.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/templates_details.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/templates_details.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/pages_settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/pages_settings.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/setparameter.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/setparameter.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/pages.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/pages.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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/backup/start.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/backup/start.htt	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates/backup/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
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates	(revision 1532)
+++ branches/2.8.x/wb/templates/argos_theme/templates	(revision 1533)

Property changes on: branches/2.8.x/wb/templates/argos_theme/templates
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+backup
Index: branches/2.8.x/wb/install/index.php
===================================================================
--- branches/2.8.x/wb/install/index.php	(revision 1532)
+++ branches/2.8.x/wb/install/index.php	(revision 1533)
@@ -23,9 +23,9 @@
 }
 
 $mod_path = dirname(str_replace('\\', '/', __FILE__));
-$doc_root = rtrim(str_replace('\\', '/',$_SERVER['DOCUMENT_ROOT']),'/');
+$doc_root = rtrim(realpath($_SERVER['DOCUMENT_ROOT']),'/');
 $mod_name = basename($mod_path);
-$wb_path = dirname(dirname(str_replace('\\', '/', __FILE__)));
+$wb_path = dirname(dirname(realpath( __FILE__)));
 $wb_root = str_replace(realpath($doc_root),'',$wb_path);
 
 // Function to highlight input fields which contain wrong/missing data
@@ -198,7 +198,7 @@
 				$installFlag = false;
 				$config = '<font class="bad">Not empty!!?</font>';
 			} elseif( is_writeable($wb_path.$configFile)==true ) {
-				$config = '<font class="good">isWriteable</font>';
+				$config = '<font class="good">Writeable</font>';
 				$_SESSION['config_rename'] = true;
 			}
 		} elseif((file_exists($wb_path.'/config.php.new')==true)) {
Index: branches/2.8.x/wb/modules/droplets/install.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/install.php	(revision 1532)
+++ branches/2.8.x/wb/modules/droplets/install.php	(revision 1533)
@@ -76,7 +76,7 @@
 		$droplet = implode ( "\n", $cArray );
 		$name = substr($dropfile,0,-4);
 		$modified_when = time();
-		$modified_by = method_exists($admin, 'get_user_id') ? $admin->get_user_id() : 1;
+		$modified_by = (method_exists($admin, 'get_user_id') ? $admin->get_user_id() : 1);
 		$sql  = 'INSERT INTO `'.TABLE_PREFIX.'mod_droplets` SET ';
 		$sql .= '`name` = \''.$name.'\', ';
 		$sql .= '`code` = \''.$droplet.'\', ';
@@ -88,7 +88,7 @@
 		$database->query($sql);
 		
 		// do not output anything if this script is called during fresh installation
-		if (method_exists($admin, 'get_user_id')) echo "Droplet import: $name<br/>";
+		// if (method_exists($admin, 'get_user_id')) echo "Droplet import: $name<br/>";
 	}
 }