--- loncom/interface/lonpreferences.pm 2007/04/17 18:28:44 1.99 +++ loncom/interface/lonpreferences.pm 2009/10/08 21:15:19 1.125.4.6 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.99 2007/04/17 18:28:44 www Exp $ +# $Id: lonpreferences.pm,v 1.125.4.6 2009/10/08 21:15:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -108,14 +108,19 @@ sub wysiwygchanger { } my $switchoff=&mt('Disable WYSIWYG editor'); my $switchon=&mt('Enable WYSIWYG editor'); + my $warning=''; + if ($env{'user.adv'}) { + $warning.="
".&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."
"; + } $r->print(<'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'
'); + &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting}); + my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&mt('WYSIWYG Editor').'',''.&mt($newsetting).'')); + $message=&Apache::loncommon::confirmwrapper($message); + $r->print(<' + .'
TeX to HTML
-
+
+$lt{'preftxt'}: $selectionbox
+
+
jsMath
+
+
+
$jsMath_start - + +
++
- Convert to Images
-
-
+
+
+
ENDLSCREEN if ($env{'environment.texengine'} ne 'jsMath') { @@ -252,24 +284,23 @@ 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=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&mt('Preferred method to display Math').'','"'.$newtexengine.'"')); } else { &Apache::lonnet::del('environment',['texengine']); - &Apache::lonnet::delenv('environment\.texengine'); - $message='Reset preferred math display.'; + &Apache::lonnet::delenv('environment.texengine'); + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]',''.&mt('Preferred method to display Math').'')); } - - + $message=&Apache::loncommon::confirmwrapper($message); $r->print(<'.&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.').'
-'); } @@ -400,16 +431,16 @@ sub verify_and_change_rolespref { my $message='' + .&mt('Change the name that is displayed in your posts.') + .'
' + ); + $r->print('' + ); } sub verify_and_change_screenname { @@ -489,12 +529,12 @@ sub verify_and_change_screenname { my $message=''; if ($newscreen) { &Apache::lonnet::put('environment',{'screenname' => $newscreen}); - &Apache::lonnet::appenv('environment.screenname' => $newscreen); - $message='Set new screenname to '.$newscreen; + &Apache::lonnet::appenv({'environment.screenname' => $newscreen}); + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&mt('Screenname').'','"'.$newscreen.'"')); } else { &Apache::lonnet::del('environment',['screenname']); - &Apache::lonnet::delenv('environment\.screenname'); - $message='Reset screenname'; + &Apache::lonnet::delenv('environment.screenname'); + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]',''.&mt('Screenname').'')); } # Nickname $message.='@@ -1092,13 +1517,27 @@ ENDERROR my $result = &Apache::lonnet::changepass ($user,$domain,$currentpass,$newpass1,$homeserver,$caller); # Inform the user the password has (not?) been changed + my $message; if ($result =~ /^ok$/) { - $r->print("".&mt('The password for [_1] was successfully changed',$user)."
"); + $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.',''.$user.'')); + if ($caller eq 'reset_by_email') { + $r->print($message.'
'); + } else { + $r->print(&Apache::loncommon::confirmwrapper($message)); + } } else { # error error: run in circles, scream and shout - $r->print("".&mt("The password for [_1] was not changed",$user)."
". - &mt('Please make sure your old password was entered correctly').'.'); - return 1; + if ($caller eq 'reset_by_email') { + if (!$result) { + return 1; + } else { + return $result; + } + } else { + $message = &Apache::lonhtmlcommon::confirm_success( + &mt("The password for user [_1] was not changed.",''.$user.'').' '.&mt('Please make sure your old password was entered correctly.'),1); + $r->print(&Apache::loncommon::confirmwrapper($message)); + } } return; } @@ -1121,7 +1560,7 @@ sub discussionchanger { } } if (defined($userenv{'discmarkread'})) { - unless ($userenv{'discdisplay'} eq '') { + unless ($userenv{'discmarkread'} eq '') { $discmark = $userenv{'discmarkread'}; } } @@ -1136,9 +1575,9 @@ sub discussionchanger { 'pref' => 'Display Preference', 'curr' => 'Current setting ', 'actn' => 'Action', - 'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.', + 'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.', 'prca' => 'Preferences can be set that determine', - 'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and', + 'whpo' => 'Which posts are displayed when you display a discussion board or resource, and', 'unwh' => 'Under what circumstances posts are identfied as "New"', 'allposts' => 'All posts', 'unread' => 'New posts only', @@ -1147,7 +1586,7 @@ sub discussionchanger { 'disa' => 'Posts displayed?', 'npmr' => 'New posts cease to be identified as "New"?', 'thde' => 'The preferences you set here can be overridden within each individual discussion.', - 'chgt' => 'Change to ' + 'chgt' => 'Change to ', ); my $dispchange = $lt{'unread'}; my $markchange = $lt{'ondisp'}; @@ -1171,9 +1610,9 @@ sub discussionchanger {
$lt{'sdpf'}
$lt{'prca'}-
- $lt{'whpo'}
- $lt{'unwh'}
-
END + $r->print(''.$lt{'thde'}.'
'); + $r->print(&Apache::loncommon::start_data_table()); $r->print(<<"END");@@ -1198,15 +1637,9 @@ END END $r->print(&Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table()); - $r->print(<<"END"); -
-
- -
-
-Note: $lt{'thde'} - -END + $r->print('
'. + ''. + ''); } sub verify_and_change_discussion { @@ -1217,27 +1650,28 @@ sub verify_and_change_discussion { if (defined($env{'form.discdisp'}) ) { my $newdisp = $env{'form.newdisp'}; if ($newdisp eq 'unread') { - $message .='In discussions: only new posts will be displayed.
'; + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'
'; &Apache::lonnet::put('environment',{'discdisplay' => $newdisp}); - &Apache::lonnet::appenv('environment.discdisplay' => $newdisp); + &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp}); } else { - $message .= 'In discussions: all posts will be displayed.
'; + $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'
'; &Apache::lonnet::del('environment',['discdisplay']); - &Apache::lonnet::delenv('environment\.discdisplay'); + &Apache::lonnet::delenv('environment.discdisplay'); } } if (defined($env{'form.discmark'}) ) { my $newmark = $env{'form.newmark'}; if ($newmark eq 'ondisp') { - $message.='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); + &Apache::lonnet::appenv({'environment.discmarkread' => $newmark}); } else { - $message.='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'); + &Apache::lonnet::delenv('environment.discmarkread'); } } + $message=&Apache::loncommon::confirmwrapper($message); $r->print(<'First resource', - whatsnew => "What's new page", + whatsnew => "What's New Page", ); - my $whatsnew_off=&mt('Display the [_1] in the course.','first resource'); - my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"What's New"); + my $whatsnew_off=&mt('Display the [_1]first resource[_2] in the course.','',''); + my $whatsnew_on=&mt("Display the [_1]What's New Page[_2] - a summary of items in the course which require attention.",'',''); - $r->print('
'.&mt('Set the default page to be displayed when you select a course role').' '.&mt('(Currently: [_1])',$pagenames{$currvalue}).'
'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"What's New").'
'); + $r->print('
'. + &mt('Set the default page to be displayed when you select a course role'). + ' '. + &mt('(Currently: [_1])',$pagenames{$currvalue}).'
'. + &mt("The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the [_1]What's New Page[_2] page in the course.",'',''). + '
'); $r->print(<@@ -1276,7 +1715,7 @@ sub coursedisplaychanger {
ENDLSCREEN - $r->print('
+ $r->print('
'); } @@ -1289,18 +1728,18 @@ sub verify_and_change_coursepage { 'ywbt' => 'you will be taken to the start of the course.', 'apwb' => 'a page will be displayed that lists items in the course that may require action from you.', 'gtts' => 'Go to the start of the course', - 'dasp' => "Display the What's New page listing course action items", + 'dasp' => "Display the What's New Page", ); my $newdisp = $env{'form.newdisp'}; $message = ''.$lt{'defs'}.': '.$lt{'when'}.', '; if ($newdisp eq 'firstres') { $message .= $lt{'ywbt'}.'
'; &Apache::lonnet::put('environment',{'course_init_display' => $newdisp}); - &Apache::lonnet::appenv('environment.course_init_display' => $newdisp); + &Apache::lonnet::appenv({'environment.course_init_display' => $newdisp}); } else { $message .= $lt{'apwb'}.'
'; &Apache::lonnet::del('environment',['course_init_display']); - &Apache::lonnet::delenv('environment\.course_init_display'); + &Apache::lonnet::delenv('environment.course_init_display'); } my $refpage = $env{'form.refpage'}; if (($env{'request.course.fn'}) && ($env{'request.course.id'})) { @@ -1315,9 +1754,9 @@ sub verify_and_change_coursepage { $refpage.'">'.$lt{'dasp'}.''; } } + $message = &Apache::lonhtmlcommon::confirm_success($message); $r->print(<
ENDVCSCREEN } @@ -1386,27 +1825,28 @@ sub handler { })); push (@Options,({ action => 'changemsgforward', - linktext => 'Change Message Forwarding and Notification Email Addresses', + linktext => 'Messages & Notifications', href => '/adm/preferences', - help => 'Prefs_Forwarding', + help => 'Prefs_Messages', breadcrumb => { href => '/adm/preferences?action=changemsgforward', - text => 'Change Message Forwarding'}, + text => 'Change Message Forwarding/Notification'}, subroutine => \&msgforwardchanger, }, { action => 'verify_and_change_msgforward', + help => 'Prefs_Messages', breadcrumb => { href => '/adm/preferences?action=changemsgforward', - text => 'Change Message Forwarding'}, - printmenu => 'yes', + text => 'Change Message Forwarding/Notification'}, + printmenu => 'no', subroutine => \&verify_and_change_msgforward })); - my $aboutmeaction= - '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme'; - push (@Options,{ action => 'none', - linktext => - q{Edit the 'About Me' Personal Information Screen}, - help => 'Prefs_About_Me', - href => $aboutmeaction}); + if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) { + my $aboutmeaction = '/adm/'.$domain.'/'.$user.'/aboutme'; + push (@Options,{ action => 'none', + linktext =>"Edit the Personal Information Page", + help => 'Prefs_About_Me', + href => $aboutmeaction}); + } push (@Options,({ action => 'changecolors', linktext => 'Change Color Scheme', href => '/adm/preferences', @@ -1517,7 +1957,7 @@ sub handler { } push (@Options,({ action => 'changeicons', - linktext => 'Change How Main Menu is Displayed', + linktext => 'Change How Menus are Displayed', href => '/adm/preferences', subroutine => \&iconchanger, breadcrumb => @@ -1532,6 +1972,55 @@ sub handler { printmenu => 'yes', })); + push (@Options,({ action => 'changeclicker', + linktext => 'Register Response Devices ("Clickers")', + href => '/adm/preferences', + subroutine => \&clickerchanger, + breadcrumb => + { href => '/adm/preferences?action=changeclicker', + text => 'Register Clicker'}, + }, + { action => 'verify_and_change_clicker', + subroutine => \&verify_and_change_clicker, + breadcrumb => + { href => '/adm/preferences?action=changeclicker', + text => 'Register Clicker'}, + printmenu => 'yes', + })); + my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']); + if (keys(%author_roles) > 0) { + push (@Options,({ action => 'changedomcoord', + linktext => 'Restrict Domain Coordinator Access', + href => '/adm/preferences', + subroutine => \&domcoordchanger, + breadcrumb => + { href => '/adm/preferences?action=changedomcoord', + text => 'Restrict Domain Coordinator Access'}, + }, + { action => 'verify_and_change_domcoord', + subroutine => \&verify_and_change_domcoord, + breadcrumb => + { href => '/adm/preferences?action=changedomcoord', + text => 'Restrict Domain Coordinator Access'}, + printmenu => 'yes', + })); + } + + push (@Options,({ action => 'lockwarning', + subroutine => \&lockwarning, + breadcrumb => + { href => '/adm/preferences?action=lockwarning', + text => 'Lock Warnings'}, + }, + { action => 'verify_and_change_locks', + subroutine => \&verify_and_change_lockwarning, + breadcrumb => + { href => '/adm/preferences?action=lockwarning', + text => 'Lockwarnings'}, + printmenu => 'yes', + })); + + if (&Apache::lonnet::allowed('whn',$env{'request.course.id'}) || &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/' .$env{'request.course.sec'})) { @@ -1551,7 +2040,7 @@ sub handler { })); } - if ($env{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle|raeburn)$/) { + if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) { push (@Options,({ action => 'debugtoggle', printmenu => 'yes', subroutine => \&toggle_debug, @@ -1632,9 +2121,9 @@ sub handler { sub toggle_debug { if ($env{'user.debug'}) { - &Apache::lonnet::delenv('user\.debug'); + &Apache::lonnet::delenv('user.debug'); } else { - &Apache::lonnet::appenv('user.debug' => 1); + &Apache::lonnet::appenv({'user.debug' => 1}); } }