--- loncom/interface/lonuserutils.pm	2008/12/06 12:49:18	1.74
+++ loncom/interface/lonuserutils.pm	2008/12/12 16:50:53	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.74 2008/12/06 12:49:18 bisitz Exp $
+# $Id: lonuserutils.pm,v 1.77 2008/12/12 16:50:53 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?',
@@ -2457,7 +2457,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 +2466,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 {
@@ -3637,14 +3637,13 @@ sub upfile_drop_add {
                     ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
                     $r->print('<br />'.
       &mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
-          '<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen).
-                              '</b>');
+          '<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen));
                     next;
                 } else {
                     if ($entries{$fields{'domain'}} 
                         ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
                         $r->print('<br />'. '<b>'.$entries{$fields{'domain'}}.
-                                  '</b>: '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen).'</b>');
+                                  '</b>: '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen));
                         next;
                     }
                     my $username = $entries{$fields{'username'}};