--- loncom/interface/lonpreferences.pm 2009/01/15 18:31:11 1.134
+++ loncom/interface/lonpreferences.pm 2009/02/26 16:17:29 1.147
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.134 2009/01/15 18:31:11 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.147 2009/02/26 16:17:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -101,7 +101,7 @@ sub wysiwygchanger {
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changewysiwyg',
text => 'Change WYSIWYG Preferences'});
- $r->print(Apache::loncommon::start_page('Change WYSIWYG Preferences'));
+ $r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change WYSIWYG Preferences'));
my %userenv = &Apache::lonnet::get
@@ -126,7 +126,7 @@ $warning
ENDLSCREEN
- $r->print('
');
+ $r->print('
');
}
@@ -149,7 +149,7 @@ sub languagechanger {
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changelanguages',
text => 'Change Language'});
- $r->print(Apache::loncommon::start_page('Change Language'));
+ $r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
@@ -172,7 +172,7 @@ sub languagechanger {
$pref: $selectionbox
ENDLSCREEN
- $r->print('
');
+ $r->print('
');
}
@@ -190,7 +190,7 @@ sub verify_and_change_languages {
$message=&mt('Set new preferred languages to ').'"'.$newlanguage.'".';
} 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);
@@ -208,7 +208,7 @@ sub texenginechanger {
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changetexenginepref',
text => 'Change How Math Equations Are Displayed'});
- $r->print(Apache::loncommon::start_page('Change How Math Equations Are Displayed'));
+ $r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
@@ -227,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):',
@@ -239,8 +239,9 @@ sub texenginechanger {
'
.&mt('Change the name that is displayed in your posts.')
@@ -555,7 +556,7 @@ sub verify_and_change_screenname {
$message=&mt('Set new screenname to ').'"'.$newscreen.'.".';
} else {
&Apache::lonnet::del('environment',['screenname']);
- &Apache::lonnet::delenv('environment\.screenname');
+ &Apache::lonnet::delenv('environment.screenname');
$message=&mt('Reset screenname.');
}
# Nickname
@@ -568,7 +569,7 @@ sub verify_and_change_screenname {
$message.=&mt('Set new nickname to ').'"'.$newscreen.'".';
} 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);
@@ -586,7 +587,7 @@ sub iconchanger {
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changeicons',
text => 'Change Main Menu'});
- $r->print(Apache::loncommon::start_page('Change Main Menu'));
+ $r->print(Apache::loncommon::start_page('Page Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu'));
my $user = $env{'user.name'};
@@ -607,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(<
-
+
|);
@@ -1002,7 +1003,7 @@ sub verify_and_change_msgforward {
.'
';
} else {
&Apache::lonnet::del('environment',['msgforward']);
- &Apache::lonnet::delenv('environment\.msgforward');
+ &Apache::lonnet::delenv('environment.msgforward');
$message.= &mt("Set message forwarding to 'off'.").'
';
}
my $critnotification;
@@ -1042,7 +1043,7 @@ sub verify_and_change_msgforward {
$message.=&mt('Set non-critical message notification address(es) to ').'"'.$notification.'".
';
} 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'.").'
';
}
if ($critnotification) {
@@ -1051,7 +1052,7 @@ sub verify_and_change_msgforward {
$message.=&mt('Set critical message notification address(es) to ').'"'.$critnotification.'".
';
} else {
&Apache::lonnet::del('environment',['critnotification']);
- &Apache::lonnet::delenv('environment\.critnotification');
+ &Apache::lonnet::delenv('environment.critnotification');
$message.=&mt("Set critical message notification to 'off'.").'
';
}
if ($critnotification || $notification) {
@@ -1061,7 +1062,7 @@ sub verify_and_change_msgforward {
$message.=&mt('Set address(es) to receive excerpts with html retained ').'"'.$notify_with_html.'".';
} 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 {
@@ -1070,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 .= '
';
@@ -1088,7 +1089,7 @@ sub colorschanger {
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changecolors',
text => 'Change Colors'});
- $r->print(Apache::loncommon::start_page('Change Colors'));
+ $r->print(Apache::loncommon::start_page('Page Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Colors'));
# figure out colors
my $function=&Apache::loncommon::get_users_function();
@@ -1115,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(<
';
} else {
&Apache::lonnet::del('environment',[$entry]);
- &Apache::lonnet::delenv('environment\.'.$entry);
+ &Apache::lonnet::delenv('environment.'.$entry);
$message.=&mt('Reset '.$colortypes{$item}.'.').'
';
}
}
@@ -1211,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('Personal Data'));
+ $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
+ }
if ((!defined($caller)) || ($caller eq 'preferences')) {
$user = $env{'user.name'};
$domain = $env{'user.domain'};
@@ -1338,7 +1344,7 @@ sub client_form {
'currentpass' => 'Current Password',
'newpass' => 'New Password',
'confirmpass' => 'Confirm Password',
- 'changepass' => 'Change Password');
+ 'changepass' => 'Save');
my $output = qq|
-END
+
+ $r->print('
'.&mt('Note').': '.$lt{'thde'}.'');
}
sub verify_and_change_discussion {
@@ -1688,7 +1692,7 @@ sub verify_and_change_discussion {
} else {
$message .= &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'}) ) {
@@ -1700,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.').'
';
&Apache::lonnet::del('environment',['discmarkread']);
- &Apache::lonnet::delenv('environment\.discmarkread');
+ &Apache::lonnet::delenv('environment.discmarkread');
}
}
# $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] in the course.",'','')
+ .&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.",'','')
.'
'
);
$r->print(<
ENDLSCREEN
- $r->print('
+ $r->print('
');
}
@@ -1767,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",
);
my $newdisp = $env{'form.newdisp'};
$message = ''.$lt{'defs'}.': '.$lt{'when'}.', ';
@@ -1778,7 +1782,7 @@ sub verify_and_change_coursepage {
} 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'})) {
@@ -1817,7 +1821,7 @@ if (&Apache::lonnet::usertools_access($u
my @menu=
({ categorytitle=>'Personal Data',
items =>[
- { linktext => 'About Me',
+ { linktext => 'Personal Information Page',
url => $aboutmeurl,
permission => $permissions{'aboutme'},
#help => 'Prefs_About_Me',
@@ -1898,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.'
},
]
},
@@ -1980,7 +1984,7 @@ push(@{ $menu[4]->{items} }, {
});
}
- $r->print(&Apache::loncommon::start_page('Change Preferences'));
+ $r->print(&Apache::loncommon::start_page('My Space'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Preferences'));
$r->print($message);
$r->print(Apache::lonhtmlcommon::generate_menu(@menu));
@@ -2154,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',
@@ -2431,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});
}