--- loncom/interface/loncreateuser.pm	2007/12/21 20:34:26	1.221
+++ loncom/interface/loncreateuser.pm	2007/12/24 16:00:13	1.224
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.221 2007/12/21 20:34:26 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.224 2007/12/24 16:00:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -233,7 +233,14 @@ sub print_username_entry_form {
             text=>"Single user search",
             faq=>282,bug=>'Instructor Interface',});
     }
-    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
+    my $helpitem = 'Course_Change_Privileges';
+    if ($env{'form.action'} eq 'custom') {
+        $helpitem = 'Course_Editing_Custom_Roles';
+    } elsif ($env{'form.action'} eq 'singlestudent') {
+        $helpitem = 'Course_Add_Student';
+    }
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                     $helpitem);
     my %existingroles=&Apache::lonuserutils::my_custom_roles();
     my $choice=&Apache::loncommon::select_form('make new role','rolename',
 		('make new role' => 'Generate new role ...',%existingroles));
@@ -249,9 +256,6 @@ sub print_username_entry_form {
                     'enrl' => "to enroll one student",
 				       );
     my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
-    my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
-    my $helpsist=&Apache::loncommon::help_open_topic('Course_Add_Student');
-    my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain');
     if ($sellink) {
         $sellink = "$lt{'or'} ".$sellink;
@@ -263,16 +267,16 @@ sub print_username_entry_form {
 <form action="/adm/createuser" method="post" name="docustom">
 <input type="hidden" name="action" value="$env{'form.action'}" />
 <input type="hidden" name="phase" value="selected_custom_edit" />
-<h3>$lt{'ecrp'}$helpecpr</h3>
+<h3>$lt{'ecrp'}</h3>
 $lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
 <input name="customeditor" type="submit" value="$lt{'cre'}" />
 </form>
 ENDCUSTOM
         }
     } else {
-        my $actiontext = $lt{'mod'}.$helpsiur;
+        my $actiontext = $lt{'mod'};
         if ($env{'form.action'} eq 'singlestudent') {
-            $actiontext = $lt{'enrl'}.$helpsist;
+            $actiontext = $lt{'enrl'};
         }
         $r->print("
 <h3>$lt{'srch'} $sellink $actiontext</h3>");
@@ -420,7 +424,8 @@ ENDSCRIPT
              {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
               text=>"Select User",
               faq=>282,bug=>'Instructor Interface',});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                      'Course_Change_Privileges'));
         $r->print("<b>$lt{'usrch'}</b><br />");
         $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
         $r->print('<h3>'.$lt{'usel'}.'</h3>');
@@ -432,7 +437,8 @@ ENDSCRIPT
              {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
               text=>"Select Student",
               faq=>282,bug=>'Instructor Interface',});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                      'Course_Add_Student'));
         $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
         $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
         $r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
@@ -620,7 +626,12 @@ sub print_user_modification_page {
       ({href=>"javascript:backPage($form,'$env{'form.phase'}','modify')",
         text=>$breadcrumb_text{'modify'},
         faq=>282,bug=>'Instructor Interface',});
-    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
+    my $helpitem = 'Course_Change_Privileges';
+    if ($env{'form.action'} eq 'singlestudent') {
+        $helpitem = 'Course_Add_Student';
+    }
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                     $helpitem);
 
     my $forminfo =<<"ENDFORMINFO";
 <form action="/adm/createuser" method="post" name="$formname">
@@ -1508,7 +1519,12 @@ sub update_user_data {
         {href=>"/adm/createuser",
          text=>"Result",
          faq=>282,bug=>'Instructor Interface',});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+    my $helpitem = 'Course_Change_Privileges';
+    if ($env{'form.action'} eq 'singlestudent') {
+        $helpitem = 'Course_Add_Student';
+    }
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                 $helpitem));
     $r->print(&update_result_form($uhome));
     # Check Inputs
     if (! $env{'form.ccuname'} ) {
@@ -2109,7 +2125,11 @@ sub update_roles {
                     if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
                         my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
                         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course') || ($result eq 'refused')) {
-                            $output = "Error: $result\n";
+                            if ($result eq 'refused' && $logmsg) {
+                                $output = $logmsg;
+                            } else { 
+                                $output = "Error: $result\n";
+                            }
                         } else {
                             $output = &mt('Assigning').' '.$role.' in '.$url.
                                       &mt('starting').' '.localtime($now).
@@ -2475,7 +2495,8 @@ sub custom_role_editor {
       {href=>"javascript:backPage(document.form1,'','')",
          text=>"Edit custom role",
          faq=>282,bug=>'Instructor Interface',});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                  'Course_Editing_Custom_Roles'));
 
     $r->print($body_top);
     my %lt=&Apache::lonlocal::texthash(
@@ -2615,7 +2636,8 @@ sub set_custom_role {
          {href=>"javascript:backPage(document.customresult,'set_custom_roles','')",
           text=>"Result",
           faq=>282,bug=>'Instructor Interface',});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                  'Course_Editing_Custom_Roles'));
 
     my ($rdummy,$roledef)=
 	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
@@ -2723,7 +2745,7 @@ sub handler {
             ({href=>'/adm/createuser?action=upload&state=',
               text=>"Upload Users List"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List',
-                                                   'User_Management_Upload'));
+                                                   'Course_Create_Class_List'));
         $r->print('<form name="studentform" method="post" '.
                   'enctype="multipart/form-data" '.
                   ' action="/adm/createuser">'."\n");
@@ -2833,13 +2855,13 @@ sub handler {
             my $choice = $env{'form.bulkaction'};
             $r->print(&header());
             $r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users",
-                                                          'User_Management_List'));
+                                                          'Course_View_Class_List'));
             if ($permission->{'cusr'}) {
                 &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice);
-                $r->print('<p><a href="/adm/createuser?action=listusers">'.&mt('Display User Lists').'</a>');
                 $r->print(&Apache::loncommon::end_page());
             } else {
                 $r->print(&mt('You are not authorized to make bulk changes to user roles'));
+                $r->print('<p><a href="/adm/createuser?action=listusers">'.&mt('Display User Lists').'</a>');
                 $r->print(&Apache::loncommon::end_page());
             }
         } else {
@@ -2865,7 +2887,7 @@ sub handler {
                 $r->print(&header(&add_script(&verify_user_display())));
             }
             $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users",
-                                                          'User_Management_List'));
+                                                          'Course_View_Class_List'));
             &Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
                          $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
             $r->print(&Apache::loncommon::end_page());
@@ -2965,24 +2987,24 @@ sub print_main_menu {
     my @menu =
         (
           { text => $links{$context}{'upload'},
-            help => 'User_Management_Upload',
+            help => 'Course_Create_Class_List',
             action => 'upload',
             permission => $permission->{'cusr'},
             },
           { text => $links{$context}{'singleuser'}, 
-            help => 'User_Management_Single_User',
+            help => 'Course_Change_Privileges',
             action => 'singleuser',
             permission => $permission->{'cusr'},
             },
           { text => $links{$context}{'listusers'},
-            help => 'User_Management_List',
+            help => 'Course_View_Class_List',
             action => 'listusers',
             permission => ($permission->{'view'} || $permission->{'cusr'}),
           },
         );
     if ($context eq 'domain' || $context eq 'course') {
         my $customlink =  { text => 'Edit Custom Roles',
-                            help => 'Custom_Role_Edit',
+                            help => 'Course_Editing_Custom_Roles',
                             action => 'custom',
                             permission => $permission->{'custom'},
                           };
@@ -2993,7 +3015,7 @@ sub print_main_menu {
         my @courselinks =
             (
               { text => 'Enroll a Single Student',
-                 help => 'Course_Single_Student',
+                 help => 'Course_Add_Student',
                  action => 'singlestudent',
                  permission => $permission->{'cusr'},
                  },
@@ -3561,48 +3583,49 @@ $table.
 
 sub course_level_row {
     my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,$lt) = @_;
-    my $table = &Apache::loncommon::start_data_table_row().
-                ' <td><input type="checkbox" name="act_'.
-                $protectedcourse.'_'.$role.'" /></td>'."\n".
-                ' <td>'.$plrole.'</td>'."\n".
-                '<td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
+    my $row = &Apache::loncommon::start_data_table_row().
+              ' <td><input type="checkbox" name="act_'.
+              $protectedcourse.'_'.$role.'" /></td>'."\n".
+              ' <td>'.$plrole.'</td>'."\n".
+              ' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
     if ($role eq 'cc') {
-        $table .= '<td>&nbsp</td>';
+        $row .= '<td>&nbsp;</td>';
     } elsif ($env{'request.course.sec'} ne '') {
-        $table .= ' <td><input type="hidden" value="'.
-                  $env{'request.course.sec'}.'" '.
-                  'name="sec_'.$protectedcourse.'_'.$role.'" />'.
-                  $env{'request.course.sec'}.'</td>';
+        $row .= ' <td><input type="hidden" value="'.
+                $env{'request.course.sec'}.'" '.
+                'name="sec_'.$protectedcourse.'_'.$role.'" />'.
+                $env{'request.course.sec'}.'</td>';
     } else {
         if (ref($sections_count) eq 'HASH') {
             my $currsec = 
                 &Apache::lonuserutils::course_sections($sections_count,
                                                        $protectedcourse.'_'.$role);
-            $table .= '<td><table class="LC_createuser">'.
-                      '<tr class="LC_section_row">
-                        <td valign="top">'.$lt->{'exs'}.'<br />'.
-                        $currsec.'</td>
-                        <td>&nbsp;&nbsp;</td>
-                        <td valign="top">&nbsp;'.$lt->{'new'}.'<br />'.
+            $row .= '<td><table class="LC_createuser">'."\n".
+                    '<tr class="LC_section_row">'."\n".
+                    ' <td valign="top">'.$lt->{'exs'}.'<br />'.
+                       $currsec.'</td>'."\n".
+                     ' <td>&nbsp;&nbsp;</td>'."\n".
+                     ' <td valign="top">&nbsp;'.$lt->{'new'}.'<br />'.
                      '<input type="text" name="newsec_'.$protectedcourse.'_'.$role.
                      '" value="" />'.
                      '<input type="hidden" '.
                      'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n".
-                     '</tr></table></td>';
+                     '</tr></table></td>'."\n";
         } else {
-            $table .= '<td><input type="text" size="10" '.
-                      'name="sec_'.$protectedcourse.'_'.$role.'" /></td>';
+            $row .= '<td><input type="text" size="10" '.
+                      'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n";
         }
     }
-    $table .= <<ENDTIMEENTRY;
-<td><input type="hidden" name="start_$protectedcourse\_$role" value='' />
+    $row .= <<ENDTIMEENTRY;
+<td><input type="hidden" name="start_$protectedcourse\_$role" value="" />
 <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt->{'ssd'}</a></td>
-<td><input type="hidden" name="end_$protectedcourse\_$role" value='' />
+<td><input type="hidden" name="end_$protectedcourse\_$role" value="" />
 <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt->{'sed'}</a></td>
 ENDTIMEENTRY
-    $table.= &Apache::loncommon::end_data_table_row();
+    $row .= &Apache::loncommon::end_data_table_row();
+    return $row;
 }
 
 sub course_level_dc {