Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 1043)
+++ trunk/CHANGELOG	(revision 1044)
@@ -12,6 +12,13 @@
 
 ------------------------------------- 2.8.0 -------------------------------------
 08-July-2009 Dietrich Roland Pehlke
+!	admin -> users -> index.php
+!	admin -> groups -> index.php
+	Codechanges using blocks to avoid to generate the "switch"-link right-top,
+	if the user has no permission to edit the other one.
+!	wb_theme|classic_theme|argos_theme -> templates -> users.htt
+!	wb_theme|classic_theme|argos_theme -> templates -> groups.htt
+ 	Add block-comments
 !	admin -> addons -> index.php	codechanges
 !	admin -> access -> index.php	codechanges
 	Codechanges to get rid of the empty display(style) declaration "style='display: ;'",
Index: trunk/wb/admin/groups/index.php
===================================================================
--- trunk/wb/admin/groups/index.php	(revision 1043)
+++ trunk/wb/admin/groups/index.php	(revision 1044)
@@ -32,6 +32,7 @@
 $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');
 $template->set_var('ADMIN_URL', ADMIN_URL);
 
 // Get existing value from database
@@ -74,19 +75,19 @@
 
 // Insert language headings
 $template->set_var(array(
-								'HEADING_MODIFY_DELETE_GROUP' => $HEADING['MODIFY_DELETE_GROUP'],
-								'HEADING_ADD_GROUP' => $HEADING['ADD_GROUP']
-								)
-						);
+	'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' => $TEXT['MANAGE_USERS'],
-								'CONFIRM_DELETE' => $MESSAGE['GROUPS']['CONFIRM_DELETE']
-								)
-						);
-
+	'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');
Index: trunk/wb/admin/users/index.php
===================================================================
--- trunk/wb/admin/users/index.php	(revision 1043)
+++ trunk/wb/admin/users/index.php	(revision 1044)
@@ -31,6 +31,7 @@
 $template = new Template(THEME_PATH.'/templates');
 $template->set_file('page', 'users.htt');
 $template->set_block('page', 'main_block', 'main');
+$template->set_block("main_block", "manage_groups_block", "groups");
 $template->set_var('ADMIN_URL', ADMIN_URL);
 
 // Get existing value from database
@@ -73,19 +74,19 @@
 
 // Insert language headings
 $template->set_var(array(
-								'HEADING_MODIFY_DELETE_USER' => $HEADING['MODIFY_DELETE_USER'],
-								'HEADING_ADD_USER' => $HEADING['ADD_USER']
-								)
-						);
+		'HEADING_MODIFY_DELETE_USER' => $HEADING['MODIFY_DELETE_USER'],
+		'HEADING_ADD_USER' => $HEADING['ADD_USER']
+		)
+);
 // Insert language text and messages
 $template->set_var(array(
-								'TEXT_MODIFY' => $TEXT['MODIFY'],
-								'TEXT_DELETE' => $TEXT['DELETE'],
-								'TEXT_MANAGE_GROUPS' => $TEXT['MANAGE_GROUPS'],
-								'CONFIRM_DELETE' => $MESSAGE['USERS']['CONFIRM_DELETE']
-								)
-						);
-
+		'TEXT_MODIFY' => $TEXT['MODIFY'],
+		'TEXT_DELETE' => $TEXT['DELETE'],
+		'TEXT_MANAGE_GROUPS' => ( $admin->get_permission('groups') == true ) ? $TEXT['MANAGE_GROUPS'] : "**",
+		'CONFIRM_DELETE' => $MESSAGE['USERS']['CONFIRM_DELETE']
+		)
+);
+if ( $admin->get_permission('groups') == true ) $template->parse("groups", "manage_groups_block", true);
 // Parse template object
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');
@@ -165,22 +166,22 @@
 
 // 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_NONE' => $TEXT['NONE'],
-								'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'],
-								'USERNAME_FIELDNAME' => $username_fieldname,
-								'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD']
-								)
-						);
+			'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_NONE' => $TEXT['NONE'],
+			'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'],
+			'USERNAME_FIELDNAME' => $username_fieldname,
+			'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD']
+			)
+	);
 
 // Parse template for add user form
 $template->parse('main', 'main_block', false);
Index: trunk/wb/templates/classic_theme/templates/users.htt
===================================================================
--- trunk/wb/templates/classic_theme/templates/users.htt	(revision 1043)
+++ trunk/wb/templates/classic_theme/templates/users.htt	(revision 1044)
@@ -10,7 +10,9 @@
 		<h2>{HEADING_MODIFY_DELETE_USER}</h2>
 	</td>
 	<td align="right">
+		<!-- BEGIN manage_groups_block -->
 		<a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a>
+		<!-- END manage_groups_block -->
 	</td>
 </tr>
 </table>
Index: trunk/wb/templates/classic_theme/templates/groups.htt
===================================================================
--- trunk/wb/templates/classic_theme/templates/groups.htt	(revision 1043)
+++ trunk/wb/templates/classic_theme/templates/groups.htt	(revision 1044)
@@ -10,7 +10,9 @@
 		<h2>{HEADING_MODIFY_DELETE_GROUP}</h2>
 	</td>
 	<td align="right">
+		<!-- BEGIN manage_users_block -->
 		<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a>
+		<!-- END manage_users_block -->
 	</td>
 </tr>
 </table>
Index: trunk/wb/templates/wb_theme/templates/users.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/users.htt	(revision 1043)
+++ trunk/wb/templates/wb_theme/templates/users.htt	(revision 1044)
@@ -10,7 +10,9 @@
 		<h2>{HEADING_MODIFY_DELETE_USER}</h2>
 	</td>
 	<td align="right">
+		<!-- BEGIN manage_groups_block -->
 		<a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a>
+		<!-- END manage_groups_block -->
 	</td>
 </tr>
 </table>
Index: trunk/wb/templates/wb_theme/templates/groups.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/groups.htt	(revision 1043)
+++ trunk/wb/templates/wb_theme/templates/groups.htt	(revision 1044)
@@ -10,7 +10,10 @@
 		<h2>{HEADING_MODIFY_DELETE_GROUP}</h2>
 	</td>
 	<td align="right">
+		<!-- BEGIN manage_users_block -->
 		<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a>
+		<!-- END manage_users_block -->
+		{USER}
 	</td>
 </tr>
 </table>
Index: trunk/wb/templates/argos_theme/templates/users.htt
===================================================================
--- trunk/wb/templates/argos_theme/templates/users.htt	(revision 1043)
+++ trunk/wb/templates/argos_theme/templates/users.htt	(revision 1044)
@@ -6,7 +6,11 @@
 <table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
 	<tr style="background:#f0f0f0;">
 		<td align="left"><h2>{HEADING_MODIFY_DELETE_USER}</h2></td>
-		<td align="right"><a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a></td>
+		<td align="right">
+		<!-- BEGIN manage_groups_block -->
+		<a href="{ADMIN_URL}/groups/index.php">{TEXT_MANAGE_GROUPS}</a>
+		<!-- END manage_groups_block -->
+		</td>
      </tr>
 </table>
 
Index: trunk/wb/templates/argos_theme/templates/groups.htt
===================================================================
--- trunk/wb/templates/argos_theme/templates/groups.htt	(revision 1043)
+++ trunk/wb/templates/argos_theme/templates/groups.htt	(revision 1044)
@@ -6,7 +6,11 @@
   <table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
 	<tr style="background:#f0f0f0;">
 		<td align="left"><h2>{HEADING_MODIFY_DELETE_GROUP}</h2></td>
-		<td align="right"><a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a></td>
+		<td align="right">
+		<!-- BEGIN manage_users_block -->
+		<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a>
+		<!-- END manage_users_block -->
+		</td>
      </tr>
 </table>