--- loncom/interface/lonpreferences.pm 2008/12/06 21:13:58 1.130
+++ loncom/interface/lonpreferences.pm 2009/02/23 22:42:33 1.145
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.130 2008/12/06 21:13:58 schafran Exp $
+# $Id: lonpreferences.pm,v 1.145 2009/02/23 22:42:33 schualex Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -126,7 +126,7 @@ $warning
<label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
<label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
ENDLSCREEN
- $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+ $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
}
@@ -172,7 +172,7 @@ sub languagechanger {
<input type="hidden" name="action" value="verify_and_change_languages" />
<br />$pref: $selectionbox
ENDLSCREEN
- $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+ $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
}
@@ -190,9 +190,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);
print_main_menu($r, $message);
# $r->print(<<ENDVCSCREEN);
#$message
@@ -226,7 +227,7 @@ sub texenginechanger {
my %lt=&Apache::lonlocal::texthash(
'headline' => 'Change Math Preferences',
'preftxt' => 'Preferred method to display Math',
- 'change' => 'Change',
+ 'change' => 'Save',
'exmpl' => 'Examples',
'jsmath' => 'jsMath:',
'tth' => 'tth (TeX to HTML):',
@@ -238,8 +239,9 @@ sub texenginechanger {
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_texengine" />
<p>
-$lt{'preftxt'}:<br />
-$selectionbox <input type="submit" value="$lt{'change'}" />
+$lt{'preftxt'}: $selectionbox
+<br />
+<input type="submit" value="$lt{'change'}" />
</p>
</form>
<br />
@@ -305,7 +307,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.');
}
@@ -401,7 +403,7 @@ sub rolesprefchanger {
</p>
'.$roles_check_list.'
<br />
-<input type="submit" value="'.&mt('Change').'" />
+<input type="submit" value="'.&mt('Save').'" />
</form>');
}
@@ -450,7 +452,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) {
@@ -514,27 +516,30 @@ sub screennamechanger {
('environment',['screenname','nickname']);
my $screenname=$userenv{'screenname'};
my $nickname=$userenv{'nickname'};
- my %lt = &Apache::lonlocal::texthash(
- text_screenname => 'New screenname (shown if you post anonymously):',
- text_nickname => 'New nickname (shown if you post non-anonymously):',
- text_submit => 'Change',
- );
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changescreenname',
text => 'Change Screen Name'});
$r->print(Apache::loncommon::start_page('Change Screen Name'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Screen Name'));
- $r->print(<<ENDSCREEN);
-<form name="prefs" action="/adm/preferences" method="post">
-<input type="hidden" name="action" value="verify_and_change_screenname" />
-<br />$lt{'text_screenname'}
-<input type="text" size="20" value="$screenname" name="screenname" />
-<br />$lt{'text_nickname'}
-<input type="text" size="20" value="$nickname" name="nickname" />
-<br />
-<input type="submit" value="$lt{'text_submit'}" />
-</form>
-ENDSCREEN
+ $r->print('<p>'
+ .&mt('Change the name that is displayed in your posts.')
+ .'</p>'
+ );
+ $r->print('<form name="prefs" action="/adm/preferences" method="post">'
+ .'<input type="hidden" name="action" value="verify_and_change_screenname" />'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title(&mt('New screenname (shown if you post anonymously)'))
+ .'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(&mt('New nickname (shown if you post non-anonymously)'))
+ .'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title()
+ .'<input type="submit" value="'.&mt('Save').'" />'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .'</form>'
+ );
}
sub verify_and_change_screenname {
@@ -551,7 +556,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
@@ -564,7 +569,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);
@@ -603,7 +608,7 @@ sub iconchanger {
my $useicons=&mt('Use icons and text');
my $usebuttons=&mt('Use buttons and text');
my $useicononly=&mt('Use icons only');
- my $change=&mt('Change');
+ my $change=&mt('Save');
$r->print(<<ENDSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_icons" />
@@ -696,7 +701,7 @@ sub domcoordchanger {
}
my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
my $construction=&mt('Block access to construction space');
- my $change=&mt('Change');
+ my $change=&mt('Save');
$r->print(<<ENDSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_domcoord" />
@@ -775,11 +780,11 @@ sub msgforwardchanger {
mnot => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
# old: 'Message Notification Email Address(es)',
mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
- chg => 'Change',
+ chg => 'Save',
email => 'The e-mail address entered in row ',
notv => 'is not a valid e-mail address',
toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one",
- prme => 'Back to preferences menu',
+ prme => 'Back',
);
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changemsgforward',
@@ -951,8 +956,8 @@ ENDMSG
$r->print(qq|
<br /><hr />
<input type="hidden" name="numnotify" value="$num" />
-<input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
<input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
+<input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
</form>
|);
@@ -998,7 +1003,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;
@@ -1038,7 +1043,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) {
@@ -1047,7 +1052,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) {
@@ -1057,7 +1062,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 {
@@ -1066,7 +1071,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 />';
@@ -1111,6 +1116,9 @@ sub colorschanger {
}
my $end_data_table = &Apache::loncommon::end_data_table();
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+ my $save = &mt('Save');
+ my $rstall = &mt('Reset All');
+ my $resetdefault = &mt('Reset All Colors to Default');
$r->print(<<ENDCOL);
<script type="text/javascript">
@@ -1149,8 +1157,8 @@ $start_data_table
$chtable
$end_data_table
</table>
-<input type="submit" value="Change Custom Colors" />
-<input type="submit" name="resetall" value="Reset All Colors to Default" />
+<input type="submit" value="$save" />
+<input type="submit" name="resetall" value="$rstall" title="$resetdefault" />
</form>
ENDCOL
}
@@ -1178,7 +1186,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 />';
}
}
@@ -1207,8 +1215,10 @@ sub passwordchanger {
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changepass',
text => 'Change Password'});
- $r->print(Apache::loncommon::start_page('Change Password'));
- $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
+ unless ($caller eq 'reset_by_email') {
+ $r->print(Apache::loncommon::start_page('Change Password'));
+ $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
+ }
if ((!defined($caller)) || ($caller eq 'preferences')) {
$user = $env{'user.name'};
$domain = $env{'user.domain'};
@@ -1334,7 +1344,7 @@ sub client_form {
'currentpass' => 'Current Password',
'newpass' => 'New Password',
'confirmpass' => 'Confirm Password',
- 'changepass' => 'Change Password');
+ 'changepass' => 'Save');
my $output = qq|
<form name="client" >
@@ -1544,14 +1554,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);
- print_main_menu($r, $message);
+ $message = &mt('The password for [_1] was successfully changed.',$user);
+ if ($caller eq 'reset_by_email') {
+ $r->print($message.'<br />');
+ } else {
+ &print_main_menu($r, $message);
+ }
# $r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
} 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.');
- print_main_menu($r, $message);
+ $message = &mt("The password for [_1] was not changed.",$user).' '.&mt('Please make sure your old password was entered correctly.');
+ unless ($caller eq 'reset_by_email') {
+ &print_main_menu($r, $message);
+ }
# $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;
@@ -1597,9 +1612,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',
@@ -1659,15 +1674,8 @@ 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 {
@@ -1684,7 +1692,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'}) ) {
@@ -1696,7 +1704,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);
@@ -1728,14 +1736,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" />
@@ -1743,7 +1758,7 @@ sub coursedisplaychanger {
<label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
<label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label><input type="hidden" name="refpage" value="$env{'form.refpage'}" />
ENDLSCREEN
- $r->print('<br /><br /><input type="submit" value="'.&mt('Change').'" />
+ $r->print('<br /><br /><input type="submit" value="'.&mt('Save').'" />
</form>');
}
@@ -1756,7 +1771,7 @@ 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 listing course action items",
);
my $newdisp = $env{'form.newdisp'};
$message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
@@ -1767,7 +1782,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'})) {
@@ -1799,12 +1814,16 @@ sub print_main_menu {
# build the data structure for menu generation
my $aboutmeurl='/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
+my %permissions;
+if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
+ $permissions{'aboutme'} = 'F';
+}
my @menu=
({ categorytitle=>'Personal Data',
items =>[
- { linktext => 'About Me',
+ { linktext => 'Personal Information Page',
url => $aboutmeurl,
- permission => 'F',
+ permission => $permissions{'aboutme'},
#help => 'Prefs_About_Me',
icon => 'system-users.png',
linktitle => 'Edit information about yourself that should be displayed on your public profile.'
@@ -1883,7 +1902,7 @@ my @menu=
permission => 'F',
#help => 'Change_Discussion_Display',
icon => 'mail-message-new.png',
- linktitle => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.'
+ linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
},
]
},
@@ -2139,7 +2158,7 @@ sub handler2 {
'/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
push (@Options,{ action => 'none',
linktext =>
- q{Edit the 'About Me' Personal Information Screen},
+ q{Edit the Personal Information Page},
help => 'Prefs_About_Me',
href => $aboutmeaction});
push (@Options,({ action => 'changecolors',
@@ -2416,7 +2435,7 @@ sub handler2 {
sub toggle_debug {
if ($env{'user.debug'}) {
- &Apache::lonnet::delenv('user\.debug');
+ &Apache::lonnet::delenv('user.debug');
} else {
&Apache::lonnet::appenv({'user.debug' => 1});
}