--- loncom/interface/loncreateuser.pm	2009/07/14 12:04:50	1.297
+++ loncom/interface/loncreateuser.pm	2009/07/17 22:24:08	1.298
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.297 2009/07/14 12:04:50 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.298 2009/07/17 22:24:08 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3655,141 +3655,160 @@ END
 sub print_main_menu {
     my ($permission,$context) = @_;
     my %links = (
-                       domain => {
-                                   upload => 'Upload a File of Users',
-                                   singleuser => 'Add/Modify a Single User',
-                                   listusers => 'Manage Multiple Users',
-                                 },
-                       author => {
-                                   upload => 'Upload a File of Co-authors',
-                                   singleuser => 'Add/Modify a Single Co-author',
-                                   listusers => 'Display Co-authors and Manage Multiple Users',
-                                 },
-                       course => {
-                                   upload => 'File of Course Users',
-                                   singleuser => 'Single Course User',
-                                   listusers => 'Course User Lists',
-                                 },
-                     );
-  my @menu = ( {categorytitle => 'Add Users',
-	     items =>
-	     [{
-	         linktext => $links{$context}{'upload'},
-	         icon => 'sctr.png',
-	         #help => 'Course_Create_Class_List',
-	         url => '/adm/createuser?action=upload',
-	         permission => $permission->{'cusr'},
-	         linktitle => 'Upload a CSV or a text file containing users.',
-	     },
-	     {
-	         linktext => $links{$context}{'singleuser'},
-	         icon => 'edit-redo.png',
-	         #help => 'Course_Change_Privileges',
-	         url => '/adm/createuser?action=singleuser',
-	         permission => $permission->{'cusr'},
-	         linktitle => 'Add a user with a certain role to this course.',
-	     }]},
-	     {categorytitle => 'Administration',
-	     items =>
-	     [{	
-	         linktext => $links{$context}{'listusers'},
-                 icon => 'edit-find.png',
-                 #help => 'Course_View_Class_List',
-                 url => '/adm/createuser?action=listusers',
-	         permission => ($permission->{'view'} || $permission->{'cusr'}),
-	         linktitle => 'Show and manage users of this course.',
-	     }]},
-	     {categorytitle => 'Configuration',
-	     items =>
-	     [
-	     ]},
-	   );
-			
+                domain => {
+                            upload     => 'Upload a File of Users',
+                            singleuser => 'Add/Modify a User',
+                            listusers  => 'Manage Users',
+                            },
+                author => {
+                            upload     => 'Upload a File of Co-authors',
+                            singleuser => 'Add/Modify a Co-author',
+                            listusers  => 'Manage Co-authors',
+                            },
+                course => {
+                            upload     => 'Upload a File of Course Users',
+                            singleuser => 'Add/Modify a Course User',
+                            listusers  => 'Manage Course Users',
+                            },
+                );
+  my @menu = ( {categorytitle => 'Single Users', 
+         items =>
+         [
+            {
+             linktext => $links{$context}{'singleuser'},
+             icon => 'edit-redo.png',
+             #help => 'Course_Change_Privileges',
+             url => '/adm/createuser?action=singleuser',
+             permission => $permission->{'cusr'},
+             linktitle => 'Add a user with a certain role to this course.',
+            },
+         ]},
+
+         {categorytitle => 'Multiple Users',
+         items => 
+         [
+            {
+             linktext => $links{$context}{'upload'},
+             icon => 'sctr.png',
+             #help => 'Course_Create_Class_List',
+             url => '/adm/createuser?action=upload',
+             permission => $permission->{'cusr'},
+             linktitle => 'Upload a CSV or a text file containing users.',
+            },
+            {
+             linktext => $links{$context}{'listusers'},
+             icon => 'edit-find.png',
+             #help => 'Course_View_Class_List',
+             url => '/adm/createuser?action=listusers',
+             permission => ($permission->{'view'} || $permission->{'cusr'}),
+             linktitle => 'Show and manage users of this course.',
+            },
+
+         ]},
+
+         {categorytitle => 'Administration',
+         items => [ ]},
+       );
+            
     if ($context eq 'domain'){
-		
-		push(@{ $menu[1]->{items} },
-		{	linktext => 'Custom Roles',
-			icon => 'emblem-photos.png',
-			#help => 'Course_Editing_Custom_Roles',
-			url => '/adm/createuser?action=custom',
-			permission => $permission->{'custom'},
-			linktitle => 'Configure a custom role.',
-		});
-		
+        
+        push(@{ $menu[2]->{items} }, #Category: Administration
+            {
+             linktext => 'Custom Roles',
+             icon => 'emblem-photos.png',
+             #help => 'Course_Editing_Custom_Roles',
+             url => '/adm/createuser?action=custom',
+             permission => $permission->{'custom'},
+             linktitle => 'Configure a custom role.',
+            },
+        );
+        
     }elsif ($context eq 'course'){
-    	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
-	
-        push(@{ $menu[0]->{items} },
-		{	linktext => 'Single Student',
-            		#help => 'Course_Add_Student',
-			icon => 'list-add.png',
-            		url => '/adm/createuser?action=singlestudent',
-			permission => $permission->{'cusr'},
-            		linktitle => 'Add a user with the role student to this course.',
-        	});
-		
-        push(@{ $menu[1]->{items} },  
-		{	linktext => 'Drop Students',
-			icon => 'edit-undo.png',
-           		#help => 'Course_Drop_Student',
-           		url => '/adm/createuser?action=drop',
-			permission => $permission->{'cusr'},
-           		linktitle =>'Remove a student from this course.',
-        	},
-		{	linktext => 'Custom Roles',
-			icon => 'emblem-photos.png',
-           		#help => 'Course_Editing_Custom_Roles',
-           		url => '/adm/createuser?action=custom',
-			permission => $permission->{'custom'},
-			linktitle => 'Configure a custom role.',
-        	});
+        my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+    
+        push(@{ $menu[0]->{items} }, #Category: Single Users
+            {   
+             linktext => 'Add/Modify a Student',
+             #help => 'Course_Add_Student',
+             icon => 'list-add.png',
+             url => '/adm/createuser?action=singlestudent',
+             permission => $permission->{'cusr'},
+             linktitle => 'Add a user with the role student to this course.',
+            },
+        );
+        
+        push(@{ $menu[1]->{items} }, #Category: Multiple Users 
+            {
+             linktext => 'Drop Students',
+             icon => 'edit-undo.png',
+             #help => 'Course_Drop_Student',
+             url => '/adm/createuser?action=drop',
+             permission => $permission->{'cusr'},
+             linktitle =>'Remove a student from this course.',
+            },
+        );
+        push(@{ $menu[2]->{items} }, #Category: Administration
+            {    
+             linktext => 'Custom Roles',
+             icon => 'emblem-photos.png',
+             #help => 'Course_Editing_Custom_Roles',
+             url => '/adm/createuser?action=custom',
+             permission => $permission->{'custom'},
+             linktitle => 'Configure a custom role.',
+            },
+            {
+             linktext => 'Course Groups',
+             icon => 'conf.png',
+             #help => 'Course_Manage_Group',
+             url => '/adm/coursegroups?refpage=cusr',
+             permission => $permission->{'grp_manage'},
+             linktitle => 'Manage course groups.',
+            },
+            {
+             linktext => 'Change Logs',
+             icon => 'document-properties.png',
+             #help => 'Course_User_Logs',
+             url => '/adm/createuser?action=changelogs',
+             permission => $permission->{'cusr'},
+             linktitle => 'View change log.',
+            },
+        );
         if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
-            push(@{ $menu[1]->{items} },
-                    {   linktext => 'Enrollment Requests',
-                        icon => 'selfenrl-queue.png',
-                        #help => 'Course_Approve_Selfenroll',
-                        url => '/adm/createuser?action=selfenrollqueue',
-                        permission => $permission->{'cusr'},
-                        linktitle =>'Approve or reject enrollment requests.',
-                });
+            push(@{ $menu[2]->{items} },
+                    {   
+                     linktext => 'Enrollment Requests',
+                     icon => 'selfenrl-queue.png',
+                     #help => 'Course_Approve_Selfenroll',
+                     url => '/adm/createuser?action=selfenrollqueue',
+                     permission => $permission->{'cusr'},
+                     linktitle =>'Approve or reject enrollment requests.',
+                    },
+            );
         }
-		
+        
         if (!exists($permission->{'cusr_section'})){
-        	
-		push(@{ $menu[2]->{items} },
-		{	linktext => 'Automated Enrollment',
-			icon => 'roles.png',
-         		#help => 'Course_Automated_Enrollment',
-        		permission => (&Apache::lonnet::auto_run($cnum,$cdom)
-                                	&& $permission->{'cusr'}),
-			url  => '/adm/populate',
-			linktitle => 'Automated enrollment manager.',
-		},
-		{	linktext => 'User Self-Enrollment',
-			icon => 'cstr.png',
-	       		#help => 'Course_Self_Enrollment',
-			url => '/adm/createuser?action=selfenroll',
-			permission => $permission->{'cusr'},
-			linktitle => 'Configure user self enrollment.',
-       		});
-		
-	}
-
-	push(@{ $menu[2]->{items} },
-	{	linktext => 'Course Groups',
-		icon => 'conf.png',
-        	#help => 'Course_Manage_Group',
-           	url => '/adm/coursegroups?refpage=cusr',
-		permission => $permission->{'grp_manage'},
-		linktitle => 'Manage course groups.',
-        },
-        {	linktext => 'Change Logs',
-		icon => 'document-properties.png',
-        	#help => 'Course_User_Logs',
-        	url => '/adm/createuser?action=changelogs',
-		permission => $permission->{'cusr'},
-		linktitle => 'View change log.',
-        });
+            
+            push(@{ $menu[2]->{items} },
+                {
+                 linktext => 'Automated Enrollment',
+                 icon => 'roles.png',
+                 #help => 'Course_Automated_Enrollment',
+                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                     && $permission->{'cusr'}),
+                 url  => '/adm/populate',
+                 linktitle => 'Automated enrollment manager.',
+                },
+                {
+                 linktext => 'User Self-Enrollment',
+                 icon => 'cstr.png',
+                 #help => 'Course_Self_Enrollment',
+                 url => '/adm/createuser?action=selfenroll',
+                 permission => $permission->{'cusr'},
+                 linktitle => 'Configure user self enrollment.',
+                },
+            );
+        
+        }
     };
 return Apache::lonhtmlcommon::generate_menu(@menu);
 #               { text => 'View Log-in History',