--- loncom/interface/lonpreferences.pm 2009/04/17 11:12:57 1.151 +++ loncom/interface/lonpreferences.pm 2009/05/04 19:35:31 1.156 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.151 2009/04/17 11:12:57 bisitz Exp $ +# $Id: lonpreferences.pm,v 1.156 2009/05/04 19:35:31 tempelho Exp $ # # Copyright Michigan State University Board of Trustees # @@ -135,9 +135,8 @@ sub verify_and_change_wysiwyg { my $newsetting=$env{'form.wysiwyg'}; &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting}); &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting}); -# $r->print('

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

'); - print_main_menu($r,'

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

'); + &print_main_menu($r,'

'.&Apache::lonhtmlcommon::confirm_success(&mt('Setting WYSIWYG editor to:').' ' + .&mt($newsetting)).'

'); } ################################################################ @@ -187,17 +186,14 @@ sub verify_and_change_languages { if ($newlanguage) { &Apache::lonnet::put('environment',{'languages' => $newlanguage}); &Apache::lonnet::appenv({'environment.languages' => $newlanguage}); - $message=&mt('Set new preferred languages to ').'"'.$newlanguage.'".'; + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred languages to ').'"'.$newlanguage.'".'); } else { &Apache::lonnet::del('environment',['languages']); &Apache::lonnet::delenv('environment.languages'); - $message=&mt('Reset preferred language.'); + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred language.')); } &Apache::loncommon::flush_langs_cache($user,$domain); - print_main_menu($r, $message); -# $r->print(< $newtexengine}); &Apache::lonnet::appenv({'environment.texengine' => $newtexengine}); - $message=&mt('Set new preferred math display to ').'"'.$newtexengine.'".'; + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred math display to ').'"'.$newtexengine.'".'); } else { &Apache::lonnet::del('environment',['texengine']); &Apache::lonnet::delenv('environment.texengine'); - $message=&mt('Reset preferred math display.'); + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred math display.')); } - - -# $r->print(<print(< $newscreen}); &Apache::lonnet::appenv({'environment.screenname' => $newscreen}); - $message=&mt('Set new screenname to ').'"'.$newscreen.'.".'; + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new screenname to ').'"'.$newscreen.'.".'); } else { &Apache::lonnet::del('environment',['screenname']); &Apache::lonnet::delenv('environment.screenname'); - $message=&mt('Reset screenname.'); + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset screenname.')); } # Nickname $message.='
'; @@ -566,17 +554,14 @@ sub verify_and_change_screenname { if ($newscreen) { &Apache::lonnet::put('environment',{'nickname' => $newscreen}); &Apache::lonnet::appenv({'environment.nickname' => $newscreen}); - $message.=&mt('Set new nickname to ').'"'.$newscreen.'".'; + $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set new nickname to ').'"'.$newscreen.'".'); } else { &Apache::lonnet::del('environment',['nickname']); &Apache::lonnet::delenv('environment.nickname'); - $message.=&mt('Reset nickname.'); + $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset nickname.')); } &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain); -# $r->print(< '/adm/preferences?action=changeicons', text => 'Change Main Menu'}); $r->print(Apache::loncommon::start_page('Page Display Settings')); @@ -628,8 +613,7 @@ sub verify_and_change_icons { &Apache::lonnet::put('environment',{'icons' => $newicons}); &Apache::lonnet::appenv({'environment.icons' => $newicons}); -# $r->print(&mt('Set menu mode to [_1].',$newicons)); - print_main_menu($r, &mt('Set menu mode to [_1].',$newicons)); + &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Set menu mode to [_1].',$newicons))); } ################################################################ @@ -638,7 +622,7 @@ sub verify_and_change_icons { sub clickerchanger { my $r = shift; - Apache::lonhtmlcommon::add_breadcrumb( + &Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/preferences?action=changeclicker', text => 'Register Clicker'}); $r->print(Apache::loncommon::start_page('Other')); @@ -677,8 +661,7 @@ sub verify_and_change_clicker { $newclickers=~s/\,$//; &Apache::lonnet::put('environment',{'clickers' => $newclickers}); &Apache::lonnet::appenv({'environment.clickers' => $newclickers}); -# $r->print(&mt('Registering clickers: [_1]',$newclickers)); - print_main_menu($r, &mt('Registering clickers: [_1]',$newclickers)); + &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers))); } ################################################################ @@ -687,7 +670,7 @@ sub verify_and_change_clicker { sub domcoordchanger { my $r = shift; - Apache::lonhtmlcommon::add_breadcrumb( + &Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/preferences?action=changedomcoord', text => 'Restrict Domain Coordinator Access'}); $r->print(Apache::loncommon::start_page('Restrict Domain Coordinator Access')); @@ -721,8 +704,7 @@ sub verify_and_change_domcoord { if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; } &Apache::lonnet::put('environment',\%domcoord); &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}}); -# $r->print(&mt('Registering Domain Coordinator access restrictions.')); - print_main_menu($r, &mt('Registering Domain Coordinator access restrictions.')); + &print_main_menu($r,&Apache::lonhtmlcommon::confirm_success(&mt('Registering Domain Coordinator access restrictions.'))); } ################################################################# @@ -1099,6 +1081,7 @@ sub colorschanger { 'tabbg' => 'Header Background', 'sidebg'=> 'Header Border', 'font' => 'Font', + 'fontmenu' => 'Font Menu', 'link' => 'Un-Visited Link', 'vlink' => 'Visited Link', 'alink' => 'Active Link'); @@ -1173,6 +1156,7 @@ sub verify_and_change_colors { 'tabbg' => 'Header Background', 'sidebg'=> 'Header Border', 'font' => 'Font', + 'fontmenu' => 'Font Menu', 'link' => 'Un-Visited Link', 'vlink' => 'Visited Link', 'alink' => 'Active Link'); @@ -1184,24 +1168,18 @@ sub verify_and_change_colors { if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) { &Apache::lonnet::put('environment',{$entry => $color}); &Apache::lonnet::appenv({'environment.'.$entry => $color}); - $message.=&mt('Set '.$colortypes{$item}.' to ').'"'.$color.'".
'; + $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set '.$colortypes{$item}.' to ').'"'.$color.'"').'
'; } else { &Apache::lonnet::del('environment',[$entry]); &Apache::lonnet::delenv('environment.'.$entry); - $message.=&mt('Reset '.$colortypes{$item}.'.').'
'; + $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset '.$colortypes{$item}.'.')).'
'; } } my $now = time; &Apache::lonnet::put('environment',{'color.timestamp' => $now}); &Apache::lonnet::appenv({'environment.color.timestamp' => $now}); - print_main_menu($r, $message); -# $r->print(< -# -# -#ENDVCCOL + &print_main_menu($r, $message); } ###################################################### @@ -1213,7 +1191,7 @@ sub passwordchanger { # Passwords are encrypted using londes.js (DES encryption) $errormessage = ($errormessage || ''); my ($user,$domain,$currentpass,$defdom); - Apache::lonhtmlcommon::add_breadcrumb( + &Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/preferences?action=changepass', text => 'Change Password'}); unless ($caller eq 'reset_by_email') { @@ -1230,7 +1208,9 @@ sub passwordchanger { $defdom = $r->dir_config('lonDefDomain'); my %data = &Apache::lonnet::tmpget($mailtoken); if (keys(%data) == 0) { - $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a new request for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.')); + $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.' + ,'','') + ); return; } if (defined($data{time})) { @@ -1555,21 +1535,19 @@ ENDERROR # Inform the user the password has (not?) been changed my $message; if ($result =~ /^ok$/) { - $message = &mt('The password for [_1] was successfully changed.',$user); + $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for [_1] was successfully changed.',$user)); if ($caller eq 'reset_by_email') { $r->print($message.'
'); } else { &print_main_menu($r, $message); } -# $r->print("

".&mt('The password for [_1] was successfully changed',$user)."

"); } else { # error error: run in circles, scream and shout - $message = &mt("The password for [_1] was not changed.",$user).' '.&mt('Please make sure your old password was entered correctly.'); + $message = &Apache::lonhtmlcommon::confirm_success( + &mt("The password for [_1] was not changed.",$user).' '.&mt('Please make sure your old password was entered correctly.'),1); unless ($caller eq 'reset_by_email') { &print_main_menu($r, $message); } -# $r->print("

".&mt("The password for [_1] was not changed",$user)."

". -# &mt('Please make sure your old password was entered correctly.')); return 1; } return; @@ -1699,19 +1677,16 @@ sub verify_and_change_discussion { if (defined($env{'form.discmark'}) ) { my $newmark = $env{'form.newmark'}; if ($newmark eq 'ondisp') { - $message.=&mt('In discussions: new posts will be cease to be identified as "NEW" after display.').'
'; + $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will be cease to be identified as "NEW" after display.')).'
'; &Apache::lonnet::put('environment',{'discmarkread' => $newmark}); &Apache::lonnet::appenv({'environment.discmarkread' => $newmark}); } else { - $message.=&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.').'
'; + $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.')).'
'; &Apache::lonnet::del('environment',['discmarkread']); &Apache::lonnet::delenv('environment.discmarkread'); } } -# $r->print(< '/adm/preferences?action=changecourseinit', text => 'Change Course Init. Pref.'}); $r->print(Apache::loncommon::start_page('Change Course Initialization Preference')); @@ -1798,11 +1773,7 @@ sub verify_and_change_coursepage { $refpage.'">'.$lt{'dasp'}.''; } } -# $r->print(<
-#ENDVCSCREEN - print_main_menu($r, $message); + &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message)); } sub print_main_menu { @@ -1891,7 +1862,7 @@ my @menu= }, { categorytitle=>'Message Management', items =>[ - { linktext => 'Messages & Notifications', + { linktext => 'Messages & Notifications', url => '/adm/preferences?action=changemsgforward', permission => 'F', #help => 'Prefs_Messages', @@ -1909,7 +1880,7 @@ my @menu= }, { categorytitle=>'Other', items =>[ - { linktext => 'Register Response Devices ("Clickers")', + { linktext => 'Register Response Devices ("Clickers")', url => '/adm/preferences?action=changeclicker', permission => 'F', #help => '', @@ -2075,8 +2046,8 @@ sub handler { }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){ &verify_and_change_coursepage($r); }elsif($env{'form.action'} eq 'debugtoggle'){ - toggle_debug(); - print_main_menu($r); + &toggle_debug(); + &print_main_menu($r); } return OK; @@ -2357,7 +2328,8 @@ sub handler2 { })); } - if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) { + if (($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) + && ($env{'user.domain'} =~/^(msu|gerd)$/)){ push (@Options,({ action => 'debugtoggle', printmenu => 'yes', subroutine => \&toggle_debug,