--- loncom/interface/lonpreferences.pm 2006/06/22 23:22:41 1.91 +++ loncom/interface/lonpreferences.pm 2008/05/28 01:45:48 1.122 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.91 2006/06/22 23:22:41 albertel Exp $ +# $Id: lonpreferences.pm,v 1.122 2008/05/28 01:45:48 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,6 +42,7 @@ use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; use Apache::lonnet; +use LONCAPA(); # # Write lonnet::passwd to do the call below. @@ -122,7 +123,7 @@ sub verify_and_change_wysiwyg { my $r = shift; my $newsetting=$env{'form.wysiwyg'}; &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting}); - &Apache::lonnet::appenv('environment.wysiwygeditor' => $newsetting); + &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting}); $r->print('

'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'

'); } @@ -166,12 +167,12 @@ sub verify_and_change_languages { my $message=''; if ($newlanguage) { &Apache::lonnet::put('environment',{'languages' => $newlanguage}); - &Apache::lonnet::appenv('environment.languages' => $newlanguage); - $message='Set new preferred languages to '.$newlanguage; + &Apache::lonnet::appenv({'environment.languages' => $newlanguage}); + $message=&mt('Set new preferred languages to ').'"'.$newlanguage.'".'; } else { &Apache::lonnet::del('environment',['languages']); &Apache::lonnet::delenv('environment\.languages'); - $message='Reset preferred language'; + $message=&mt('Reset preferred language.'); } $r->print(< Examples:

TeX to HTML
- +

jsMath
$jsMath_start @@ -229,12 +230,12 @@ if (jsMath.nofonts == 1) { +''); } - +

Convert to Images

- +

ENDLSCREEN if ($env{'environment.texengine'} ne 'jsMath') { @@ -251,21 +252,21 @@ sub verify_and_change_texengine { my $newtexengine = $env{'form.texengine'}; $newtexengine=~s/[^\-\w]//g; if ($newtexengine eq 'ttm') { - &Apache::lonnet::appenv('browser.mathml' => 1); + &Apache::lonnet::appenv({'browser.mathml' => 1}); } else { if ($env{'environment.texengine'} eq 'ttm') { - &Apache::lonnet::appenv('browser.mathml' => 0); + &Apache::lonnet::appenv({'browser.mathml' => 0}); } } my $message=''; if ($newtexengine) { &Apache::lonnet::put('environment',{'texengine' => $newtexengine}); - &Apache::lonnet::appenv('environment.texengine' => $newtexengine); - $message='Set new preferred math display to '.$newtexengine; + &Apache::lonnet::appenv({'environment.texengine' => $newtexengine}); + $message=&mt('Set new preferred math display to ').'"'.$newtexengine.'".'; } else { &Apache::lonnet::del('environment',['texengine']); &Apache::lonnet::delenv('environment\.texengine'); - $message='Reset preferred math display.'; + $message=&mt('Reset preferred math display.'); } @@ -279,6 +280,8 @@ ENDVCSCREEN ################################################################ sub rolesprefchanger { my $r = shift; + my $role = ($env{'user.adv'} ? 'Role' : 'Course'); + my $lc_role = ($env{'user.adv'} ? 'role' : 'course'); my $user = $env{'user.name'}; my $domain = $env{'user.domain'}; my %userenv = &Apache::lonnet::get @@ -307,39 +310,23 @@ sub rolesprefchanger { my %frozen_roles = &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'}); + my %role_text = &rolespref_get_role_text([keys(%recent_roles)]); + my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text); + $roles_check_list .= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). - "".&mt('Freeze Role')."". - "".&mt('Role')."". + "".&mt('Freeze '.$role)."". + "".&mt($role)."". &Apache::loncommon::end_data_table_header_row(). "\n"; my $count; - foreach $role_key (sort(keys(%recent_roles))) { + foreach $role_key (@sorted_roles) { my $checked = ""; my $value = $recent_roles{$role_key}; if ($frozen_roles{$role_key}) { $checked = "checked=\"checked\""; } -# get course information - my ($role,$rest) = split(/\./, $role_key); - my $trole = &Apache::lonnet::plaintext($role); - my ($tdomain,$other,$tsection)= - split(/\//,Apache::lonnet::declutter($rest)); - my $tother = '-'; - if ($role =~ /cc|st|in|ta/ ) { - my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other); - $tother = " - ".$newhash{'description'}; - } elsif ($role =~ /dc/) { - $tother = ""; - } else { - $tother = " - $other"; - } - - my $section=""; - if ($tsection) { - $section = " - Section/Group: $tsection"; - } $count++; $roles_check_list .= &Apache::loncommon::start_data_table_row(). @@ -347,24 +334,24 @@ sub rolesprefchanger { "". "". + "$role_text{$role_key}". &Apache::loncommon::end_data_table_row(). "\n"; } $roles_check_list .= "\n"; } $r->print(' -

'.&mt('Some LON-CAPA users have a long list of roles. The Recent Roles Hotlist feature keeps track of the last N roles which have been visited and places a table of these at the top of the roles page. People with very few roles should leave this feature disabled.').' +

'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'

-