Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1932)
+++ branches/2.8.x/CHANGELOG	(revision 1933)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+16 Jul-2013 Build 1933 Werner v.d.Decken(DarkViper)
+! modified layout of admin/groups for better usability
 13 Jul-2013 Build 1932 Werner v.d.Decken(DarkViper)
 ! modified class Password for use with different hashing classes
 09 Jul-2013 Build 1931 Werner v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/admin/groups/groups_mask.inc.php
===================================================================
--- branches/2.8.x/wb/admin/groups/groups_mask.inc.php	(revision 1932)
+++ branches/2.8.x/wb/admin/groups/groups_mask.inc.php	(revision 1933)
@@ -182,34 +182,15 @@
 //		$tpl->parse('hidden_permission_list', '');
 // Check and set system permissions boxes in main_block
 
-		if ( true == (isset( $_POST['advanced_action']) && (( $_POST['advanced_action'] == 'no') || strpos( $_POST['advanced_action'], ">>") > 0 ) ) )
-		{
-			$tpl->parse('hidden_permission_list', '');
-			$tpl->set_block('show_cmd_advanced_permission_block', 'show_cmd_hidden_advanced_permission_list_block', 'hidden_advanced_permission_list');
-			setSystemCheckboxes( $tpl, $admin, isset($_POST['system_permissions']) ? $_POST['system_permissions'] : $rec_group['system_permissions'] );
-			$tpl->set_var('DISPLAY_ADVANCED', '');
-			$tpl->set_var('DISPLAY_BASIC', 'display:none;');
-			$tpl->set_var('ADVANCED', 'yes');
-			$tpl->set_var('ADVANCED_ACTION', 'advance_action');
-			$tpl->set_var('ADVANCED_BUTTON',  ($admin->get_permission('groups') == true) ? '<< '.$mLang->TEXT_HIDE_ADVANCED : '<< '.$mLang->TEXT_HIDE_ADVANCED);
-			$tpl->set_var('FILESYSTEM_PERMISSIONS', $mLang->TEXT_FILESYSTEM_PERMISSIONS);
-
-			$tpl->parse('advanced_permission_block', 'show_cmd_advanced_permission_block', true);
-			$tpl->parse('permission_block', '');
-		} else {
 			$tpl->parse('hidden_advanced_permission_list', '');
 			$tpl->set_block('show_cmd_manage_permission_block', 'show_cmd_hidden_permission_list_block', 'hidden_permission_list');
 			setSystemCheckboxes( $tpl, $admin, isset($_POST['system_permissions']) ? $_POST['system_permissions'] : $rec_group['system_permissions'] );
 			$tpl->set_var('DISPLAY_ADVANCED', '');
 			$tpl->set_var('DISPLAY_BASIC', '');
-			$tpl->set_var('ADVANCED', 'no');
-			$tpl->set_var('ADVANCED_ACTION', 'advance_action');
-			$tpl->set_var('ADVANCED_BUTTON',  ($admin->get_permission('groups_add') == true) ? $mLang->TEXT_SHOW_ADVANCED.' >>' : $mLang->TEXT_SHOW_ADVANCED.' >>');
 			$tpl->set_var('FILESYSTEM_PERMISSIONS', $mLang->TEXT_FILESYSTEM_PERMISSIONS.' ');
 
-			$tpl->parse('advanced_permission_block', '');
+			$tpl->parse('advanced_permission_block', 'show_cmd_advanced_permission_block', true);
 			$tpl->parse('permission_block', 'show_cmd_manage_permission_block', true);
-		}
 
 // ------------------------
 
@@ -321,4 +302,4 @@
 		$output = $tpl->finish($tpl->parse('output', 'page'));
 		unset($tpl);
 		return $output;
-	}
+	}
\ No newline at end of file
Index: branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt	(revision 1932)
+++ branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt	(revision 1933)
@@ -2,7 +2,6 @@
 		<div class="content_box">
 			<form name="group" action="{GROUP_ACTION_URL}" method="post" class="access {DISPLAY_ADD}">
 			<input type="hidden" name="group_id" value="{GROUP_ID}" />
-			<input type="hidden" name="advance_action" value="{ADVANCED}" />
 			<input type="hidden" name="{FORM_NAME_GROUPMASK}" value="1" />
 			<input type="hidden" name="group_name" maxlength="120" value="{GROUP_NAME}" />
 			<input type="hidden" name="{ACTION_HIDDEN}" value="{SUBMIT_TITLE}" />
@@ -16,7 +15,6 @@
 					<input type="submit" name="{ACTION_HANDLE}" value="{SUBMIT_TITLE}" />
 					<input type="submit" name="action_cancel" value="{TEXT_CANCEL}" />
 					<input type="reset" name="reset" value="{TEXT_RESET}" />
-		 	        <input class="cright" type="submit" name="advanced_action" style="{DISPLAY_ADVANCED}" value="{ADVANCED_BUTTON}" />
 				</div>
 				<br class="clear ie-clearing none" />
 		<!-- BEGIN show_cmd_manage_permission_block -->
@@ -73,7 +71,7 @@
 				</div>
 		<!-- END show_cmd_manage_permission_block -->
 		<!-- BEGIN show_cmd_advanced_permission_block -->
-				<div class="cleft col_width33">
+				<div id="JQPageView" class="cleft col_width33">
 					<div class="col_content aBlock">
 			<!-- BEGIN show_cmd_hidden_advanced_permission_list_block -->
 						<input name="{SYS_NAME}" type="hidden" value="{SYS_VALUE}" />
@@ -82,8 +80,8 @@
 							<h6>{FILESYSTEM_PERMISSIONS} {MENU_PAGES}</h6>
 							<ul>
 								<li class="c100">
-									<input name="system_permissions[pages_view]" id="pages_view" type="checkbox" value="{VALUE}" {pages_view_checked} />
-									<label for="pages_view">{TEXT_VIEW}</label>
+									<input name="system_permissions[pages_view]" id="pages_view_detail" type="checkbox" value="{VALUE}" {pages_view_checked} />
+									<label for="pages_view_detail">{TEXT_VIEW}</label>
 								</li>
 								<li class="c100">
 									<input name="system_permissions[pages_add_l0]" id="pages_add_l0" type="checkbox" value="{VALUE}" {pages_add_l0_checked} />
@@ -113,14 +111,14 @@
 						</div>
 					</div>
 				</div>
-				<div class="cleft col_width33">
+				<div id="JQMediaView"class="cleft col_width33">
 					<div class="col_content">
 						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
 							<h6>{TEXT_FILESYSTEM_PERMISSIONS} {MENU_MEDIA}</h6>
 							<ul>
 								<li class="c100">
-								<input name="system_permissions[media_view]" id="media_view" type="checkbox" value="1" {media_view_checked} />
-								<label for="media_view">{TEXT_VIEW}</label>
+								<input name="system_permissions[media_view]" id="media_view_detail" type="checkbox" value="1" {media_view_checked} />
+								<label for="media_view_detail">{TEXT_VIEW}</label>
 								</li>
 								<li class="c100">
 								<input name="system_permissions[media_upload]" id="media_upload" type="checkbox" value="1" {media_upload_checked} />
@@ -145,46 +143,14 @@
 						</div>
 					</div>
 				</div>
-				<div class="cleft col_width33">
+				<div id="JQModulesView" class="cleft col_width33">
 					<div class="col_content">
 						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
-							<h6>{FILESYSTEM_PERMISSIONS} {MENU_SETTINGS}</h6>
-							<ul>
-								<li class="c100">
-									<input name="system_permissions[settings_view]" id="settings_view" type="checkbox" value="1" {settings_view_checked} />
-									<label for="settings_view">{TEXT_BASIC}</label>
-								</li>
-								<li class="c100">
-									<input name="system_permissions[settings_advanced]" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} />
-									<label for="settings_advanced">{TEXT_ADVANCED}</label>
-								</li>
-							</ul><br />
-							<h6>{FILESYSTEM_PERMISSIONS} {MENU_ADMINTOOLS}</h6>
-							<ul>
-								<li class="c100">
-									<input name="system_permissions[admintools_view]" id="admintools_view" type="checkbox" value="1" {admintools_view_checked} />
-									<label for="admintools_view">{TEXT_MODIFY}</label>
-								</li>
-							</ul><br />
-							<h6>{FILESYSTEM_PERMISSIONS} {MENU_USER_PREFERENCES}</h6>
-							<ul>
-								<li class="c100">
-									<input name="system_permissions[preferences_view]" id="preferences_view" type="checkbox" value="1" {preferences_view_checked} />
-									<label for="preferences_view">{TEXT_MODIFY}</label>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</div>
-				<br class="clear ie-clearing none" />
-				<div class="cleft col_width33">
-					<div class="col_content">
-						<div class="mbox curved min_h100 floatbox">
 							<h6>{FILESYSTEM_PERMISSIONS} {MENU_MODULES}</h6>
 							<ul>
 								<li class="c100">
-								<input name="system_permissions[modules_view]" id="modules_view" type="checkbox" value="1" {modules_view_checked} />
-								<label for="modules_view">{TEXT_VIEW}</label>
+								<input name="system_permissions[modules_view]" id="modules_view_detail" type="checkbox" value="1" {modules_view_checked} />
+								<label for="modules_view_detail">{TEXT_VIEW}</label>
 								</li>
 								<li class="c100">
 								<input name="system_permissions[modules_install]" id="modules_install" type="checkbox" value="1" {modules_install_checked} />
@@ -202,14 +168,15 @@
 						</div>
 					</div>
 				</div>
-				<div class="cleft col_width33">
+				<br class="clear ie-clearing none" />
+				<div id="JQTemplateView" class="cleft col_width33">
 					<div class="col_content">
-						<div class="mbox curved min_h100 floatbox">
+						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
 							<h6>{FILESYSTEM_PERMISSIONS} {MENU_TEMPLATES}</h6>
 							<ul>
 								<li class="c100">
-									<input name="system_permissions[templates_view]" id="templates_view" type="checkbox" value="1" {templates_view_checked} />
-									<label for="templates_view">{TEXT_VIEW}</label>
+									<input name="system_permissions[templates_view]" id="templates_view_detail" type="checkbox" value="1" {templates_view_checked} />
+									<label for="templates_view_detail">{TEXT_VIEW}</label>
 								</li>
 								<li class="c100">
 									<input name="system_permissions[templates_install]" id="templates_install" type="checkbox" value="1" {templates_install_checked} />
@@ -224,14 +191,14 @@
 						</div>
 					</div>
 				</div>
-				<div class="cleft col_width33">
+				<div id="JQLanguagesView" class="cleft col_width33">
 					<div class="col_content">
-						<div class="mbox curved min_h100 floatbox">
+						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
 							<h6>{FILESYSTEM_PERMISSIONS} {MENU_LANGUAGES}</h6>
 							<ul>
 								<li class="c100">
-									<input name="system_permissions[languages_view]" id="languages_view" type="checkbox" value="1" {languages_view_checked} />
-									<label for="languages_view">{TEXT_VIEW}</label>
+									<input name="system_permissions[languages_view]" id="languages_view_detail" type="checkbox" value="1" {languages_view_checked} />
+									<label for="languages_view_detail">{TEXT_VIEW}</label>
 								</li>
 								<li class="c100">
 									<input name="system_permissions[languages_install]" id="languages_install" type="checkbox" value="1" {languages_install_checked} />
@@ -246,15 +213,45 @@
 						</div>
 					</div>
 				</div>
+				<div id="JQSettingsView" class="cleft col_width33">
+					<div class="col_content">
+						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
+							<h6>{FILESYSTEM_PERMISSIONS} {MENU_SETTINGS}</h6>
+							<ul>
+								<li class="c100">
+									<input name="system_permissions[settings_view]" id="settings_view_detail" type="checkbox" value="1" {settings_view_checked} />
+									<label for="settings_view_detail">{TEXT_BASIC}</label>
+								</li>
+								<li class="c100">
+									<input name="system_permissions[settings_advanced]" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} />
+									<label for="settings_advanced">{TEXT_ADVANCED}</label>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
 				<br class="clear ie-clearing none" />
-				<div class="cleft col_width33">
+				<div id="JQAToolsView" class="cleft col_width33">
 					<div class="col_content">
-						<div class="mbox curved min_h100 floatbox">
+						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
+							<h6>{FILESYSTEM_PERMISSIONS} {MENU_ADMINTOOLS}</h6>
+							<ul>
+								<li class="c100">
+									<input name="system_permissions[admintools_view]" id="admintools_view_detail" type="checkbox" value="1" {admintools_view_checked} />
+									<label for="admintools_view_detail">{TEXT_MODIFY}</label>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
+				<div id="JQUsersView" class="cleft col_width33">
+					<div class="col_content">
+						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
 							<h6>{FILESYSTEM_PERMISSIONS} {MENU_USERS}</h6>
 							<ul>
 								<li class="c100">
-									<input name="system_permissions[users_view]" id="users_view" type="checkbox" value="1" {users_view_checked} />
-									<label for="users_view">{TEXT_VIEW}</label>
+									<input name="system_permissions[users_view]" id="users_view_detail" type="checkbox" value="1" {users_view_checked} />
+									<label for="users_view_detail">{TEXT_VIEW}</label>
 								</li>
 								<li class="c100">
 									<input name="system_permissions[users_add]" id="users_add" type="checkbox" value="1" {users_add_checked} />
@@ -272,14 +269,14 @@
 						</div>
 					</div>
 				</div>
-				<div class="cleft col_width33">
+				<div id="JQGroupsView" class="cleft col_width33">
 					<div class="col_content">
-						<div class="mbox curved min_h100 floatbox">
+						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
 							<h6>{FILESYSTEM_PERMISSIONS} {MENU_GROUPS}</h6>
 							<ul>
 								<li class="c100">
-									<input name="system_permissions[groups_view]" id="groups_view" type="checkbox" value="1" {groups_view_checked} />
-									<label for="groups_view">{TEXT_VIEW}</label>
+									<input name="system_permissions[groups_view]" id="groups_view_detail" type="checkbox" value="1" {groups_view_checked} />
+									<label for="groups_view_detail">{TEXT_VIEW}</label>
 								</li>
 								<li class="c100">
 									<input name="system_permissions[groups_add]" id="groups_add" type="checkbox" value="1" {groups_add_checked} />
@@ -297,6 +294,20 @@
 						</div>
 					</div>
 				</div>
+				<br class="clear ie-clearing none">
+				<div id="JQUSettingsView" class="cleft col_width33">
+					<div class="col_content">
+						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
+							<h6>{FILESYSTEM_PERMISSIONS} {MENU_USER_PREFERENCES}</h6>
+							<ul>
+								<li class="c100">
+									<input name="system_permissions[preferences_view]" id="preferences_view_detail" type="checkbox" value="1" {preferences_view_checked} />
+									<label for="preferences_view_detail">{TEXT_MODIFY}</label>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
 		<!-- END show_cmd_advanced_permission_block -->
 				<hr class="clear" />
 				<div class="cleft col_width33">
@@ -362,7 +373,6 @@
 					<input type="submit" name="{ACTION_HANDLE}" value="{SUBMIT_TITLE}" />
 					<input type="submit" name="action_cancel" value="{TEXT_CANCEL}" />
 					<input type="reset" name="reset" value="{TEXT_RESET}" />
-		 	        <input class="cright" type="submit" name="advanced_action" style="{DISPLAY_ADVANCED}" value="{ADVANCED_BUTTON}" />
 				</div>
 				<br class="clear ie-clearing none" />
 	<!-- END show_cmd_permission_block -->
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1932)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1933)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1932');
+if(!defined('REVISION')) define('REVISION', '1933');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js	(revision 1932)
+++ branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js	(revision 1933)
@@ -44,5 +44,132 @@
 	  }).addClass("internal");
 
 	$('form').attr('autocomplete', 'off');
+function include_file(filename, filetype) {
 
+	if(!filetype)
+		var filetype = 'js'; //js default filetype
+
+	var th = document.getElementsByTagName('head')[0];
+	var s = document.createElement((filetype == "js") ? 'script' : 'link');
+
+	s.setAttribute('type',(filetype == "js") ? 'text/javascript' : 'text/css');
+
+	if (filetype == "css")
+		s.setAttribute('rel','stylesheet');
+
+	s.setAttribute((filetype == "js") ? 'src' : 'href', filename);
+	th.appendChild(s);
+
+}
+
+function redirect_to_page (url, timer) {
+	setTimeout('self.location.href="'+url+'"', timer);
+}
+
+$(document).ready(function()
+{
+
+        if($(".jcalendar").length) {
+            $.insert(WB_URL+"/include/jscalendar/calendar-system.css");
+          }
+
+        if($(".jsadmin").length) {
+            $.insert(WB_URL+"/modules/jsadmin/backend.css");
+          }
+
+	//Add external link class to external links -
+	$('a[href^="http://"]').filter(function() {
+		//Compare the anchor tag's host name with location's host name
+	    return this.hostname && this.hostname !== location.hostname;
+	  }).addClass("external").attr("target", "_blank");
+
+	/* Add internal link class to external links -   */
+	$('a[href^="http://"]').filter(function() {
+		//Compare the anchor tag's host name with location's host name
+	    return this.hostname && this.hostname == location.hostname;
+	  }).addClass("internal");
+
+	$('form').attr('autocomplete', 'off');
+
+/* toggler for group permissions */
+    if($('form[name="group"]').length) {
+
+		function toggleBox(checkbox, toggleID){
+			var $checkbox = checkbox;
+			if( $checkbox.attr('checked')){
+				$(toggleID).removeClass("hide");
+			} else {
+				$(toggleID).addClass("hide");
+			}
+		}
+
+
+		var $ischecked = false;
+		/* check toggler on pageload */
+		if($ischecked == false) {
+			if(!$('#pages_view').attr('checked')){
+				toggleBox($(this), "#JQPageView");
+			}
+			if(!$('#media_view').attr('checked')){
+				toggleBox($(this), "#JQMediaView");
+			}
+			if(!$('#modules_view').attr('checked')){
+				toggleBox($(this), "#JQModulesView");
+			}
+			if(!$('#templates_view').attr('checked')){
+				toggleBox($(this), "#JQTemplateView");
+			}
+			if(!$('#languages_view').attr('checked')){
+				toggleBox($(this), "#JQLanguagesView");
+			}
+			if(!$('#settings_view').attr('checked')){
+				toggleBox($(this), "#JQSettingsView");
+			}
+			if(!$('#admintools_view').attr('checked')){
+				toggleBox($(this), "#JQAToolsView");
+			}
+			if(!$('#users_view').attr('checked')){
+				toggleBox($(this), "#JQUsersView");
+			}
+			if(!$('#groups_view').attr('checked')){
+				toggleBox($(this), "#JQGroupsView");
+			}
+			var $ischecked = true;
+		}
+
+
+        $('#pages_view').click(function(){
+            toggleBox($(this), "#JQPageView");
+        });
+        $('#media_view').click(function(){
+            toggleBox($(this), "#JQMediaView");
+        });
+        $('#modules_view').click(function(){
+            toggleBox($(this), "#JQModulesView");
+        });
+        $('#templates_view').click(function(){
+            toggleBox($(this), "#JQTemplateView");
+        });
+        $('#languages_view').click(function(){
+            toggleBox($(this), "#JQLanguagesView");
+        });
+        $('#settings_view').click(function(){
+            toggleBox($(this), "#JQSettingsView");
+        });
+        $('#admintools_view').click(function(){
+            toggleBox($(this), "#JQAToolsView");
+        });
+        $('#users_view').click(function(){
+            toggleBox($(this), "#JQUsersView");
+        });
+        $('#groups_view').click(function(){
+            toggleBox($(this), "#JQGroupsView");
+        });
+        $('#preferences_view').click(function(){
+            toggleBox($(this), "#JQUSettingsView");
+        });
+      }
+
+
+});
 });
\ No newline at end of file
