Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1242)
+++ branches/2.8.x/CHANGELOG	(revision 1243)
@@ -12,6 +12,8 @@
 
 ------------------------------------- 2.8.1 -------------------------------------
 13-Jan-2010 Dietmar Woellbrink (Luisehahne)
+#	Ticket #911 continue to fix CSS-errors in WB backend
+13-Jan-2010 Dietmar Woellbrink (Luisehahne)
 #	Ticket #911 Beginning to fix More CSS-errors in WB backend
 +	add SVN- Revision to backend theme
 12-Jan-2010 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/groups/groups.php
===================================================================
--- branches/2.8.x/wb/admin/groups/groups.php	(revision 1242)
+++ branches/2.8.x/wb/admin/groups/groups.php	(revision 1243)
@@ -1,195 +1,230 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-// Include config file and admin class file
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-
-// Create new database object
-$database = new database();
-
-if(!isset($_POST['action']) OR ($_POST['action'] != "modify" AND $_POST['action'] != "delete")) {
-	header("Location: index.php");
-	exit(0);
-}
-
-// Set parameter 'action' as alternative to javascript mechanism
-if(isset($_POST['modify']))
-	$_POST['action'] = "modify";
-if(isset($_POST['delete']))
-	$_POST['action'] = "delete";
-
-// Check if group group_id is a valid number and doesnt equal 1
-if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) {
-	header("Location: index.php");
-	exit(0);
-}
-
-if($_POST['action'] == 'modify') {
-	// Create new admin object
-	$admin = new admin('Access', 'groups_modify', false);
-	// Print header
-	$admin->print_header();
-	// Get existing values
-	$results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."'");
-	$group = $results->fetchRow();
-	// Setup template object
-	$template = new Template(THEME_PATH.'/templates');
-	$template->set_file('page', 'groups_form.htt');
-	$template->set_block('page', 'main_block', 'main');
-	$template->set_var(	array(
-										'ACTION_URL' => ADMIN_URL.'/groups/save.php',
-										'SUBMIT_TITLE' => $TEXT['SAVE'],
-										'GROUP_ID' => $group['group_id'],
-										'GROUP_NAME' => $group['name'],
-										'ADVANCED_ACTION' => 'groups.php'
-										)
-							);
-	// Tell the browser whether or not to show advanced options
-	if( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) {
-		$template->set_var('DISPLAY_ADVANCED', '');
-		$template->set_var('DISPLAY_BASIC', 'none');
-		$template->set_var('ADVANCED', 'yes');
-		$template->set_var('ADVANCED_BUTTON', '&lt;&lt; '.$TEXT['HIDE_ADVANCED']);
-	} else {
-		$template->set_var('DISPLAY_ADVANCED', 'none');
-		$template->set_var('DISPLAY_BASIC', '');
-		$template->set_var('ADVANCED', 'no');
-		$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].'  &gt;&gt;');
-	}
-
-	// Explode system permissions
-	$system_permissions = explode(',', $group['system_permissions']);
-	// Check system permissions boxes
-	foreach($system_permissions AS $name) {
-			$template->set_var($name.'_checked', ' checked="checked"');
-	}
-	// Explode module permissions
-	$module_permissions = explode(',', $group['module_permissions']);
-	// Explode template permissions
-	$template_permissions = explode(',', $group['template_permissions']);
-	
-	// Insert values into module list
-	$template->set_block('main_block', 'module_list_block', 'module_list');
-	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'");
-	if($result->numRows() > 0) {
-		while($addon = $result->fetchRow()) {
-			$template->set_var('VALUE', $addon['directory']);
-			$template->set_var('NAME', $addon['name']);
-			if(!is_numeric(array_search($addon['directory'], $module_permissions))) {
-				$template->set_var('CHECKED', ' checked="checked"');
-			} else {
-				$template->set_var('CHECKED', '');
-			}
-			$template->parse('module_list', 'module_list_block', true);
-		}
-	}
-	
-	// Insert values into template list
-	$template->set_block('main_block', 'template_list_block', 'template_list');
-	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
-	if($result->numRows() > 0) {
-		while($addon = $result->fetchRow()) {
-			$template->set_var('VALUE', $addon['directory']);
-			$template->set_var('NAME', $addon['name']);
-			if(!is_numeric(array_search($addon['directory'], $template_permissions))) {
-				$template->set_var('CHECKED', ' checked="checked"');
-			} else {
-				$template->set_var('CHECKED', '');
-			}
-			$template->parse('template_list', 'template_list_block', true);
-		}
-	}
-		
-	// Insert language text and messages
-	$template->set_var(array(
-									'TEXT_RESET' => $TEXT['RESET'],
-									'TEXT_ACTIVE' => $TEXT['ACTIVE'],
-									'TEXT_DISABLED' => $TEXT['DISABLED'],
-									'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
-									'TEXT_USERNAME' => $TEXT['USERNAME'],
-									'TEXT_PASSWORD' => $TEXT['PASSWORD'],
-									'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
-									'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
-									'TEXT_EMAIL' => $TEXT['EMAIL'],
-									'TEXT_GROUP' => $TEXT['GROUP'],
-									'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'],
-									'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'],
-									'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'],
-									'TEXT_NAME' => $TEXT['NAME'],
-									'SECTION_PAGES' => $MENU['PAGES'],
-									'SECTION_MEDIA' => $MENU['MEDIA'],
-									'SECTION_MODULES' => $MENU['MODULES'],
-									'SECTION_TEMPLATES' => $MENU['TEMPLATES'],
-									'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
-									'SECTION_SETTINGS' => $MENU['SETTINGS'],
-									'SECTION_USERS' => $MENU['USERS'],
-									'SECTION_GROUPS' => $MENU['GROUPS'],
-									'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
-									'TEXT_VIEW' => $TEXT['VIEW'],
-									'TEXT_ADD' => $TEXT['ADD'],
-									'TEXT_LEVEL' => $TEXT['LEVEL'],
-									'TEXT_MODIFY' => $TEXT['MODIFY'],
-									'TEXT_DELETE' => $TEXT['DELETE'],
-									'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'],
-									'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
-									'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'],
-									'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
-									'TEXT_RENAME' => $TEXT['RENAME'],
-									'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
-									'TEXT_BASIC' => $TEXT['BASIC'],
-									'TEXT_ADVANCED' => $TEXT['ADVANCED'],
-									'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
-									'HEADING_MODIFY_GROUP' => $HEADING['MODIFY_GROUP']
-									)
-							);
-	
-	// Parse template object
-	$template->parse('main', 'main_block', false);
-	$template->pparse('output', 'page');
-} elseif($_POST['action'] == 'delete') {
-	// Create new admin object
-	$admin = new admin('Access', 'groups_delete', false);
-	// Print header
-	$admin->print_header();
-	// Delete the group
-	$database->query("DELETE FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."' LIMIT 1");
-	if($database->is_error()) {
-		$admin->print_error($database->get_error());
-	} else {
-		// Delete users in the group
-		$database->query("DELETE FROM ".TABLE_PREFIX."users WHERE group_id = '".$_POST['group_id']."'");
-		if($database->is_error()) {
-			$admin->print_error($database->get_error());
-		} else {
-			$admin->print_success($MESSAGE['GROUPS']['DELETED']);
-		}
-	}
-}
-
-// Print admin footer
-$admin->print_footer();
-
+<?php
+/****************************************************************************
+* SVN Version information:
+*
+* $Id$
+*
+*****************************************************************************
+*                          WebsiteBaker
+*
+* WebsiteBaker Project <http://www.websitebaker2.org/>
+* Copyright (C) 2009, Website Baker Org. e.V.
+*         http://start.websitebaker2.org/impressum-datenschutz.php
+* Copyright (C) 2004-2009, Ryan Djurovich
+*
+*                        About WebsiteBaker
+*
+* Website Baker is a PHP-based Content Management System (CMS)
+* designed with one goal in mind: to enable its users to produce websites
+* with ease.
+*
+*****************************************************************************
+*
+*****************************************************************************
+*                        LICENSE INFORMATION
+*
+* WebsiteBaker 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.
+*
+* WebsiteBaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* See the GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+****************************************************************************
+*
+*                   WebsiteBaker Extra Information
+*
+*
+*
+*
+*****************************************************************************/
+/**
+ *
+ * @category     admin
+ * @package      settings
+ * @author       Ryan Djurovich
+ * @copyright    2004-2009, Ryan Djurovich
+ * @copyright    2009-2010, Website Baker Org. e.V.
+ * @version      $Id$
+ * @platform     WebsiteBaker 2.8.x
+ * @requirements >= PHP 4.3.4
+ * @license      http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+// Include config file and admin class file
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+
+// Create new database object
+$database = new database();
+
+if(!isset($_POST['action']) OR ($_POST['action'] != "modify" AND $_POST['action'] != "delete")) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Set parameter 'action' as alternative to javascript mechanism
+if(isset($_POST['modify']))
+	$_POST['action'] = "modify";
+if(isset($_POST['delete']))
+	$_POST['action'] = "delete";
+
+// Check if group group_id is a valid number and doesnt equal 1
+if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) {
+	header("Location: index.php");
+	exit(0);
+}
+
+if($_POST['action'] == 'modify') {
+	// Create new admin object
+	$admin = new admin('Access', 'groups_modify', false);
+	// Print header
+	$admin->print_header();
+	// Get existing values
+	$results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."'");
+	$group = $results->fetchRow();
+	// Setup template object
+	$template = new Template(THEME_PATH.'/templates');
+	$template->set_file('page', 'groups_form.htt');
+	$template->set_block('page', 'main_block', 'main');
+	$template->set_var(	array(
+										'ACTION_URL' => ADMIN_URL.'/groups/save.php',
+										'SUBMIT_TITLE' => $TEXT['SAVE'],
+										'GROUP_ID' => $group['group_id'],
+										'GROUP_NAME' => $group['name'],
+										'ADVANCED_ACTION' => 'groups.php'
+										)
+							);
+	// Tell the browser whether or not to show advanced options
+	if( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) {
+		$template->set_var('DISPLAY_ADVANCED', '');
+		$template->set_var('DISPLAY_BASIC', 'display:none;');
+		$template->set_var('ADVANCED', 'yes');
+		$template->set_var('ADVANCED_BUTTON', '&lt;&lt; '.$TEXT['HIDE_ADVANCED']);
+	} else {
+		$template->set_var('DISPLAY_ADVANCED', 'display:none;');
+		$template->set_var('DISPLAY_BASIC', '');
+		$template->set_var('ADVANCED', 'no');
+		$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].'  &gt;&gt;');
+	}
+
+	// Explode system permissions
+	$system_permissions = explode(',', $group['system_permissions']);
+	// Check system permissions boxes
+	foreach($system_permissions AS $name) {
+			$template->set_var($name.'_checked', ' checked="checked"');
+	}
+	// Explode module permissions
+	$module_permissions = explode(',', $group['module_permissions']);
+	// Explode template permissions
+	$template_permissions = explode(',', $group['template_permissions']);
+	
+	// Insert values into module list
+	$template->set_block('main_block', 'module_list_block', 'module_list');
+	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'");
+	if($result->numRows() > 0) {
+		while($addon = $result->fetchRow()) {
+			$template->set_var('VALUE', $addon['directory']);
+			$template->set_var('NAME', $addon['name']);
+			if(!is_numeric(array_search($addon['directory'], $module_permissions))) {
+				$template->set_var('CHECKED', ' checked="checked"');
+			} else {
+				$template->set_var('CHECKED', '');
+			}
+			$template->parse('module_list', 'module_list_block', true);
+		}
+	}
+	
+	// Insert values into template list
+	$template->set_block('main_block', 'template_list_block', 'template_list');
+	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
+	if($result->numRows() > 0) {
+		while($addon = $result->fetchRow()) {
+			$template->set_var('VALUE', $addon['directory']);
+			$template->set_var('NAME', $addon['name']);
+			if(!is_numeric(array_search($addon['directory'], $template_permissions))) {
+				$template->set_var('CHECKED', ' checked="checked"');
+			} else {
+				$template->set_var('CHECKED', '');
+			}
+			$template->parse('template_list', 'template_list_block', true);
+		}
+	}
+		
+	// Insert language text and messages
+	$template->set_var(array(
+									'TEXT_RESET' => $TEXT['RESET'],
+									'TEXT_ACTIVE' => $TEXT['ACTIVE'],
+									'TEXT_DISABLED' => $TEXT['DISABLED'],
+									'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+									'TEXT_USERNAME' => $TEXT['USERNAME'],
+									'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+									'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
+									'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
+									'TEXT_EMAIL' => $TEXT['EMAIL'],
+									'TEXT_GROUP' => $TEXT['GROUP'],
+									'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'],
+									'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'],
+									'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'],
+									'TEXT_NAME' => $TEXT['NAME'],
+									'SECTION_PAGES' => $MENU['PAGES'],
+									'SECTION_MEDIA' => $MENU['MEDIA'],
+									'SECTION_MODULES' => $MENU['MODULES'],
+									'SECTION_TEMPLATES' => $MENU['TEMPLATES'],
+									'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
+									'SECTION_SETTINGS' => $MENU['SETTINGS'],
+									'SECTION_USERS' => $MENU['USERS'],
+									'SECTION_GROUPS' => $MENU['GROUPS'],
+									'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
+									'TEXT_VIEW' => $TEXT['VIEW'],
+									'TEXT_ADD' => $TEXT['ADD'],
+									'TEXT_LEVEL' => $TEXT['LEVEL'],
+									'TEXT_MODIFY' => $TEXT['MODIFY'],
+									'TEXT_DELETE' => $TEXT['DELETE'],
+									'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'],
+									'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
+									'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'],
+									'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
+									'TEXT_RENAME' => $TEXT['RENAME'],
+									'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
+									'TEXT_BASIC' => $TEXT['BASIC'],
+									'TEXT_ADVANCED' => $TEXT['ADVANCED'],
+									'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
+									'HEADING_MODIFY_GROUP' => $HEADING['MODIFY_GROUP']
+									)
+							);
+	
+	// Parse template object
+	$template->parse('main', 'main_block', false);
+	$template->pparse('output', 'page');
+} elseif($_POST['action'] == 'delete') {
+	// Create new admin object
+	$admin = new admin('Access', 'groups_delete', false);
+	// Print header
+	$admin->print_header();
+	// Delete the group
+	$database->query("DELETE FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."' LIMIT 1");
+	if($database->is_error()) {
+		$admin->print_error($database->get_error());
+	} else {
+		// Delete users in the group
+		$database->query("DELETE FROM ".TABLE_PREFIX."users WHERE group_id = '".$_POST['group_id']."'");
+		if($database->is_error()) {
+			$admin->print_error($database->get_error());
+		} else {
+			$admin->print_success($MESSAGE['GROUPS']['DELETED']);
+		}
+	}
+}
+
+// Print admin footer
+$admin->print_footer();
+
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/groups/index.php
===================================================================
--- branches/2.8.x/wb/admin/groups/index.php	(revision 1242)
+++ branches/2.8.x/wb/admin/groups/index.php	(revision 1243)
@@ -1,205 +1,240 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-// Print admin header
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Access', 'groups');
-
-// Create new template object for the modify/remove menu
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'groups.htt');
-$template->set_block('page', 'main_block', 'main');
-$template->set_block('main_block', 'manage_users_block', 'users');
-// insert urls
-$template->set_var(array(
-	'ADMIN_URL' => ADMIN_URL,
-	'WB_URL' => WB_URL,
-	'WB_PATH' => WB_PATH,
-	'THEME_URL' => THEME_URL
-	)
-);
-
-// Get existing value from database
-$database = new database();
-$query = "SELECT group_id,name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'";
-$results = $database->query($query);
-if($database->is_error()) {
-	$admin->print_error($database->get_error(), 'index.php');
-}
-
-// Insert values into the modify/remove menu
-$template->set_block('main_block', 'list_block', 'list');
-if($results->numRows() > 0) {
-	// Insert first value to say please select
-	$template->set_var('VALUE', '');
-	$template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
-	$template->parse('list', 'list_block', true);
-	// Loop through groups
-	while($group = $results->fetchRow()) {
-		$template->set_var('VALUE', $group['group_id']);
-		$template->set_var('NAME', $group['name']);
-		$template->parse('list', 'list_block', true);
-	}
-} else {
-	// Insert single value to say no groups were found
-	$template->set_var('NAME', $TEXT['NONE_FOUND']);
-	$template->parse('list', 'list_block', true);
-}
-
-// Insert permissions values
-if($admin->get_permission('groups_add') != true) {
-	$template->set_var('DISPLAY_ADD', 'hide');
-}
-if($admin->get_permission('groups_modify') != true) {
-	$template->set_var('DISPLAY_MODIFY', 'hide');
-}
-if($admin->get_permission('groups_delete') != true) {
-	$template->set_var('DISPLAY_DELETE', 'hide');
-}
-
-// Insert language headings
-$template->set_var(array(
-	'HEADING_MODIFY_DELETE_GROUP' => $HEADING['MODIFY_DELETE_GROUP'],
-	'HEADING_ADD_GROUP' => $HEADING['ADD_GROUP']
-	)
-);
-// Insert language text and messages
-$template->set_var(array(
-	'TEXT_MODIFY' => $TEXT['MODIFY'],
-	'TEXT_DELETE' => $TEXT['DELETE'],
-	'TEXT_MANAGE_USERS' => ( $admin->get_permission('users') == true ) ? $TEXT['MANAGE_USERS']: "",
-	'CONFIRM_DELETE' => $MESSAGE['GROUPS']['CONFIRM_DELETE']
-	)
-);
-if ( $admin->get_permission('users') == true ) $template->parse("users", "manage_users_block", true);
-// Parse template object
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-// Setup template for add group form
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'groups_form.htt');
-$template->set_block('page', 'main_block', 'main');
-$template->set_var('DISPLAY_EXTRA', 'none');
-$template->set_var('ACTION_URL', ADMIN_URL.'/groups/add.php');
-$template->set_var('SUBMIT_TITLE', $TEXT['ADD']);
-$template->set_var('ADVANCED_ACTION', 'index.php');
-
-// Tell the browser whether or not to show advanced options
-if ( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) {
-	$template->set_var('DISPLAY_ADVANCED', '');
-	$template->set_var('DISPLAY_BASIC', 'none');
-	$template->set_var('ADVANCED', 'yes');
-	$template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']);
-} else {
-	$template->set_var('DISPLAY_ADVANCED', 'none');
-	$template->set_var('DISPLAY_BASIC', '');
-	$template->set_var('ADVANCED', 'no');
-	$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>');
-}
-
-// Insert permissions values
-if($admin->get_permission('groups_add') != true) {
-	$template->set_var('DISPLAY_ADD', 'hide');
-}
-
-// Insert values into module list
-$template->set_block('main_block', 'module_list_block', 'module_list');
-$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'");
-if($result->numRows() > 0) {
-	while($addon = $result->fetchRow()) {
-		$template->set_var('VALUE', $addon['directory']);
-		$template->set_var('NAME', $addon['name']);
-		$template->parse('module_list', 'module_list_block', true);
-	}
-}
-
-// Insert values into template list
-$template->set_block('main_block', 'template_list_block', 'template_list');
-$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
-if($result->numRows() > 0) {
-	while($addon = $result->fetchRow()) {
-		$template->set_var('VALUE', $addon['directory']);
-		$template->set_var('NAME', $addon['name']);
-		$template->parse('template_list', 'template_list_block', true);
-	}
-}
-
-// Insert language text and messages
-$template->set_var(array(
-								'TEXT_RESET' => $TEXT['RESET'],
-								'TEXT_ACTIVE' => $TEXT['ACTIVE'],
-								'TEXT_DISABLED' => $TEXT['DISABLED'],
-								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
-								'TEXT_USERNAME' => $TEXT['USERNAME'],
-								'TEXT_PASSWORD' => $TEXT['PASSWORD'],
-								'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
-								'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
-								'TEXT_EMAIL' => $TEXT['EMAIL'],
-								'TEXT_GROUP' => $TEXT['GROUP'],
-								'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'],
-								'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'],
-								'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'],
-								'TEXT_NAME' => $TEXT['NAME'],
-								'SECTION_PAGES' => $MENU['PAGES'],
-								'SECTION_MEDIA' => $MENU['MEDIA'],
-								'SECTION_MODULES' => $MENU['MODULES'],
-								'SECTION_TEMPLATES' => $MENU['TEMPLATES'],
-								'SECTION_SETTINGS' => $MENU['SETTINGS'],
-								'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
-								'SECTION_USERS' => $MENU['USERS'],
-								'SECTION_GROUPS' => $MENU['GROUPS'],
-								'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
-								'TEXT_VIEW' => $TEXT['VIEW'],
-								'TEXT_ADD' => $TEXT['ADD'],
-								'TEXT_LEVEL' => $TEXT['LEVEL'],
-								'TEXT_MODIFY' => $TEXT['MODIFY'],
-								'TEXT_DELETE' => $TEXT['DELETE'],
-								'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'],
-								'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
-								'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'],
-								'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
-								'TEXT_RENAME' => $TEXT['RENAME'],
-								'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
-								'TEXT_BASIC' => $TEXT['BASIC'],
-								'TEXT_ADVANCED' => $TEXT['ADVANCED'],
-								'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
-								'CHECKED' => ' checked="checked"',
-								'ADMIN_URL' => ADMIN_URL,
-								'WB_URL' => WB_URL,
-								'WB_PATH' => WB_PATH,
-								'THEME_URL' => THEME_URL
-								)
-						);
-
-// Parse template for add group form
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-// Print the admin footer
-$admin->print_footer();
-
+<?php
+/****************************************************************************
+* SVN Version information:
+*
+* $Id$
+*
+*****************************************************************************
+*                          WebsiteBaker
+*
+* WebsiteBaker Project <http://www.websitebaker2.org/>
+* Copyright (C) 2009, Website Baker Org. e.V.
+*         http://start.websitebaker2.org/impressum-datenschutz.php
+* Copyright (C) 2004-2009, Ryan Djurovich
+*
+*                        About WebsiteBaker
+*
+* Website Baker is a PHP-based Content Management System (CMS)
+* designed with one goal in mind: to enable its users to produce websites
+* with ease.
+*
+*****************************************************************************
+*
+*****************************************************************************
+*                        LICENSE INFORMATION
+*
+* WebsiteBaker 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.
+*
+* WebsiteBaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* See the GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+****************************************************************************
+*
+*                   WebsiteBaker Extra Information
+*
+*
+*
+*
+*****************************************************************************/
+/**
+ *
+ * @category     admin
+ * @package      settings
+ * @author       Ryan Djurovich
+ * @copyright    2004-2009, Ryan Djurovich
+ * @copyright    2009-2010, Website Baker Org. e.V.
+ * @version      $Id$
+ * @platform     WebsiteBaker 2.8.x
+ * @requirements >= PHP 4.3.4
+ * @license      http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+// Print admin header
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Access', 'groups');
+
+// Create new template object for the modify/remove menu
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'groups.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_block('main_block', 'manage_users_block', 'users');
+// insert urls
+$template->set_var(array(
+	'ADMIN_URL' => ADMIN_URL,
+	'WB_URL' => WB_URL,
+	'WB_PATH' => WB_PATH,
+	'THEME_URL' => THEME_URL
+	)
+);
+
+// Get existing value from database
+$database = new database();
+$query = "SELECT group_id,name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'";
+$results = $database->query($query);
+if($database->is_error()) {
+	$admin->print_error($database->get_error(), 'index.php');
+}
+
+// Insert values into the modify/remove menu
+$template->set_block('main_block', 'list_block', 'list');
+if($results->numRows() > 0) {
+	// Insert first value to say please select
+	$template->set_var('VALUE', '');
+	$template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
+	$template->parse('list', 'list_block', true);
+	// Loop through groups
+	while($group = $results->fetchRow()) {
+		$template->set_var('VALUE', $group['group_id']);
+		$template->set_var('NAME', $group['name']);
+		$template->parse('list', 'list_block', true);
+	}
+} else {
+	// Insert single value to say no groups were found
+	$template->set_var('NAME', $TEXT['NONE_FOUND']);
+	$template->parse('list', 'list_block', true);
+}
+
+// Insert permissions values
+if($admin->get_permission('groups_add') != true) {
+	$template->set_var('DISPLAY_ADD', 'hide');
+}
+if($admin->get_permission('groups_modify') != true) {
+	$template->set_var('DISPLAY_MODIFY', 'hide');
+}
+if($admin->get_permission('groups_delete') != true) {
+	$template->set_var('DISPLAY_DELETE', 'hide');
+}
+
+// Insert language headings
+$template->set_var(array(
+	'HEADING_MODIFY_DELETE_GROUP' => $HEADING['MODIFY_DELETE_GROUP'],
+	'HEADING_ADD_GROUP' => $HEADING['ADD_GROUP']
+	)
+);
+// Insert language text and messages
+$template->set_var(array(
+	'TEXT_MODIFY' => $TEXT['MODIFY'],
+	'TEXT_DELETE' => $TEXT['DELETE'],
+	'TEXT_MANAGE_USERS' => ( $admin->get_permission('users') == true ) ? $TEXT['MANAGE_USERS']: "",
+	'CONFIRM_DELETE' => $MESSAGE['GROUPS']['CONFIRM_DELETE']
+	)
+);
+if ( $admin->get_permission('users') == true ) $template->parse("users", "manage_users_block", true);
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Setup template for add group form
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'groups_form.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_var('DISPLAY_EXTRA', 'display:none;');
+$template->set_var('ACTION_URL', ADMIN_URL.'/groups/add.php');
+$template->set_var('SUBMIT_TITLE', $TEXT['ADD']);
+$template->set_var('ADVANCED_ACTION', 'index.php');
+
+// Tell the browser whether or not to show advanced options
+if ( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) {
+	$template->set_var('DISPLAY_ADVANCED', '');
+	$template->set_var('DISPLAY_BASIC', 'display:none;');
+	$template->set_var('ADVANCED', 'yes');
+	$template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']);
+} else {
+	$template->set_var('DISPLAY_ADVANCED', 'display:none;');
+	$template->set_var('DISPLAY_BASIC', '');
+	$template->set_var('ADVANCED', 'no');
+	$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>');
+}
+
+// Insert permissions values
+if($admin->get_permission('groups_add') != true) {
+	$template->set_var('DISPLAY_ADD', 'hide');
+}
+
+// Insert values into module list
+$template->set_block('main_block', 'module_list_block', 'module_list');
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'");
+if($result->numRows() > 0) {
+	while($addon = $result->fetchRow()) {
+		$template->set_var('VALUE', $addon['directory']);
+		$template->set_var('NAME', $addon['name']);
+		$template->parse('module_list', 'module_list_block', true);
+	}
+}
+
+// Insert values into template list
+$template->set_block('main_block', 'template_list_block', 'template_list');
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
+if($result->numRows() > 0) {
+	while($addon = $result->fetchRow()) {
+		$template->set_var('VALUE', $addon['directory']);
+		$template->set_var('NAME', $addon['name']);
+		$template->parse('template_list', 'template_list_block', true);
+	}
+}
+
+// Insert language text and messages
+$template->set_var(array(
+								'TEXT_RESET' => $TEXT['RESET'],
+								'TEXT_ACTIVE' => $TEXT['ACTIVE'],
+								'TEXT_DISABLED' => $TEXT['DISABLED'],
+								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+								'TEXT_USERNAME' => $TEXT['USERNAME'],
+								'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+								'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
+								'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
+								'TEXT_EMAIL' => $TEXT['EMAIL'],
+								'TEXT_GROUP' => $TEXT['GROUP'],
+								'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'],
+								'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'],
+								'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'],
+								'TEXT_NAME' => $TEXT['NAME'],
+								'SECTION_PAGES' => $MENU['PAGES'],
+								'SECTION_MEDIA' => $MENU['MEDIA'],
+								'SECTION_MODULES' => $MENU['MODULES'],
+								'SECTION_TEMPLATES' => $MENU['TEMPLATES'],
+								'SECTION_SETTINGS' => $MENU['SETTINGS'],
+								'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
+								'SECTION_USERS' => $MENU['USERS'],
+								'SECTION_GROUPS' => $MENU['GROUPS'],
+								'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
+								'TEXT_VIEW' => $TEXT['VIEW'],
+								'TEXT_ADD' => $TEXT['ADD'],
+								'TEXT_LEVEL' => $TEXT['LEVEL'],
+								'TEXT_MODIFY' => $TEXT['MODIFY'],
+								'TEXT_DELETE' => $TEXT['DELETE'],
+								'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'],
+								'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
+								'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'],
+								'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
+								'TEXT_RENAME' => $TEXT['RENAME'],
+								'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
+								'TEXT_BASIC' => $TEXT['BASIC'],
+								'TEXT_ADVANCED' => $TEXT['ADVANCED'],
+								'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
+								'CHECKED' => ' checked="checked"',
+								'ADMIN_URL' => ADMIN_URL,
+								'WB_URL' => WB_URL,
+								'WB_PATH' => WB_PATH,
+								'THEME_URL' => THEME_URL
+								)
+						);
+
+// Parse template for add group form
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print the admin footer
+$admin->print_footer();
+
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1242)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1243)
@@ -57,6 +57,7 @@
  * @copyright    2004-2009, Ryan Djurovich
  * @copyright    2009-2010, Website Baker Org. e.V.
  * @version      $Id$
+ * @revision     $Revision$
  * @platform     WebsiteBaker 2.8.x
  * @requirements >= PHP 4.3.4
  * @license      http://www.gnu.org/licenses/gpl.html
@@ -70,6 +71,6 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.1');
-if(!defined('REVISION')) define('REVISION', '1242');
+if(!defined('REVISION')) define('REVISION', '1243');
 
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/interface/version.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+Id
+Revision
\ No newline at end of property
Index: branches/2.8.x/wb/templates/classic_theme/templates/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/classic_theme/templates/groups_form.htt	(revision 1242)
+++ branches/2.8.x/wb/templates/classic_theme/templates/groups_form.htt	(revision 1243)
@@ -1,293 +1,293 @@
-<!-- BEGIN main_block -->
-
-<h2 style="display: {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}" />
-
-<table cellpadding="5" 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: 100%" />
-	</td>
-</tr>
-</table>
-<table cellpadding="5" cellspacing="0" border="0" width="100%" style="display: {DISPLAY_BASIC}">
-<tr>
-	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td>
-		<table cellpadding="0" cellspacing="0" width="100%" border="0">
-		<tr>
-			<td>
-				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
-				<label for="pages">{SECTION_PAGES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
-				<label for="media">{SECTION_MEDIA}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
-				<label for="modules">{SECTION_MODULES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
-				<label for="templates">{SECTION_TEMPLATES}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
-				<label for="languages">{SECTION_LANGUAGES}</label>
-			</td>
-			<td>		
-				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
-				<label for="settings">{SECTION_SETTINGS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
-				<label for="users">{SECTION_USERS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
-				<label for="groups">{SECTION_GROUPS}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
-				<label for="admintools">{SECTION_ADMINTOOLS}</label>
-			</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-<table cellpadding="5" cellspacing="0" border="0" width="100%" style="display: {DISPLAY_ADVANCED}">
-<tr>
-	<td valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td align="left">
-
-
-<table cellpadding="3" cellspacing="0" border="0" width="400">
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_PAGES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
-	<td><label for="pages_view">{TEXT_VIEW}</label></td>
-	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
-	<td>
-		<label for="pages_add">{TEXT_ADD}</label>
-		&nbsp;
-		<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
-		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
-	</td>
-</tr>
-<tr>
-	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
-	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
-	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
-</tr>
-<tr>
-	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
-	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
-	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
-	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_MEDIA}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
-	<td><label for="media_view">{TEXT_VIEW}</label></td>
-	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
-	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
-</tr>
-<tr>
-	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
-	<td><label for="media_rename">{TEXT_RENAME}</label></td>
-	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
-	<td><label for="media_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
-	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_MODULES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
-	<td><label for="modules_view">{TEXT_VIEW}</label></td>
-	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
-	<td><label for="modules_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
-	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_TEMPLATES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
-	<td><label for="templates_view">{TEXT_VIEW}</label></td>
-	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
-	<td><label for="templates_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
-	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_LANGUAGES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
-	<td><label for="languages_view">{TEXT_VIEW}</label></td>
-	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
-	<td><label for="languages_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
-	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_SETTINGS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
-	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
-	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
-	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_USERS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
-	<td><label for="users_view">{TEXT_VIEW}</label></td>
-	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
-	<td><label for="users_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
-	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
-	<td><label for="users_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_GROUPS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
-	<td><label for="groups_view">{TEXT_VIEW}</label></td>
-	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
-	<td><label for="groups_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
-	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
-	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_ADMINTOOLS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
-	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-</table>
-
-
-	</td>
-</tr>
-</table>
-
-<table cellpadding="5" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
-<tr>
-	<td valign="top" align="left" width="150">
-	{TEXT_MODULE_PERMISSIONS}:
-	</td>
-	<td valign="top" align="left">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN module_list_block -->
-			<li>
-				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="m_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END module_list_block -->
-		</ul>
-	</td>
-	<td valign="top" align="left" width="150">
-	{TEXT_TEMPLATE_PERMISSIONS}:
-	</td>
-	<td valign="top" align="left">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN template_list_block -->
-			<li>
-				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="t_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END template_list_block -->
-		</ul>
-	</td>
-</tr>
-
-<tr>
-	<td colspan="2"><input type="submit" name="submit" value="{SUBMIT_TITLE}" /></td>
-    <td colspan="2" align="right"><input type="reset" name="reset" value="{TEXT_RESET}" /></td>
-</tr>
-</table>
-</form>
-
-<table cellpadding="5" cellspacing="0" border="0" width="100%">
-<tr>
-	<td align="center">
-	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
-        <input type="hidden" name="group_id" value="{GROUP_ID}" />
-        <input type="hidden" name="action" value="modify" />
-        <input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
-    </form>
-	</td>
-</tr>
-</table>
-
-
+<!-- BEGIN main_block -->
+
+<h2 style="{DISPLAY_EXTRA};">{HEADING_MODIFY_GROUP}</h2>
+
+<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
+<input type="hidden" name="advanced" value="{ADVANCED}" />
+<input type="hidden" name="group_id" value="{GROUP_ID}" />
+
+<table cellpadding="5" 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: 100%" />
+	</td>
+</tr>
+</table>
+<table cellpadding="5" cellspacing="0" border="0" width="100%" style="{DISPLAY_BASIC}">
+<tr>
+	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td>
+		<table cellpadding="0" cellspacing="0" width="100%" border="0">
+		<tr>
+			<td>
+				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
+				<label for="pages">{SECTION_PAGES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
+				<label for="media">{SECTION_MEDIA}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
+				<label for="modules">{SECTION_MODULES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
+				<label for="templates">{SECTION_TEMPLATES}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
+				<label for="languages">{SECTION_LANGUAGES}</label>
+			</td>
+			<td>		
+				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
+				<label for="settings">{SECTION_SETTINGS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
+				<label for="users">{SECTION_USERS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
+				<label for="groups">{SECTION_GROUPS}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
+				<label for="admintools">{SECTION_ADMINTOOLS}</label>
+			</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
+<table cellpadding="5" cellspacing="0" border="0" width="100%" style="{DISPLAY_ADVANCED}">
+<tr>
+	<td valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td align="left">
+
+
+<table cellpadding="3" cellspacing="0" border="0" width="400">
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_PAGES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
+	<td><label for="pages_view">{TEXT_VIEW}</label></td>
+	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
+	<td>
+		<label for="pages_add">{TEXT_ADD}</label>
+		&nbsp;
+		<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
+		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
+	</td>
+</tr>
+<tr>
+	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
+	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
+	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
+</tr>
+<tr>
+	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
+	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
+	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
+	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_MEDIA}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
+	<td><label for="media_view">{TEXT_VIEW}</label></td>
+	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
+	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
+</tr>
+<tr>
+	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
+	<td><label for="media_rename">{TEXT_RENAME}</label></td>
+	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
+	<td><label for="media_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
+	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_MODULES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
+	<td><label for="modules_view">{TEXT_VIEW}</label></td>
+	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
+	<td><label for="modules_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
+	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_TEMPLATES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
+	<td><label for="templates_view">{TEXT_VIEW}</label></td>
+	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
+	<td><label for="templates_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
+	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_LANGUAGES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
+	<td><label for="languages_view">{TEXT_VIEW}</label></td>
+	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
+	<td><label for="languages_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
+	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_SETTINGS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
+	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
+	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
+	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_USERS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
+	<td><label for="users_view">{TEXT_VIEW}</label></td>
+	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
+	<td><label for="users_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
+	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
+	<td><label for="users_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_GROUPS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
+	<td><label for="groups_view">{TEXT_VIEW}</label></td>
+	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
+	<td><label for="groups_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
+	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
+	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_ADMINTOOLS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
+	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+
+	</td>
+</tr>
+</table>
+
+<table cellpadding="5" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
+<tr>
+	<td valign="top" align="left" width="150">
+	{TEXT_MODULE_PERMISSIONS}:
+	</td>
+	<td valign="top" align="left">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN module_list_block -->
+			<li>
+				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="m_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END module_list_block -->
+		</ul>
+	</td>
+	<td valign="top" align="left" width="150">
+	{TEXT_TEMPLATE_PERMISSIONS}:
+	</td>
+	<td valign="top" align="left">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN template_list_block -->
+			<li>
+				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="t_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END template_list_block -->
+		</ul>
+	</td>
+</tr>
+
+<tr>
+	<td colspan="2"><input type="submit" name="submit" value="{SUBMIT_TITLE}" /></td>
+    <td colspan="2" align="right"><input type="reset" name="reset" value="{TEXT_RESET}" /></td>
+</tr>
+</table>
+</form>
+
+<table cellpadding="5" cellspacing="0" border="0" width="100%">
+<tr>
+	<td align="center">
+	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
+        <input type="hidden" name="group_id" value="{GROUP_ID}" />
+        <input type="hidden" name="action" value="modify" />
+        <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/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt	(revision 1242)
+++ branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt	(revision 1243)
@@ -1,293 +1,293 @@
-<!-- BEGIN main_block -->
-
-<h2 style="display: {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}" />
-
-<table cellpadding="5" 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: 100%" />
-	</td>
-</tr>
-</table>
-<table cellpadding="5" cellspacing="0" border="0" width="100%" style="display: {DISPLAY_BASIC}">
-<tr>
-	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td>
-		<table cellpadding="0" cellspacing="0" width="100%" border="0">
-		<tr>
-			<td>
-				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
-				<label for="pages">{SECTION_PAGES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
-				<label for="media">{SECTION_MEDIA}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
-				<label for="modules">{SECTION_MODULES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
-				<label for="templates">{SECTION_TEMPLATES}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
-				<label for="languages">{SECTION_LANGUAGES}</label>
-			</td>
-			<td>		
-				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
-				<label for="settings">{SECTION_SETTINGS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
-				<label for="users">{SECTION_USERS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
-				<label for="groups">{SECTION_GROUPS}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
-				<label for="admintools">{SECTION_ADMINTOOLS}</label>
-			</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-<table cellpadding="5" cellspacing="0" border="0" width="100%" style="display: {DISPLAY_ADVANCED}">
-<tr>
-	<td valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td align="left">
-
-
-<table cellpadding="3" cellspacing="0" border="0" width="400">
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_PAGES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
-	<td><label for="pages_view">{TEXT_VIEW}</label></td>
-	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
-	<td>
-		<label for="pages_add">{TEXT_ADD}</label>
-		&nbsp;
-		<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
-		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
-	</td>
-</tr>
-<tr>
-	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
-	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
-	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
-</tr>
-<tr>
-	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
-	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
-	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
-	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_MEDIA}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
-	<td><label for="media_view">{TEXT_VIEW}</label></td>
-	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
-	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
-</tr>
-<tr>
-	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
-	<td><label for="media_rename">{TEXT_RENAME}</label></td>
-	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
-	<td><label for="media_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
-	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_MODULES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
-	<td><label for="modules_view">{TEXT_VIEW}</label></td>
-	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
-	<td><label for="modules_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
-	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_TEMPLATES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
-	<td><label for="templates_view">{TEXT_VIEW}</label></td>
-	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
-	<td><label for="templates_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
-	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_LANGUAGES}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
-	<td><label for="languages_view">{TEXT_VIEW}</label></td>
-	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
-	<td><label for="languages_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
-	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_SETTINGS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
-	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
-	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
-	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_USERS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
-	<td><label for="users_view">{TEXT_VIEW}</label></td>
-	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
-	<td><label for="users_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
-	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
-	<td><label for="users_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_GROUPS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
-	<td><label for="groups_view">{TEXT_VIEW}</label></td>
-	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
-	<td><label for="groups_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
-	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
-	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_ADMINTOOLS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
-	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-</table>
-
-
-	</td>
-</tr>
-</table>
-
-<table cellpadding="5" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
-<tr>
-	<td valign="top" align="left" width="150">
-	{TEXT_MODULE_PERMISSIONS}:
-	</td>
-	<td valign="top" align="left">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN module_list_block -->
-			<li>
-				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="m_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END module_list_block -->
-		</ul>
-	</td>
-	<td valign="top" align="left" width="150">
-	{TEXT_TEMPLATE_PERMISSIONS}:
-	</td>
-	<td valign="top" align="left">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN template_list_block -->
-			<li>
-				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="t_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END template_list_block -->
-		</ul>
-	</td>
-</tr>
-
-<tr>
-	<td colspan="2"><input type="submit" name="submit" value="{SUBMIT_TITLE}" /></td>
-    <td colspan="2" align="right"><input type="reset" name="reset" value="{TEXT_RESET}" /></td>
-</tr>
-</table>
-</form>
-
-<table cellpadding="5" cellspacing="0" border="0" width="100%">
-<tr>
-	<td align="center">
-	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
-        <input type="hidden" name="group_id" value="{GROUP_ID}" />
-        <input type="hidden" name="action" value="modify" />
-        <input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
-    </form>
-	</td>
-</tr>
-</table>
-
-
+<!-- BEGIN main_block -->
+
+<h2 style="{DISPLAY_EXTRA};">{HEADING_MODIFY_GROUP}</h2>
+
+<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
+<input type="hidden" name="advanced" value="{ADVANCED}" />
+<input type="hidden" name="group_id" value="{GROUP_ID}" />
+
+<table cellpadding="5" 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: 100%" />
+	</td>
+</tr>
+</table>
+<table cellpadding="5" cellspacing="0" border="0" width="100%" style="{DISPLAY_BASIC}">
+<tr>
+	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td>
+		<table cellpadding="0" cellspacing="0" width="100%" border="0">
+		<tr>
+			<td>
+				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
+				<label for="pages">{SECTION_PAGES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
+				<label for="media">{SECTION_MEDIA}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
+				<label for="modules">{SECTION_MODULES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
+				<label for="templates">{SECTION_TEMPLATES}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
+				<label for="languages">{SECTION_LANGUAGES}</label>
+			</td>
+			<td>		
+				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
+				<label for="settings">{SECTION_SETTINGS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
+				<label for="users">{SECTION_USERS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
+				<label for="groups">{SECTION_GROUPS}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
+				<label for="admintools">{SECTION_ADMINTOOLS}</label>
+			</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
+<table cellpadding="5" cellspacing="0" border="0" width="100%" style="{DISPLAY_ADVANCED}">
+<tr>
+	<td valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td align="left">
+
+
+<table cellpadding="3" cellspacing="0" border="0" width="400">
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_PAGES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
+	<td><label for="pages_view">{TEXT_VIEW}</label></td>
+	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
+	<td>
+		<label for="pages_add">{TEXT_ADD}</label>
+		&nbsp;
+		<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
+		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
+	</td>
+</tr>
+<tr>
+	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
+	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
+	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
+</tr>
+<tr>
+	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
+	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
+	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
+	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_MEDIA}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
+	<td><label for="media_view">{TEXT_VIEW}</label></td>
+	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
+	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
+</tr>
+<tr>
+	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
+	<td><label for="media_rename">{TEXT_RENAME}</label></td>
+	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
+	<td><label for="media_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
+	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_MODULES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
+	<td><label for="modules_view">{TEXT_VIEW}</label></td>
+	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
+	<td><label for="modules_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
+	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_TEMPLATES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
+	<td><label for="templates_view">{TEXT_VIEW}</label></td>
+	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
+	<td><label for="templates_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
+	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_LANGUAGES}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
+	<td><label for="languages_view">{TEXT_VIEW}</label></td>
+	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
+	<td><label for="languages_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
+	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_SETTINGS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
+	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
+	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
+	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_USERS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
+	<td><label for="users_view">{TEXT_VIEW}</label></td>
+	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
+	<td><label for="users_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
+	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
+	<td><label for="users_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_GROUPS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
+	<td><label for="groups_view">{TEXT_VIEW}</label></td>
+	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
+	<td><label for="groups_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
+	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
+	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_ADMINTOOLS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
+	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+
+	</td>
+</tr>
+</table>
+
+<table cellpadding="5" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
+<tr>
+	<td valign="top" align="left" width="150">
+	{TEXT_MODULE_PERMISSIONS}:
+	</td>
+	<td valign="top" align="left">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN module_list_block -->
+			<li>
+				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="m_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END module_list_block -->
+		</ul>
+	</td>
+	<td valign="top" align="left" width="150">
+	{TEXT_TEMPLATE_PERMISSIONS}:
+	</td>
+	<td valign="top" align="left">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN template_list_block -->
+			<li>
+				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="t_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END template_list_block -->
+		</ul>
+	</td>
+</tr>
+
+<tr>
+	<td colspan="2"><input type="submit" name="submit" value="{SUBMIT_TITLE}" /></td>
+    <td colspan="2" align="right"><input type="reset" name="reset" value="{TEXT_RESET}" /></td>
+</tr>
+</table>
+</form>
+
+<table cellpadding="5" cellspacing="0" border="0" width="100%">
+<tr>
+	<td align="center">
+	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
+        <input type="hidden" name="group_id" value="{GROUP_ID}" />
+        <input type="hidden" name="action" value="modify" />
+        <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/argos_theme/templates/groups_form.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt	(revision 1242)
+++ branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt	(revision 1243)
@@ -1,281 +1,278 @@
-<!-- BEGIN main_block -->
-
-
-<h2 style="display: {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}" />
-
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td width="150">{TEXT_NAME}:</td>
-	<td>
-		<input type="text" name="group_name" maxlength="255" value="{GROUP_NAME}" style="width:98%" />
-	</td>
-</tr>
-</table>
-<table cellpadding="2" cellspacing="0" border="0" width="100%" style="display: {DISPLAY_BASIC}">
-<tr>
-	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td>
-		<table cellpadding="0" cellspacing="0" width="100%" border="0">
-		<tr>
-			<td>
-				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
-				<label for="pages">{SECTION_PAGES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
-				<label for="media">{SECTION_MEDIA}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
-				<label for="modules">{SECTION_MODULES}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
-				<label for="templates">{SECTION_TEMPLATES}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
-				<label for="languages">{SECTION_LANGUAGES}</label>
-			</td>
-			<td>		
-				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
-				<label for="settings">{SECTION_SETTINGS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
-				<label for="users">{SECTION_USERS}</label>
-			</td>
-			<td>
-				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
-				<label for="groups">{SECTION_GROUPS}</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
-				<label for="admintools">{SECTION_ADMINTOOLS}</label>
-			</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-<table cellpadding="2" cellspacing="0" border="0" width="100%" style="display: {DISPLAY_ADVANCED}">
-<tr>
-	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
-	<td align="left">
-
-
-<table cellpadding="0" cellspacing="0" border="0" width="330">
-<tr>
-	<td colspan="4"><h3>{SECTION_PAGES}</h3></td>
-</tr>
-<tr>
-	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
-	<td><label for="pages_view">{TEXT_VIEW}</label></td>
-	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
-	<td>
-		<label for="pages_add">{TEXT_ADD}</label>
-		&nbsp;
-		(<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
-		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
-	</td>
-</tr>
-<tr>
-	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
-	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
-	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
-</tr>
-<tr>
-	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
-	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
-	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
-	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_MEDIA}</h3></td>
-</tr>
-<tr>
-	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
-	<td><label for="media_view">{TEXT_VIEW}</label></td>
-	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
-	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
-</tr>
-<tr>
-	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
-	<td><label for="media_rename">{TEXT_RENAME}</label></td>
-	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
-	<td><label for="media_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
-	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_MODULES}</h3></td>
-</tr>
-<tr>
-	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
-	<td><label for="modules_view">{TEXT_VIEW}</label></td>
-	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
-	<td><label for="modules_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
-	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_TEMPLATES}</h3></td>
-</tr>
-<tr>
-	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
-	<td><label for="templates_view">{TEXT_VIEW}</label></td>
-	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
-	<td><label for="templates_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
-	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_LANGUAGES}</h3></td>
-</tr>
-<tr>
-	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
-	<td><label for="languages_view">{TEXT_VIEW}</label></td>
-	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
-	<td><label for="languages_install">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
-	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_SETTINGS}</h3></td>
-</tr>
-<tr>
-	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
-	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
-	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
-	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_USERS}</h3></td>
-</tr>
-<tr>
-	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
-	<td><label for="users_view">{TEXT_VIEW}</label></td>
-	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
-	<td><label for="users_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
-	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
-	<td><label for="users_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4"><h3>{SECTION_GROUPS}</h3></td>
-
-</tr>
-<tr>
-	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
-	<td><label for="groups_view">{TEXT_VIEW}</label></td>
-	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
-	<td><label for="groups_add">{TEXT_ADD}</label></td>
-</tr>
-<tr>
-	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
-	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
-	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
-	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
-</tr>
-<tr>
-	<td colspan="4">
-		<h3>{SECTION_ADMINTOOLS}</h3>
-	</td>
-</tr>
-<tr>
-	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
-	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
-</table>
-
-
-	</td>
-</tr>
-</table>
-
-<table cellpadding="2" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
-<tr>
-	<td valign="top" align="left" width="150">{TEXT_MODULE_PERMISSIONS}:</td>
-	<td valign="top" align="left">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN module_list_block -->
-			<li>
-				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="m_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END module_list_block -->
-		</ul>
-	</td>
-	<td valign="top" align="left" width="150">{TEXT_TEMPLATE_PERMISSIONS}:</td>
-	<td valign="top" align="left">
-		<ul style="margin: 0; padding: 0; list-style: none;">
-			<!-- BEGIN template_list_block -->
-			<li>
-				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
-				<label for="t_{VALUE}">{NAME}</label>
-			</li>
-			<!-- END template_list_block -->
-		</ul>
-	</td>
-</tr>
-<tr style="text-align:center;width:100%">
-    <td>&nbsp;</td>
-	<td style="text-align:right;">
-		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
-	</td>
-	<td style="text-align:left;">
-		<input type="reset" name="reset" value="{TEXT_RESET}" />
-	</td>
-    <td>&nbsp;</td>
-</tr>
-</table>
-</form>
-
-
-<form name="advanced" action="{ADVANCED_ACTION}" method="post">
-<input type="hidden" name="group_id" value="{GROUP_ID}" />
-<input type="hidden" name="action" value="modify" />
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-    <td>&nbsp;</td>
-	<td style="text-align:center;">
-		<input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
-	</td>
-    <td>&nbsp;</td>
-</tr>
-</table>
-</form>
+<!-- BEGIN main_block -->
+<h2 style="{DISPLAY_EXTRA};">{HEADING_MODIFY_GROUP}</h2>
+
+<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
+<input type="hidden" name="advanced" value="{ADVANCED}" />
+<input type="hidden" name="group_id" value="{GROUP_ID}" />
+
+<table cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td width="150">{TEXT_NAME}:</td>
+	<td>
+		<input type="text" name="group_name" maxlength="255" value="{GROUP_NAME}" style="width:98%" />
+	</td>
+</tr>
+</table>
+<table cellpadding="2" cellspacing="0" border="0" width="100%" style="{DISPLAY_BASIC}">
+<tr>
+	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td>
+		<table cellpadding="0" cellspacing="0" width="100%" border="0">
+		<tr>
+			<td>
+				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
+				<label for="pages">{SECTION_PAGES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
+				<label for="media">{SECTION_MEDIA}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
+				<label for="modules">{SECTION_MODULES}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
+				<label for="templates">{SECTION_TEMPLATES}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
+				<label for="languages">{SECTION_LANGUAGES}</label>
+			</td>
+			<td>		
+				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
+				<label for="settings">{SECTION_SETTINGS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
+				<label for="users">{SECTION_USERS}</label>
+			</td>
+			<td>
+				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
+				<label for="groups">{SECTION_GROUPS}</label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
+				<label for="admintools">{SECTION_ADMINTOOLS}</label>
+			</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
+<table cellpadding="2" cellspacing="0" border="0" width="100%" style="{DISPLAY_ADVANCED}">
+<tr>
+	<td width="150" valign="top">{TEXT_SYSTEM_PERMISSIONS}:</td>
+	<td align="left">
+
+<table cellpadding="0" cellspacing="0" border="0" width="330">
+<tr>
+	<td colspan="4"><h3>{SECTION_PAGES}</h3></td>
+</tr>
+<tr>
+	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked} /></td>
+	<td><label for="pages_view">{TEXT_VIEW}</label></td>
+	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked} /></td>
+	<td>
+		<label for="pages_add">{TEXT_ADD}</label>
+		&nbsp;
+		(<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked} />
+		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
+	</td>
+</tr>
+<tr>
+	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked} /></td>
+	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked} /></td>
+	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
+</tr>
+<tr>
+	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked} /></td>
+	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
+	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked} /></td>
+	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_MEDIA}</h3></td>
+</tr>
+<tr>
+	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked} /></td>
+	<td><label for="media_view">{TEXT_VIEW}</label></td>
+	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked} /></td>
+	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
+</tr>
+<tr>
+	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked} /></td>
+	<td><label for="media_rename">{TEXT_RENAME}</label></td>
+	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked} /></td>
+	<td><label for="media_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked} /></td>
+	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_MODULES}</h3></td>
+</tr>
+<tr>
+	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked} /></td>
+	<td><label for="modules_view">{TEXT_VIEW}</label></td>
+	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked} /></td>
+	<td><label for="modules_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked} /></td>
+	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_TEMPLATES}</h3></td>
+</tr>
+<tr>
+	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked} /></td>
+	<td><label for="templates_view">{TEXT_VIEW}</label></td>
+	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked} /></td>
+	<td><label for="templates_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked} /></td>
+	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_LANGUAGES}</h3></td>
+</tr>
+<tr>
+	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked} /></td>
+	<td><label for="languages_view">{TEXT_VIEW}</label></td>
+	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked} /></td>
+	<td><label for="languages_install">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked} /></td>
+	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_SETTINGS}</h3></td>
+</tr>
+<tr>
+	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked} /></td>
+	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
+	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} /></td>
+	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_USERS}</h3></td>
+</tr>
+<tr>
+	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked} /></td>
+	<td><label for="users_view">{TEXT_VIEW}</label></td>
+	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked} /></td>
+	<td><label for="users_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked} /></td>
+	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked} /></td>
+	<td><label for="users_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4"><h3>{SECTION_GROUPS}</h3></td>
+
+</tr>
+<tr>
+	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked} /></td>
+	<td><label for="groups_view">{TEXT_VIEW}</label></td>
+	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked} /></td>
+	<td><label for="groups_add">{TEXT_ADD}</label></td>
+</tr>
+<tr>
+	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked} /></td>
+	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
+	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked} /></td>
+	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<h3>{SECTION_ADMINTOOLS}</h3>
+	</td>
+</tr>
+<tr>
+	<td><input name="admintools_settings" id="admintools_settings" type="checkbox" value="1" {admintools_settings_checked} /></td>
+	<td><label for="admintools_settings">{TEXT_MODIFY_SETTINGS}</label></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+
+	</td>
+</tr>
+</table>
+
+<table cellpadding="2" cellspacing="0" border="0" width="100%" style="padding-top: 5px; padding-bottom: 5px;">
+<tr>
+	<td valign="top" align="left" width="150">{TEXT_MODULE_PERMISSIONS}:</td>
+	<td valign="top" align="left">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN module_list_block -->
+			<li>
+				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="m_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END module_list_block -->
+		</ul>
+	</td>
+	<td valign="top" align="left" width="150">{TEXT_TEMPLATE_PERMISSIONS}:</td>
+	<td valign="top" align="left">
+		<ul style="margin: 0; padding: 0; list-style: none;">
+			<!-- BEGIN template_list_block -->
+			<li>
+				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
+				<label for="t_{VALUE}">{NAME}</label>
+			</li>
+			<!-- END template_list_block -->
+		</ul>
+	</td>
+</tr>
+<tr style="text-align:center;width:100%">
+    <td>&nbsp;</td>
+	<td style="text-align:right;">
+		<input type="submit" name="submit" value="{SUBMIT_TITLE}" />
+	</td>
+	<td style="text-align:left;">
+		<input type="reset" name="reset" value="{TEXT_RESET}" />
+	</td>
+    <td>&nbsp;</td>
+</tr>
+</table>
+</form>
+
+
+<form name="advanced" action="{ADVANCED_ACTION}" method="post">
+<input type="hidden" name="group_id" value="{GROUP_ID}" />
+<input type="hidden" name="action" value="modify" />
+<table cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+    <td>&nbsp;</td>
+	<td style="text-align:center;">
+		<input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
+	</td>
+    <td>&nbsp;</td>
+</tr>
+</table>
+</form>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fcktemplates.xml
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fcktemplates.xml	(revision 1242)
+++ branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fcktemplates.xml	(revision 1243)
@@ -31,7 +31,7 @@
 			<![CDATA[
                 <div class="recht">
                     <p><b>Rechtliche Hinweise</b><br />
-                    1. Externe Links ( <a class="next" onclick="window.open(this.href,'','resizable=yes,location=no,menubar=no,scrollbars=yes,status=yes,toolbar=no,fullscreen=no,dependent=yes,width=400,height=300,left=150,top=150,status'); return false" href="http://www.disclaimer.de/disclaimer.htm"><font color="#810081">Bitte Disclaimer-Haftungsausschluss lesen</font></a> ) <br />
+                    1. Externe Links ( <a class="next" onclick="window.open(this.href,'','resizable=yes,location=no,menubar=no,scrollbars=yes,status=yes,toolbar=no,fullscreen=no,dependent=yes,width=600,height=300,left=150,top=150,status'); return false" href="http://www.disclaimer.de/disclaimer.htm"><font color="#810081">Bitte Disclaimer-Haftungsausschluss lesen</font></a> ) <br />
                     Die Inhalte externer Links werden nicht gepr&uuml;ft. Sie unterliegen der Haftung der jeweiligen Anbieter.<br />
                     &nbsp;</p>
                 </div>
@@ -44,7 +44,7 @@
 			<![CDATA[
 				<img style="MARGIN-RIGHT: 10px" height="100" alt="" width="100" align="left"/>
 				<h3>Type the title here</h3>
-				Type the text here
+				<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tatio</p>
 			]]>
 		</Html>
 	</Template>
@@ -57,7 +57,7 @@
                     <div class="c33l">
                         <div class="subcl">
                         <!-- Inhalt linker Block -->
-                            <p>Inhalt linker Block...</p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
 
                         </div>
                     </div>
@@ -65,7 +65,7 @@
                     <div class="c66r">
                         <div class="subcr">
                             <!-- Inhalt rechter Block -->
-                            <p>Inhalt rechter Block... </p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
 
                         </div>
                     </div>
@@ -82,7 +82,7 @@
                 <div class="c25l">
                   <div class="subcl">
                     <!-- Inhalt linker Block -->
-                    <p>Inhalt linker Block...</p>
+                    <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                   </div>
                 </div>
 
@@ -89,7 +89,7 @@
                 <div class="c75r">
                   <div class="subcr">
                     <!-- Inhalt rechter Block -->
-                    <p>Inhalt rechter Block... </p>
+                    <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                   </div>
                 </div>
               </div>
@@ -104,12 +104,12 @@
                 <div class="subcolumns">
                     <div class="c50l">
                         <div class="subcl">
-				            <p>Inhalt linker Block...</p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                         </div>
                     </div>
                     <div class="c50r">
                         <div class="subcr">
-				            <p>Inhalt rechter Block... </p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                         </div>
                     </div>
                 </div>
@@ -124,17 +124,17 @@
                 <div class="subcolumns">
                     <div class="c33l">
                         <div class="subcl">
-				            <p>Inhalt linker Block...</p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                         </div>
                     </div>
                     <div class="c33l">
                         <div class="subcl">
-				            <p>Inhalt mitteler Block...</p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                         </div>
                     </div>
                     <div class="c33r">
                         <div class="subcr">
-                            <p>Inhalt rechter Block... </p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                         </div>
                     </div>
                 </div>
@@ -149,12 +149,12 @@
                 <div class="subcolumns">
                     <div class="c66l">
                         <div class="subcl">
-				            <p>Inhalt linker Block...</p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                         </div>
                     </div>
                     <div class="c33r">
                         <div class="subcr">
-				            <p>Inhalt rechter Block... </p>
+                            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in </p>
                         </div>
                     </div>
                 </div>