--- loncom/interface/lonpreferences.pm 2009/07/09 19:28:36 1.167
+++ loncom/interface/lonpreferences.pm 2009/10/23 15:03:48 1.178
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.167 2009/07/09 19:28:36 droeschl Exp $
+# $Id: lonpreferences.pm,v 1.178 2009/10/23 15:03:48 bisitz 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::lonauthcgi();
use LONCAPA();
#
@@ -205,9 +206,9 @@ sub texenginechanger {
my $r = shift;
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changetexenginepref',
- text => 'Change How Math Equations Are Displayed'});
+ text => 'Math display settings'});
$r->print(Apache::loncommon::start_page('Content Display Settings'));
- $r->print(Apache::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed'));
+ $r->print(Apache::lonhtmlcommon::breadcrumbs('Math display settings'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
my %userenv = &Apache::lonnet::get('environment',['texengine']);
@@ -217,14 +218,15 @@ sub texenginechanger {
'tth' => 'tth (TeX to HTML)',
#'ttm' => 'TeX to MathML',
'jsMath' => 'jsMath',
- 'mimetex' => 'mimetex (Convert to Images)'
+ 'mimetex' => 'mimetex (Convert to Images)',
+ 'raw' => 'Raw (Screen Reader)'
);
my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
%mathchoices);
my $jsMath_start=&Apache::lontexconvert::jsMath_header();
my %lt=&Apache::lonlocal::texthash(
- 'headline' => 'Change Math Preferences',
- 'preftxt' => 'Preferred method to display Math',
+ 'headline' => 'Change how math is displayed',
+ 'preftxt' => 'Preferred method to display math',
'change' => 'Save',
'exmpl' => 'Examples',
'jsmath' => 'jsMath:',
@@ -279,7 +281,7 @@ if (jsMath.nofonts == 1) {
<h3>$lt{'tth'}</h3>
<p>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="220"></iframe>
</p>
ENDLSCREEN
if ($env{'environment.texengine'} ne 'jsMath') {
@@ -777,11 +779,11 @@ sub msgforwardchanger {
all => 'All',
crit => 'Critical only',
reg => 'Non-critical only',
- foad => 'Forwarding Address(es)',
- noti => 'Notification E-mail Address(es)',
+ foad => 'Forward to account(s)',
+ fwdm => 'Forward messages to other account(s) in LON-CAPA',
+ noti => 'E-mail notification of LON-CAPA messages',
foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
- mnot => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
- # old: 'Message Notification Email Address(es)',
+ mnot => 'E-mail address(es) which should be notified about new LON-CAPA messages',
mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
chg => 'Save',
email => 'The e-mail address entered in row ',
@@ -791,9 +793,9 @@ sub msgforwardchanger {
);
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changemsgforward',
- text => 'Change Message Forwarding/Notification'});
- $r->print(Apache::loncommon::start_page('Message Management'));
- $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification'));
+ text => 'Messages & Notifications'});
+ $r->print(Apache::loncommon::start_page('Messages & Notifications'));
+ $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages & Notifications'));
my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message");
@@ -859,11 +861,12 @@ $validatescript
$r->print(<<ENDMSG);
$jscript
$message
-<h3>$lt{'foad'} $forwardingHelp</h3>
+<h3>$lt{'fwdm'} $forwardingHelp</h3>
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_msgforward" />
$lt{'foad'} ($lt{'foad_exmpl'}):
-<input type="text" size="40" value="$msgforward" name="msgforward" /><br />
+<input type="text" size="40" value="$msgforward" name="msgforward" />
+<br /><br />
<h3>$lt{'noti'} $notificationHelp</h3>
$lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
ENDMSG
@@ -908,7 +911,7 @@ ENDMSG
'<input type="radio" name="notify_type_'.$num.
'" value="'.$type.'" '.$chk{$type}.
' onchange="javascript:address_changes('."'$num'".')" />'.
- $lt{$type}.'</label></span> ';
+ $lt{$type}.'</label></span>'.(' ' x4);
}
my $htmlon = '';
my $htmloff = '';
@@ -920,7 +923,7 @@ ENDMSG
$output .= '</td><td><label><input type="radio" name="html_'.$num.
'" value="1" '.$htmlon.
' onchange="javascript:address_changes('."'$num'".')" />'.
- &mt('Yes').'</label> '.
+ &mt('Yes').'</label>'.(' ' x3).
'<label><input type="radio" name="html_'.$num.'" value="0" '.
$htmloff. ' onchange="javascript:address_changes('."'$num'".
')" />'.
@@ -945,10 +948,10 @@ ENDMSG
$output .= '<span class="LC_nobreak"><label>'.
'<input type="radio" name="notify_type_'.$num.
'" value="'.$type.'" '.$defchk{$type}.'/>'.
- $lt{$type}.'</label></span> ';
+ $lt{$type}.'</label></span>'.(' ' x4);
}
$output .= '</td><td><label><input type="radio" name="html_'.$num.
- '" value="1" />'.&mt('Yes').'</label> '.
+ '" value="1" />'.&mt('Yes').'</label>'.(' ' x3).
'<label><input type="radio" name="html_'.$num.'" value="0" '.
' checked="checked" />'.
&mt('No').'</label></td>'.
@@ -1337,6 +1340,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|
@@ -1355,7 +1360,8 @@ sub client_form {
'currentpass' => 'Current Password',
'newpass' => 'New Password',
'confirmpass' => 'Confirm Password',
- 'changepass' => 'Save');
+ 'changepass' => 'Save',
+ );
my $output = '<form name="client">'
.&Apache::lonhtmlcommon::start_pick_box();
@@ -1420,6 +1426,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="" />
|;
}
@@ -1564,7 +1571,7 @@ ENDERROR
# Inform the user the password has (not?) been changed
my $message;
if ($result =~ /^ok$/) {
- $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>'));
+ $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
if ($caller eq 'reset_by_email') {
$r->print($message.'<br />');
} else {
@@ -1572,13 +1579,18 @@ ENDERROR
}
} else {
# error error: run in circles, scream and shout
- $message = &Apache::lonhtmlcommon::confirm_success(
- &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
- unless ($caller eq 'reset_by_email') {
+ 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.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);
}
- return 1;
}
return;
}
@@ -1591,7 +1603,7 @@ sub discussionchanger {
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changediscussions',
text => 'Change Discussion Preferences'});
- $r->print(Apache::loncommon::start_page('Message Management'));
+ $r->print(Apache::loncommon::start_page('Change Discussion Preferences'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
@@ -1606,7 +1618,7 @@ sub discussionchanger {
}
}
if (defined($userenv{'discmarkread'})) {
- unless ($userenv{'discdisplay'} eq '') {
+ unless ($userenv{'discmarkread'} eq '') {
$discmark = $userenv{'discmarkread'};
}
}
@@ -1650,7 +1662,7 @@ sub discussionchanger {
$currmark = $lt{'ondisp'};
$newmark = 'onmark';
}
-
+
$r->print(<<"END");
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_discussion" />
@@ -1699,11 +1711,11 @@ sub verify_and_change_discussion {
if (defined($env{'form.discdisp'}) ) {
my $newdisp = $env{'form.newdisp'};
if ($newdisp eq 'unread') {
- $message .=&mt('In discussions: only new posts will be displayed.').'<br />';
+ $message .=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
&Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
&Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
} else {
- $message .= &mt('In discussions: all posts will be displayed.').'<br />';
+ $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
&Apache::lonnet::del('environment',['discdisplay']);
&Apache::lonnet::delenv('environment.discdisplay');
}
@@ -1886,16 +1898,16 @@ my @menu=
icon => 'sctr.png',
linktitle => 'Configure the roles hotlist.'
},
- { linktext => 'Display of Scientific Equations',
+ { linktext => 'Math display settings',
url => '/adm/preferences?action=changetexenginepref',
permission => 'F',
#help => '',
icon => 'stat.png',
- linktitle => 'Change how Scientific Equations are displayed.'
+ linktitle => 'Change how math is displayed.'
},
]
},
- { categorytitle=>'Message Management',
+ { categorytitle=>'Messages & Notifications',
items =>[
{ linktext => 'Messages & Notifications',
url => '/adm/preferences?action=changemsgforward',
@@ -1942,7 +1954,7 @@ push(@{ $menu[1]->{items} }, {
url => '/adm/remote?url=/adm/preferences&action=launch',
permission => 'F',
#help => '',
- icon => 'network-wireless.png',
+ icon => 'remotecontrol.png',
linktitle => 'Launch the remote control for LON-CAPA.',
});
}else{
@@ -1951,7 +1963,7 @@ push(@{ $menu[1]->{items} }, {
url => '/adm/remote?url=/adm/preferences&action=collapse',
permission => 'F',
#help => '',
- icon => 'network-wireless.png',
+ icon => 'remotecontrol.png',
linktitle => 'Collapse the remote control for LON-CAPA.',
});
}
@@ -1980,9 +1992,9 @@ push(@{ $menu[4]->{items} }, {
});
}
- if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
+ if (&can_toggle_debug()) {
push(@{ $menu[4]->{items} }, {
- linktext => 'Toggle Debug Messages (Current:'.$env{'user.debug'}.')',
+ linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
url => '/adm/preferences?action=debugtoggle',
permission => 'F',
#help => '',
@@ -2081,7 +2093,9 @@ sub handler {
}elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
&verify_and_change_coursepage($r);
}elsif($env{'form.action'} eq 'debugtoggle'){
- &toggle_debug();
+ if (&can_toggle_debug()) {
+ &toggle_debug();
+ }
&print_main_menu($r);
}
@@ -2104,5 +2118,16 @@ sub toggle_debug {
}
}
+sub can_toggle_debug {
+ my $can_toggle = 0;
+ my $page = 'toggledebug';
+ if (&LONCAPA::lonauthcgi::can_view($page)) {
+ $can_toggle = 1;
+ } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
+ $can_toggle = 1;
+ }
+ return $can_toggle;
+}
+
1;
__END__