--- loncom/interface/lonpreferences.pm 2008/05/28 01:45:48 1.122
+++ loncom/interface/lonpreferences.pm 2009/10/09 13:09:01 1.125.2.4
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.122 2008/05/28 01:45:48 www Exp $
+# $Id: lonpreferences.pm,v 1.125.2.4 2009/10/09 13:09:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -108,9 +108,14 @@ sub wysiwygchanger {
}
my $switchoff=&mt('Disable WYSIWYG editor');
my $switchon=&mt('Enable WYSIWYG editor');
+ my $warning='';
+ if ($env{'user.adv'}) {
+ $warning.="<p>".&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.")."</p>";
+ }
$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="set_wysiwyg" />
+$warning
<br />
<label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
<label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
@@ -171,9 +176,10 @@ sub verify_and_change_languages {
$message=&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.';
} else {
&Apache::lonnet::del('environment',['languages']);
- &Apache::lonnet::delenv('environment\.languages');
+ &Apache::lonnet::delenv('environment.languages');
$message=&mt('Reset preferred language.');
}
+ &Apache::loncommon::flush_langs_cache($user,$domain);
$r->print(<<ENDVCSCREEN);
$message
ENDVCSCREEN
@@ -189,35 +195,45 @@ sub texenginechanger {
my %userenv = &Apache::lonnet::get('environment',['texengine']);
my $texengine=$userenv{'texengine'};
- my $pref=&mt('Preferred method to display Math');
my %mathchoices=('' => 'Default',
- 'tth' => 'TeX to HTML',
+ 'tth' => 'tth (TeX to HTML)',
#'ttm' => 'TeX to MathML',
'jsMath' => 'jsMath',
- 'mimetex' => 'Convert to Images'
+ 'mimetex' => 'mimetex (Convert to Images)'
);
my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
%mathchoices);
my $jsMath_start=&Apache::lontexconvert::jsMath_header();
- my $change=&mt('Change');
- $r->print(<<ENDLSCREEN);
-<br />
+ my %lt=&Apache::lonlocal::texthash(
+ 'headline' => 'Change Math Preferences',
+ 'preftxt' => 'Preferred method to display Math',
+ 'change' => 'Change',
+ 'exmpl' => 'Examples',
+ 'jsmath' => 'jsMath:',
+ 'tth' => 'tth (TeX to HTML):',
+ 'mimetex' => 'mimetex (Convert to Images):',
+ );
+ $r->print(<<ENDLSCREEN);
+<h2>$lt{'headline'}</h2>
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_texengine" />
-<p>$pref: $selectionbox</p>
-<p><input type="submit" value="$change" /></p>
-</form>
-Examples:
-<p> TeX to HTML <br />
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
+<p>
+$lt{'preftxt'}:<br />
+$selectionbox <input type="submit" value="$lt{'change'}" />
</p>
-<p>jsMath <br />
+</form>
+<br />
+<hr />
+$lt{'exmpl'}
+
+<h3>$lt{'jsmath'}</h3>
+<p>
$jsMath_start
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
if (jsMath.nofonts == 1) {
document.writeln
- ('<center><div style="padding: 10; border-style: solid; border-width:3;'
+ ('<div style="padding: 10; border-style: solid; border-width:3;'
+' border-color: #DD0000; background-color: #FFF8F8; width: 75%; text-align: left">'
+'<small><font color="#AA0000"><b>Warning:</b> '
+'It looks like you don\\\'t have the TeX math fonts installed. '
@@ -227,19 +243,24 @@ if (jsMath.nofonts == 1) {
+'needed fonts. In the meantime, jsMath will do the best it can '
+'with the fonts you have, but it may not be pretty and some equations '
+'may not be rendered correctly. '
- +'</font></small></div></center>');
+ +'</font></small></div>');
}
</script>
<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
-
</p>
-<p> Convert to Images <br />
-<br />
+
+<h3>$lt{'mimetex'}</h3>
+<p>
<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>
</p>
+
+<h3>$lt{'tth'}</h3>
+<p>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
+</p>
ENDLSCREEN
if ($env{'environment.texengine'} ne 'jsMath') {
- $r->print('<script type="text/javascript">jsMath.Process()</script>');
+ $r->print('<script type="text/javascript" language="JavaScript">jsMath.Process()</script>');
}
}
@@ -265,7 +286,7 @@ sub verify_and_change_texengine {
$message=&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.';
} else {
&Apache::lonnet::del('environment',['texengine']);
- &Apache::lonnet::delenv('environment\.texengine');
+ &Apache::lonnet::delenv('environment.texengine');
$message=&mt('Reset preferred math display.');
}
@@ -404,7 +425,7 @@ sub verify_and_change_rolespref {
$message=&mt('Recent '.$role.'s Hotlist is Enabled');
} else {
&Apache::lonnet::del('environment',['recentroles']);
- &Apache::lonnet::delenv('environment\.recentroles');
+ &Apache::lonnet::delenv('environment.recentroles');
$message=&mt('Recent '.$role.'s Hotlist is Disabled');
}
if ($hotlist_n) {
@@ -499,7 +520,7 @@ sub verify_and_change_screenname {
$message=&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.';
} else {
&Apache::lonnet::del('environment',['screenname']);
- &Apache::lonnet::delenv('environment\.screenname');
+ &Apache::lonnet::delenv('environment.screenname');
$message=&mt('Reset screenname.');
}
# Nickname
@@ -512,7 +533,7 @@ sub verify_and_change_screenname {
$message.=&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.';
} else {
&Apache::lonnet::del('environment',['nickname']);
- &Apache::lonnet::delenv('environment\.nickname');
+ &Apache::lonnet::delenv('environment.nickname');
$message.=&mt('Reset nickname.');
}
&Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
@@ -715,7 +736,7 @@ sub msgforwardchanger {
my %allnot = &get_notifications(\%userenv);
my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();
my $jscript = qq|
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
function validate() {
for (var i=0; i<document.prefs.numnotify.value; i++) {
var checkaddress = 0;
@@ -920,7 +941,7 @@ sub verify_and_change_msgforward {
.'<br />';
} else {
&Apache::lonnet::del('environment',['msgforward']);
- &Apache::lonnet::delenv('environment\.msgforward');
+ &Apache::lonnet::delenv('environment.msgforward');
$message.= &mt("Set message forwarding to 'off'.").'<br />';
}
my $critnotification;
@@ -960,7 +981,7 @@ sub verify_and_change_msgforward {
$message.=&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />';
} else {
&Apache::lonnet::del('environment',['notification']);
- &Apache::lonnet::delenv('environment\.notification');
+ &Apache::lonnet::delenv('environment.notification');
$message.=&mt("Set non-critical message notification to 'off'.").'<br />';
}
if ($critnotification) {
@@ -969,7 +990,7 @@ sub verify_and_change_msgforward {
$message.=&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />';
} else {
&Apache::lonnet::del('environment',['critnotification']);
- &Apache::lonnet::delenv('environment\.critnotification');
+ &Apache::lonnet::delenv('environment.critnotification');
$message.=&mt("Set critical message notification to 'off'.").'<br />';
}
if ($critnotification || $notification) {
@@ -979,7 +1000,7 @@ sub verify_and_change_msgforward {
$message.=&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.';
} else {
&Apache::lonnet::del('environment',['notifywithhtml']);
- &Apache::lonnet::delenv('environment\.notifywithhtml');
+ &Apache::lonnet::delenv('environment.notifywithhtml');
if ($totaladdresses == 1) {
$message.=&mt("Set notification address to receive excerpts with html stripped.");
} else {
@@ -988,7 +1009,7 @@ sub verify_and_change_msgforward {
}
} else {
&Apache::lonnet::del('environment',['notifywithhtml']);
- &Apache::lonnet::delenv('environment\.notifywithhtml');
+ &Apache::lonnet::delenv('environment.notifywithhtml');
}
if ($message) {
$message .= '<br /><hr />';
@@ -1095,7 +1116,7 @@ sub verify_and_change_colors {
$message.=&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>.<br />';
} else {
&Apache::lonnet::del('environment',[$entry]);
- &Apache::lonnet::delenv('environment\.'.$entry);
+ &Apache::lonnet::delenv('environment.'.$entry);
$message.=&mt('Reset '.$colortypes{$item}.'.').'<br />';
}
}
@@ -1199,7 +1220,7 @@ ENDFORM
sub jscript_send {
my ($caller) = @_;
my $output = qq|
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
function send() {
uextkey=this.document.client.elements.ukey_cpass.value;
@@ -1227,6 +1248,8 @@ sub jscript_send {
this.document.client.elements.uname.value;
this.document.pserver.elements.udom.value =
this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
+ this.document.pserver.elements.email.value =
+ this.document.client.elements.email.value;
|;
}
$ output .= qq|
@@ -1311,6 +1334,7 @@ sub server_form {
<input type="hidden" name="token" value="$mailtoken" />
<input type="hidden" name="uname" value="" />
<input type="hidden" name="udom" value="" />
+<input type="hidden" name="email" value="" />
|;
}
@@ -1457,9 +1481,16 @@ ENDERROR
$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
} else {
# error error: run in circles, scream and shout
- $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
- &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 {
+ $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
+ &mt('Please make sure your old password was entered correctly.'));
+ }
}
return;
}
@@ -1559,15 +1590,7 @@ END
END
$r->print(&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table());
- $r->print(<<"END");
-<br />
-<br />
-<input type="submit" name="sub" value="Save Changes" />
-<br />
-<br />
-Note: $lt{'thde'}
-</form>
-END
+ $r->print('<br /><br /><input type="submit" name="sub" value="'.&mt('Save').'" /><br /><br />'.&mt('Note').': '.$lt{'thde'}.'</form>');
}
sub verify_and_change_discussion {
@@ -1584,7 +1607,7 @@ sub verify_and_change_discussion {
} else {
$message .= &mt('In discussions: all posts will be displayed.').'<br />';
&Apache::lonnet::del('environment',['discdisplay']);
- &Apache::lonnet::delenv('environment\.discdisplay');
+ &Apache::lonnet::delenv('environment.discdisplay');
}
}
if (defined($env{'form.discmark'}) ) {
@@ -1596,7 +1619,7 @@ sub verify_and_change_discussion {
} else {
$message.=&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.').'<br />';
&Apache::lonnet::del('environment',['discmarkread']);
- &Apache::lonnet::delenv('environment\.discmarkread');
+ &Apache::lonnet::delenv('environment.discmarkread');
}
}
$r->print(<<ENDVCSCREEN);
@@ -1622,14 +1645,21 @@ sub coursedisplaychanger {
$whatsnewselect = '';
}
}
- my %pagenames = (
+ my %pagenames = &Apache::lonlocal::texthash(
firstres => 'First resource',
- whatsnew => "What's new page",
+ whatsnew => "What's New Page",
);
- my $whatsnew_off=&mt('Display the [_1] in the course.','<b>first resource</b>');
- my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</b>");
+ my $whatsnew_off=&mt('Display the [_1]first resource[_2] in the course.','<b>','</b>');
+ my $whatsnew_on=&mt("Display the [_1]What's New Page[_2] - a summary of items in the course which require attention.",'<b>','</b>');
- $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b> '.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&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',"<i>What's New</i>").'<br /><br />');
+ $r->print('<br /><b>'
+ .&mt('Set the default page to be displayed when you select a course role')
+ .'</b> '
+ .&mt('(Currently: [_1])',$pagenames{$currvalue})
+ .'<br />'
+ .&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] in the course.",'<i>','</i>')
+ .'<br /><br />'
+ );
$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_coursepage" />
@@ -1661,7 +1691,7 @@ sub verify_and_change_coursepage {
} else {
$message .= $lt{'apwb'}.'<br />';
&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'})) {
@@ -1762,13 +1792,14 @@ sub handler {
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 =>
+ q{Edit the 'About Me' Personal Information Screen},
+ help => 'Prefs_About_Me',
+ href => $aboutmeaction});
+ }
push (@Options,({ action => 'changecolors',
linktext => 'Change Color Scheme',
href => '/adm/preferences',
@@ -1909,7 +1940,8 @@ sub handler {
text => 'Register Clicker'},
printmenu => 'yes',
}));
- if ($env{'user.adv'}) {
+ 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',
@@ -2042,7 +2074,7 @@ 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});
}