--- loncom/interface/lonuserutils.pm	2008/12/12 16:53:37	1.73.2.1
+++ loncom/interface/lonuserutils.pm	2009/01/05 05:31:03	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.73.2.1 2008/12/12 16:53:37 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.78 2009/01/05 05:31:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -403,7 +403,7 @@ sub javascript_validations {
          name     => 'The optional name field was not specified.',
          snum     => 'The optional ID number field was not specified.',
          section  => 'The optional section field was not specified.',
-         email    => 'The optional email address field was not specified.',
+         email    => 'The optional e-mail address field was not specified.',
          role     => 'The optional role field was not specified.',
          domain   => 'The optional domain field was not specified.',
          continue => 'Continue adding users?',
@@ -1316,6 +1316,12 @@ sub print_userlist {
         ($cnum,$cdom) = &get_course_identity();
         $r->print(&section_group_filter($cnum,$cdom));
     }
+    if ($env{'form.phase'} eq '') {
+        $r->print('<br /><br />'.&list_submit_button(&mt('Display List of Users')).
+                  "\n</p>\n".
+                  '<input type="hidden" name="phase" value="" /></form>');
+        return;
+    }
     if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
         $r->print('&nbsp;'.&list_submit_button(&mt('Update Display')).
                   "\n</p>\n");
@@ -2457,7 +2463,7 @@ END
                     $cellentry = '<b>'.&mt('auto').'</b>&nbsp;<label><input type="checkbox" name="chgauto" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;Change</label>';
                     $autocount ++;
                 } else {
-                    $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;Change</label></nobr></td></tr><tr><td><nobr>';
+                    $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><span class="LC_nobreak"><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;Change</label></span></td></tr><tr><td><span class="LC_nobreak">';
                     $manualcount ++;
                     if ($in{'lockedtype'}) {
                         $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;'.&mt('Unlock').'</label>';
@@ -2466,7 +2472,7 @@ END
                         $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;'.&mt('Lock').'</label>';
                         $lockcount ++;
                     }
-                    $cellentry .= '</nobr></td></tr></table>';
+                    $cellentry .= '</span></td></tr></table>';
                 }
                 $r->print("<td>$cellentry</td>\n");
             } else {
@@ -3636,8 +3642,8 @@ sub upfile_drop_add {
                 if ($entries{$fields{'username'}}
                     ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
                     $r->print('<br />'.
-      &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
-          $entries{$fields{'username'}},$fname,$mname,$lname,$gen));
+      &mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
+          '<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen));
                     next;
                 } else {
                     if ($entries{$fields{'domain'}} 
@@ -3656,10 +3662,10 @@ sub upfile_drop_add {
                             $entries{$fields{'sec'}} =~ s/\W//g;
                             my $item = $entries{$fields{'sec'}};
                             if ($item eq "none" || $item eq 'all') {
-                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',$username,$fname,$mname,$lname,$gen,$item));
+                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item));
                                 next;
                             } elsif (exists($curr_groups{$item})) {
-                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',$username,$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
+                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
                                 next;
                             } else {
                                 push(@secs,$item);
@@ -3671,7 +3677,7 @@ sub upfile_drop_add {
                         if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') {
                             my $currsec = $userlist{$username.':'.$userdomain}[$secidx];
                             if ($currsec ne $env{'request.course.sec'}) {
-                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".',$username,$fname,$mname,$lname,$gen,$secs[0]).'<br />');
+                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$secs[0]).'<br />');
                                 if ($currsec eq '') {
                                     $r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.'));
 
@@ -3721,8 +3727,13 @@ sub upfile_drop_add {
                             }
                             if ($role eq '') {
                                 my $rolestr = join(', ',@permitted_roles);
-                                $r->print('<br />'.
-      &mt('<b>[_1]</b>: You do not have permission to add the requested role [_2] for the user.',$entries{$fields{'username'}},$entries{$fields{'role'}}).'<br />'.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n");
+                                $r->print('<br />'
+                                         .&mt('[_1]: You do not have permission to add the requested role [_2] for the user.'
+                                             ,'<b>'.$entries{$fields{'username'}}.'</b>'
+                                             ,$entries{$fields{'role'}})
+                                         .'<br />'
+                                         .&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n"
+                                );
                                 next;
                             }
                         }
@@ -3882,15 +3893,15 @@ sub upfile_drop_add {
                     } else {
                         if ($context eq 'course') {
                             $r->print('<br />'. 
-      &mt('<b>[_1]</b>: Unable to enroll.  No password specified.',$username)
+      &mt('[_1]: Unable to enroll. No password specified.','<b>'.$username.'</b>')
                                      );
                         } elsif ($context eq 'author') {
                             $r->print('<br />'.
-      &mt('<b>[_1]</b>: Unable to add co-author.  No password specified.',$username)
+      &mt('[_1]: Unable to add co-author. No password specified.','<b>'.$username.'</b>')
                                      );
                         } else {
                             $r->print('<br />'.
-      &mt('<b>[_1]</b>: Unable to add user.  No password specified.',$username)
+      &mt('[_1]: Unable to add user. No password specified.','<b>'.$username.'</b>')
                                      );
                         }
                     }
@@ -3993,7 +4004,7 @@ sub user_change_result {
         if ($userresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to add/modify: [_2]',$username.':'.$userdomain,$error));
+                  &mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         }
     } else {
         $counts->{'user'} ++;
@@ -4003,7 +4014,7 @@ sub user_change_result {
         if ($authresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to modify authentication: [_2]',$username.':'.$userdomain,$error));
+                  &mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         } 
     } else {
         $counts->{'auth'} ++;
@@ -4013,7 +4024,7 @@ sub user_change_result {
         if ($roleresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to add role: [_2]',$username.':'.$userdomain,$error));
+                  &mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         }
     } else {
         $counts->{'role'} ++;
@@ -4283,7 +4294,7 @@ sub update_user_list {
     $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>');
     if ($count > 0) {
         if ($choice eq 'revoke' || $choice eq 'drop') {
-            $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.</p>'));
+            $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.').'</p>');
         }
         # Flush the course logs so reverse user roles immediately updated
         &Apache::lonnet::flushcourselogs();