--- loncom/interface/loncreateuser.pm	2007/10/22 22:16:38	1.190
+++ loncom/interface/loncreateuser.pm	2007/11/09 20:51:20	1.192
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.190 2007/10/22 22:16:38 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.192 2007/11/09 20:51:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -835,14 +835,14 @@ ENDAUTH
 ENDPORT
     } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
-                    'cup'  => "Existing user ",
+                    'cup'  => "Modify existing user: ",
                     'id'   => "in domain",
 				       );
 	$r->print(<<ENDCHANGEUSER);
 $start_page
 $crumbs
 $forminfo
-<h3>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h3>
+<h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
 ENDCHANGEUSER
         $r->print('<div class="LC_left_float">'.
                   &personal_data_display($ccuname,$ccdomain,$newuser,
@@ -886,7 +886,7 @@ ENDNOPORTPRIV
         unless ($tmp =~ /^(con_lost|error)/i) {
            my $now=time;
 	   my %lt=&Apache::lonlocal::texthash(
-		    'rer'  => "Revoke Existing Roles",
+		    'rer'  => "Existing Roles",
                     'rev'  => "Revoke",                    
                     'del'  => "Delete",
 		    'ren'  => "Re-Enable",
@@ -2434,12 +2434,13 @@ sub handler {
     } elsif ($env{'form.action'} eq 'singleuser' && $permission->{'cusr'}) {
         my $phase = $env{'form.phase'};
         my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
+	&Apache::loncreateuser::restore_prev_selections();
+	my $srch;
+	foreach my $item (@search) {
+	    $srch->{$item} = $env{'form.'.$item};
+	}
 
         if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
-            my $srch;
-            foreach my $item (@search) {
-                $srch->{$item} = $env{'form.'.$item};
-            }
             if ($env{'form.phase'} eq 'get_user_info') {
                 my ($currstate,$response,$forcenewuser,$results) = 
                     &user_search_result($srch);
@@ -2480,7 +2481,7 @@ sub handler {
         } elsif ($env{'form.phase'} eq 'update_user_data') {
             &update_user_data($r);
         } else {
-            &print_username_entry_form($r);
+            &print_username_entry_form($r,undef,$srch);
         }
     } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
         if ($env{'form.phase'} eq 'set_custom_roles') {
@@ -2489,21 +2490,30 @@ sub handler {
             &custom_role_editor($r);
         }
     } elsif ($env{'form.action'} eq 'listusers' && $permission->{'view'}) {
-        $r->print(&header());
+        my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
+        my $formname = 'studentform';
+        if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
+            ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = 
+                &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
+                                                        $formname);
+            my $js = &add_script($jscript).$cb_jscript;
+            my $loadcode = 
+                &Apache::lonuserutils::course_selector_loadcode($formname);
+            if ($loadcode ne '') {
+                $r->print(&header($js,{'onload' => $loadcode,}));
+            } else {
+                $r->print(&header($js));
+            }
+        } else {
+            $r->print(&header());
+        }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=listusers',
-              text=>"List Users' Roles"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users' Roles",
+              text=>"List Users"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users",
                                                       'User_Management_List'));
-        if (! exists($env{'form.state'})) {
-            &Apache::lonuserutils::print_html_classlist($r,undef,$permission);
-        } elsif ($env{'form.state'} eq 'csv') {
-            &Apache::lonuserutils::print_html_classlist($r,'csv',$permission);
-        } elsif ($env{'form.state'} eq 'excel') {
-            &Apache::lonuserutils::print_html_classlist($r,'excel',$permission);
-        } else {
-            &Apache::lonuserutils::print_html_classlist($r,undef,$permission);
-        }
+        &Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
+                     $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
         $r->print(&Apache::loncommon::end_page());
     } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
         $r->print(&header());
@@ -2539,6 +2549,11 @@ sub header {
     return $start_page;
 }
 
+sub add_script {
+    my ($js) = @_;
+    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+}
+
 ###############################################################
 ###############################################################
 #  Menu Phase One
@@ -2546,22 +2561,22 @@ sub print_main_menu {
     my ($permission) = @_;
     my @menu =
         (
-          { text => 'Upload a File of Users to Set Roles',
+          { text => 'Upload a File of Users to Modify/Create Users and/or Add roles',
             help => 'User_Management_Upload',
             action => 'upload',
             permission => $permission->{'cusr'},
             },
-          { text => 'Set User Roles for an Individual User',
+          { text => 'Create User/Set User Roles for a single user',
             help => 'User_Management_Single_User',
             action => 'singleuser',
             permission => $permission->{'cusr'},
             },
-#          { text => 'Display User Roles for Multiple Users',
-#            help => 'User_Management_List',
-#            action => 'listusers',
-#            permission => $permission->{'view'},
-#            },
-#          { text => 'Expire User Roles ',
+          { text => 'Display Lists of Users',
+            help => 'User_Management_List',
+            action => 'listusers',
+            permission => $permission->{'view'},
+            },
+#          { text => 'Expire User Roles',
 #            help => 'User_Management_Drops',
 #            action => 'expire',
 #            permission => $permission->{'cusr'},