--- loncom/interface/loncreateuser.pm	2014/01/22 18:01:43	1.387
+++ loncom/interface/loncreateuser.pm	2014/02/11 17:34:41	1.390
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.387 2014/01/22 18:01:43 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.390 2014/02/11 17:34:41 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,9 +126,7 @@ sub user_quotas {
     my ($ccuname,$ccdomain) = @_;
     my %lt = &Apache::lonlocal::texthash(
                    'usrt'      => "User Tools",
-                   'cuqu'      => "Current quota",
                    'cust'      => "Custom quota",
-                   'defa'      => "Default",
                    'chqu'      => "Change quota",
     );
    
@@ -211,8 +209,8 @@ END_SCRIPT
                        '    <td>'.$titles{$name}.'</td>'."\n".
                        '  </tr>'."\n".
                        &Apache::loncommon::start_data_table_row()."\n".
-                       '  <td>'.$lt{'cuqu'}.': '.
-                       $currquota.'&nbsp;MB.&nbsp;&nbsp;'.
+                       '  <td><span class="LC_nobreak">'.
+                       &mt('Current quota: [_1] MB',$currquota).'</span>&nbsp;&nbsp;'.
                        $defaultinfo.'</td>'."\n".
                        &Apache::loncommon::end_data_table_row()."\n".
                        &Apache::loncommon::start_data_table_row()."\n".
@@ -220,13 +218,14 @@ END_SCRIPT
                        ': <label>'.
                        '<input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_off" '.
                        'value="0" '.$custom_off.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
-                       ' />'.$lt{'defa'}.'&nbsp;('.$defquota.' MB).</label>&nbsp;'.
+                       ' /><span class="LC_nobreak">'.
+                       &mt('Default ([_1] MB)',$defquota).'</span></label>&nbsp;'.
                        '&nbsp;<label><input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_on" '.
                        'value="1" '.$custom_on.'  onchange="javascript:quota_changes('."'custom','$name'".');"'.
                        ' />'.$lt{'cust'}.':</label>&nbsp;'.
                        '<input type="text" name="'.$name.'quota" id="'.$name.'quota" size ="5" '.
                        'value="'.$showquota.'" onfocus="javascript:quota_changes('."'quota','$name'".');"'.
-                       ' />&nbsp;MB</span></td>'."\n".
+                       ' />&nbsp;'.&mt('MB').'</span></td>'."\n".
                        &Apache::loncommon::end_data_table_row()."\n";
         }
     }
@@ -1230,6 +1229,7 @@ ENDFORMINFO
             }
         }
     }
+    my $title = '';
     if ($newuser) {
         my ($portfolioform,$domroleform);
         if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) ||
@@ -1243,10 +1243,6 @@ ENDFORMINFO
         }
         &initialize_authen_forms($ccdomain,$formname);
         my %lt=&Apache::lonlocal::texthash(
-                'cnu'            => 'Create New User',
-                'ast'            => 'as a student',
-                'ame'            => 'as a member',
-                'ind'            => 'in domain',
                 'lg'             => 'Login Data',
                 'hs'             => "Home Server",
         );
@@ -1260,19 +1256,25 @@ $loginscript
 // ]]>
 </script>
 <input type='hidden' name='makeuser' value='1' />
-<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
 ENDTITLE
         if ($env{'form.action'} eq 'singlestudent') {
             if ($crstype eq 'Community') {
-                $r->print(' ('.$lt{'ame'}.')');
+                $title = &mt('Create New User [_1] in domain [_2] as a member',
+                                 '"'.$ccuname.'"','"'.$ccdomain.'"');
             } else {
-                $r->print(' ('.$lt{'ast'}.')');
+                $title = &mt('Create New User [_1] in domain [_2] as a student',
+                                 '"'.$ccuname.'"','"'.$ccdomain.'"');
             }
+        } else {
+                $title = &mt('Create New User [_1] in domain [_2]',
+                                 '"'.$ccuname.'"','"'.$ccdomain.'"');
         }
-        $r->print('</h2>'."\n".'<div class="LC_left_float">');
+        $r->print('<h2>'.$title.'</h2>'."\n");
+        $r->print('<div class="LC_left_float">');
         my $personal_table = 
             &personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                    $inst_results{$ccuname.':'.$ccdomain});
+        # (Do not offer Disable Safeguard here)
         $r->print($personal_table);
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -1359,35 +1361,25 @@ ENDAUTH
         }
         $r->print('</div><div class="LC_clear_float_footer"></div>');
     } else { # user already exists
-	my %lt=&Apache::lonlocal::texthash(
-                    'cup'  => "Modify existing user: ",
-                    'ens'  => "Enroll one student: ",
-                    'enm'  => "Enroll one member: ",
-                    'id'   => "in domain",
-				       );
-	$r->print(<<ENDCHANGEUSER);
-$start_page
-$forminfo
-<h2>
-ENDCHANGEUSER
+	$r->print($start_page.$forminfo);
         if ($env{'form.action'} eq 'singlestudent') {
             if ($crstype eq 'Community') {
-                $r->print($lt{'enm'});
+                $title = &mt('Enroll one member: [_1] in domain [_2]',
+                                 '"'.$ccuname.'"','"'.$ccdomain.'"');
             } else {
-                $r->print($lt{'ens'});
+                $title = &mt('Enroll one student: [_1] in domain [_2]',
+                                 '"'.$ccuname.'"','"'.$ccdomain.'"');
             }
         } else {
-            $r->print($lt{'cup'});
+            $title = &mt('Modify existing user: [_1] in domain [_2]',
+                             '"'.$ccuname.'"','"'.$ccdomain.'"');
         }
-        $r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"</h2>'.
-                  "\n".'<div class="LC_left_float">');
-        my ($personal_table,$showforceid) = 
+        $r->print('<h2>'.$title.'</h2>'."\n");
+        $r->print('<div class="LC_left_float">');
+        my $personal_table = 
             &personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                    $inst_results{$ccuname.':'.$ccdomain});
         $r->print($personal_table);
-        if ($showforceid) {
-            $r->print('<table>'.&Apache::lonuserutils::forceid_change($context).'</table>');
-        }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
@@ -2170,7 +2162,7 @@ sub modify_login_block {
 
 sub personal_data_display {
     my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
-    my ($output,$showforceid,%userenv,%canmodify,%canmodify_status);
+    my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
     my $rowcount = 0;
@@ -2257,8 +2249,8 @@ sub personal_data_display {
             } else {
                 $row .= $userenv{$item};
             }
-            if ($item eq 'id') {
-                $showforceid = $canmodify{$item};
+            if (($item eq 'id') && ($canmodify{$item})) {
+                 $row .= '<br />'.&Apache::lonuserutils::forceid_change($context);
             }
         }
         $row .= &Apache::lonhtmlcommon::row_closure(1);
@@ -2294,7 +2286,7 @@ sub personal_data_display {
                     }
                 }
                 if (!$hiderow) {
-                    my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n".
+                    my $row = &Apache::lonhtmlcommon::row_title(&mt('Affiliations'),undef,'LC_oddrow_value')."\n".
                               $shown.&Apache::lonhtmlcommon::row_closure(1); 
                     if ($context eq 'selfcreate') {
                         $rowcount ++;
@@ -2309,7 +2301,7 @@ sub personal_data_display {
         if ($context eq 'selfcreate') {
             return($output,$rowcount,$editable);
         } else {
-            return ($output,$showforceid);
+            return $output;
         }
     } else {
         return $output;
@@ -2474,9 +2466,12 @@ sub update_user_data {
     if (! exists($env{'form.makeuser'})) {
         # Modifying an existing user, so check the validity of the name
         if ($uhome eq 'no_host') {
-            $r->print($error.&mt('Unable to determine home server for ').
-                      $env{'form.ccuname'}.&mt(' in domain ').
-                      $env{'form.ccdomain'}.'.');
+            $r->print(
+                $error
+               .'<p class="LC_error">'
+               .&mt('Unable to determine home server for [_1] in domain [_2].',
+                        '"'.$env{'form.ccuname'}.'"','"'.$env{'form.ccdomain'}.'"')
+               .'</p>');
             return;
         }
     }
@@ -2966,8 +2961,8 @@ sub update_user_data {
             }
         }
         foreach my $name ('portfolio','author') {
-            $oldsettings{'quota'}{$name} = $oldquota{$name}.' MB';
-            $newsettings{'quota'}{$name} = $newquota{$name}.' MB';
+            $oldsettings{'quota'}{$name} = &mt('[_1] MB',$oldquota{$name});
+            $newsettings{'quota'}{$name} = &mt('[_1] MB',$newquota{$name});
         }
         if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) {
             my ($chgresult,$namechgresult);
@@ -3066,9 +3061,12 @@ sub update_user_data {
                     &Apache::lonnet::appenv(\%newenvhash);
                 }
             } else { # error occurred
-                $r->print('<span class="LC_error">'.&mt('Unable to successfully change environment for').' '.
-                      $env{'form.ccuname'}.' '.&mt('in domain').' '.
-                      $env{'form.ccdomain'}.'</span><br />');
+                $r->print(
+                    '<p class="LC_error">'
+                   .&mt('Unable to successfully change environment for [_1] in domain [_2].',
+                            '"'.$env{'form.ccuname'}.'"',
+                            '"'.$env{'form.ccdomain'}.'"')
+                   .'</p>');
             }
         } else { # End of if ($env ... ) logic
             # They did not want to change the users name, quota, tool availability,
@@ -6996,22 +6994,22 @@ sub course_level_dc {
     my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
                      '<td><br /><span class="LC_nobreak"><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" />'.
                      $courseform.('&nbsp;' x4).'</span></td>'."\n".
-                     '<td valign><br /><select name="role">'."\n";
+                     '<td valign="top"><br /><select name="role">'."\n";
     foreach my $role (@roles) {
         my $plrole=&Apache::lonnet::plaintext($role);
-        $otheritems .= '  <option value="'.$role.'">'.$plrole;
+        $otheritems .= '  <option value="'.$role.'">'.$plrole.'</option>';
     }
     if ( keys %customroles > 0) {
         foreach my $cust (sort keys %customroles) {
             my $custrole='cr_cr_'.$env{'user.domain'}.
                     '_'.$env{'user.name'}.'_'.$cust;
-            $otheritems .= '  <option value="'.$custrole.'">'.$cust;
+            $otheritems .= '  <option value="'.$custrole.'">'.$cust.'</option>';
         }
     }
     $otheritems .= '</select></td><td>'.
                      '<table border="0" cellspacing="0" cellpadding="0">'.
                      '<tr><td valign="top"><b>'.$lt{'exs'}.'</b><br /><select name="currsec">'.
-                     ' <option value=""><--'.&mt('Pick course first').'</select></td>'.
+                     ' <option value="">&lt;--'.&mt('Pick course first').'</option></select></td>'.
                      '<td>&nbsp;&nbsp;</td>'.
                      '<td valign="top">&nbsp;<b>'.$lt{'new'}.'</b><br />'.
                      '<input type="text" name="newsec" value="" />'.