--- loncom/interface/lonuserutils.pm 2014/02/05 18:02:15 1.161 +++ loncom/interface/lonuserutils.pm 2014/02/16 15:38:53 1.163 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.161 2014/02/05 18:02:15 bisitz Exp $ +# $Id: lonuserutils.pm,v 1.163 2014/02/16 15:38:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1081,14 +1081,13 @@ sub forceid_change { my ($context) = @_; my $output = '
'."\n" - .&mt('(only do if you know what you are doing.)')."\n"; + .&mt('Force change of exising ID') + .''.&Apache::loncommon::help_open_topic('ForceIDChange')."\n"; if ($context eq 'domain') { - $output .= '
'."\n"; + $output .= + '
' + .''."\n"; } return $output; } @@ -1394,9 +1393,9 @@ sub default_role_selector { &default_course_roles($context,$checkpriv,'Course',%customroles)."\n". ''. ''. - ''. ''. '
'. + '
'. $lt{'exs'}.'
  '.$lt{'new'}.'
'. @@ -3005,10 +3004,10 @@ END if ($mode eq 'autoenroll') { my $cellentry; if ($in{'type'} eq 'auto') { - $cellentry = ''.&mt('auto').' '; + $cellentry = ''.&mt('auto').' '; $autocount ++; } else { - $cellentry = '
'.&mt('manual').'
'; + $cellentry = ' - + @@ -3909,21 +3908,21 @@ END $r->print(<  END $r->print(&Apache::loncommon::end_data_table_header_row()); @@ -3994,7 +3993,6 @@ END $btn = $lt{'dm'}; } $r->print(<<"END"); -

  @@ -4820,7 +4818,7 @@ sub print_drop_menu { } else { &show_drop_list($r,$classlist,'nosort',$permission,$crstype); } - $r->print(''. &Apache::loncommon::end_page()); + $r->print(''); return; }

'.&mt('manual').'
'; $manualcount ++; if ($in{'lockedtype'}) { $cellentry .= ''; @@ -3139,10 +3138,10 @@ END $r->print(&Apache::loncommon::end_data_table().'
'); } elsif ($mode eq 'excel') { $excel_workbook->close(); - $r->print(&mt('[_1]Your Excel spreadsheet[_2] is ready for download.', '

','')."

\n"); + $r->print('

'.&mt('[_1]Your Excel spreadsheet[_2] is ready for download.', '','')."

\n"); } elsif ($mode eq 'csv') { close($CSVfile); - $r->print(&mt('[_1]Your CSV file[_2] is ready for download.', '

','')."

\n"); + $r->print('

'.&mt('[_1]Your CSV file[_2] is ready for download.', '','')."

\n"); $r->rflush(); } if ($mode eq 'autoenroll') { @@ -3840,7 +3839,6 @@ sub show_drop_list { $check_uncheck_js // ]]> -

END my ($indexhash,$keylist) = &make_keylist_array(); @@ -3877,6 +3875,7 @@ END $classlist,$keylist,$cdom,$cnum); my %lt=&Apache::lonlocal::texthash('usrn' => "username", 'dom' => "domain", + 'id' => "ID", 'sn' => "student name", 'mn' => "member name", 'sec' => "section", @@ -3895,7 +3894,7 @@ END

  $lt{'usrn'} $lt{'dom'}ID$lt{'id'} $nametitle $lt{'sec'} $lt{'start'} - $lt{'usrn'} + $lt{'usrn'} - $lt{'dom'} + $lt{'dom'} - ID + $lt{'id'} - $nametitle + $nametitle - $lt{'sec'} + $lt{'sec'} - $lt{'start'} + $lt{'start'} - $lt{'end'} + $lt{'end'} - $lt{'groups'} + $lt{'groups'}