--- loncom/interface/lonpreferences.pm 2010/02/04 10:42:02 1.183 +++ loncom/interface/lonpreferences.pm 2012/08/16 17:02:55 1.198 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.183 2010/02/04 10:42:02 bisitz Exp $ +# $Id: lonpreferences.pm,v 1.198 2012/08/16 17:02:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -117,7 +117,7 @@ sub wysiwygchanger { 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.")."
"; + $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(<+MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation. +
+$jsMath_start @@ -281,6 +294,7 @@ $jsMath_start if (jsMath.nofonts == 1) { document.writeln($jsMathWarning); } +
@@ -340,16 +354,25 @@ sub rolesprefchanger { my $domain = $env{'user.domain'}; my %userenv = &Apache::lonnet::get ('environment',['recentroles','recentrolesn']); + my $brtext = 'Change '.$role.' Page Pref'; + my $brtitle; + if ($env{'form.returnurl'} eq '/adm/roles') { + $brtext = 'Configure Hotlist'; + } else { + $brtitle = $brtext; + } Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/preferences?action=changerolespref', - text => 'Change '.$role.' Page Pref'}); + text => $brtext}); $r->print(Apache::loncommon::start_page('Content Display Settings')); - $r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref')); + $r->print(Apache::lonhtmlcommon::breadcrumbs($brtitle)); my $hotlist_flag=$userenv{'recentroles'}; my $hotlist_n=$userenv{'recentrolesn'}; - my $checked; + my ($checkedon,$checkedoff); if ($hotlist_flag) { - $checked = 'checked="checked"'; + $checkedon = 'checked="checked"'; + } else { + $checkedoff = 'checked="checked"'; } if (!$hotlist_n) { $hotlist_n=3; } @@ -376,7 +399,7 @@ sub rolesprefchanger { &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). "'.&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.').' -
-'); } @@ -511,7 +557,11 @@ sub verify_and_change_rolespref { } } $message=&Apache::loncommon::confirmwrapper($message); - &print_main_menu($r, $message); + if ($env{'form.returnurl'} eq '/adm/roles') { + return $message; + } else { + &print_main_menu($r, $message); + } } @@ -594,36 +644,50 @@ sub verify_and_change_screenname { sub iconchanger { my $r = shift; &Apache::lonhtmlcommon::add_breadcrumb( - { href => '/adm/preferences?action=changeicons', - text => 'Change Main Menu'}); + { href => '/adm/preferences?action=changeicons', + text => 'Change Menu Display'}); $r->print(Apache::loncommon::start_page('Page Display Settings')); - $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu')); + $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Menu Display')); my $user = $env{'user.name'}; my $domain = $env{'user.domain'}; - my %userenv = &Apache::lonnet::get - ('environment',['icons']); + my %userenv = &Apache::lonnet::get('environment',['icons']); my $iconic='checked="checked"'; - my $classic=''; - my $onlyicon=''; + my ($classic,$onlyicon,$iconic_preview,$iconsonly_preview); if ($userenv{'icons'} eq 'classic') { - $classic='checked="checked"'; - $iconic=''; + $iconic=''; + $classic='