--- loncom/interface/lonpreferences.pm	2009/02/18 19:34:08	1.140
+++ 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.140 2009/02/18 19:34:08 schafran 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
@@ -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'};
@@ -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'};
@@ -332,7 +332,7 @@ sub rolesprefchanger {
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changerolespref',
                 text => 'Change '.$role.' Page Pref'});
-    $r->print(Apache::loncommon::start_page('Change '.$role.' Page Pref'));
+    $r->print(Apache::loncommon::start_page('Content Display Settings'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref'));
     my $hotlist_flag=$userenv{'recentroles'};
     my $hotlist_n=$userenv{'recentrolesn'};
@@ -519,7 +519,7 @@ sub screennamechanger {
     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::loncommon::start_page('Personal Data'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Screen Name'));
     $r->print('<p>'
              .&mt('Change the name that is displayed in your posts.')
@@ -587,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'};
@@ -641,7 +641,7 @@ sub clickerchanger {
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changeclicker',
                 text => 'Register Clicker'});
-    $r->print(Apache::loncommon::start_page('Register Clicker'));
+    $r->print(Apache::loncommon::start_page('Other'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Register Clicker'));
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
@@ -789,7 +789,7 @@ sub msgforwardchanger {
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changemsgforward',
 		text => 'Change Message Forwarding/Notification'});
-    $r->print(Apache::loncommon::start_page('Change Message Forwarding/Notification'));
+    $r->print(Apache::loncommon::start_page('Message Management'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification'));
     my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
     my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
@@ -1089,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();
@@ -1215,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'};
@@ -1552,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;
@@ -1575,7 +1582,7 @@ sub discussionchanger {
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changediscussions',
                 text => 'Change Discussion Preferences'});
-    $r->print(Apache::loncommon::start_page('Change Discussion Preferences'));
+    $r->print(Apache::loncommon::start_page('Message Management'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences'));
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
@@ -1667,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" />
-<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 {
@@ -1738,17 +1738,17 @@ sub coursedisplaychanger {
     }
     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]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>');
+    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>&nbsp;'
              .&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>')
+             .&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);
@@ -1771,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 = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
@@ -1821,7 +1821,7 @@ if (&Apache::lonnet::usertools_access($u
 my @menu=
     ({	categorytitle=>'Personal Data',
 	items =>[
-	    {	linktext => 'Personal Homepage',
+	    {	linktext => 'Personal Information Page',
 		url => $aboutmeurl,
 		permission => $permissions{'aboutme'},
 		#help => 'Prefs_About_Me',
@@ -1984,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));
@@ -2158,7 +2158,7 @@ sub handler2 {
         '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
     push (@Options,{ action => 'none', 
                      linktext =>
-                         q{Edit the Personal Homepage},
+                         q{Edit the Personal Information Page},
 		     help => 'Prefs_About_Me',
                      href => $aboutmeaction});
     push (@Options,({ action => 'changecolors',