--- loncom/interface/lonpreferences.pm	2009/02/10 09:30:16	1.135
+++ loncom/interface/lonpreferences.pm	2009/05/05 11:40:51	1.157
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.135 2009/02/10 09:30:16 schafran Exp $
+# $Id: lonpreferences.pm,v 1.157 2009/05/05 11:40:51 bisitz 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
 <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').'" />');
 }
 
 
@@ -135,9 +135,8 @@ sub verify_and_change_wysiwyg {
     my $newsetting=$env{'form.wysiwyg'};
     &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
     &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
-#   $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');
-    print_main_menu($r,'<p>'.&mt('Setting WYSIWYG editor to:').' '
-			.&mt($newsetting).'</p>');
+    &print_main_menu($r,'<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Setting WYSIWYG editor to:').' '
+			.&mt($newsetting)).'</p>');
 }
 
 ################################################################
@@ -149,7 +148,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 +171,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').'" />');
 }
 
 
@@ -187,17 +186,14 @@ sub verify_and_change_languages {
     if ($newlanguage) {
         &Apache::lonnet::put('environment',{'languages' => $newlanguage});
         &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
-        $message=&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.';
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.');
     } else {
         &Apache::lonnet::del('environment',['languages']);
-        &Apache::lonnet::delenv('environment\.languages');
-        $message=&mt('Reset preferred language.');
+        &Apache::lonnet::delenv('environment.languages');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred language.'));
     }
     &Apache::loncommon::flush_langs_cache($user,$domain);
-    print_main_menu($r, $message);
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -208,7 +204,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 +223,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 +235,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 />
@@ -250,7 +247,7 @@ $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
         ('<div style="padding: 10; border-style: solid; border-width:3;'
@@ -280,7 +277,7 @@ if (jsMath.nofonts == 1) {
 </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>');
     }
 }
 
@@ -303,18 +300,13 @@ sub verify_and_change_texengine {
     if ($newtexengine) {
         &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
         &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
-        $message=&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.';
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.');
     } else {
         &Apache::lonnet::del('environment',['texengine']);
-        &Apache::lonnet::delenv('environment\.texengine');
-        $message=&mt('Reset preferred math display.');
+        &Apache::lonnet::delenv('environment.texengine');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred math display.'));
     }
-
-
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -331,7 +323,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'};
@@ -402,7 +394,7 @@ sub rolesprefchanger {
 </p>
 '.$roles_check_list.'
 <br />
-<input type="submit" value="'.&mt('Change').'" />
+<input type="submit" value="'.&mt('Save').'" />
 </form>');
 }
 
@@ -451,7 +443,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) {
@@ -481,7 +473,7 @@ sub verify_and_change_rolespref {
 # Unset any roles that were previously frozen but aren't in list
     foreach my $role_key (sort(keys(%recent_roles))) {
         if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
-	    $message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";
+	    $message .= "<br />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key}))."\n";
 	    &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
         }
     }
@@ -489,17 +481,14 @@ sub verify_and_change_rolespref {
 # Freeze selected roles
     foreach my $role_key (@freeze_list) {
         if (!$frozen_roles{$role_key}) {
-             $message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";
+             $message .= "<br />".
+             &Apache::lonhtmlcommon::confirm_success(&mt('Freezing '.$role.': [_1]',$role_text{$role_key}))."\n";
              &Apache::lonhtmlcommon::store_recent('roles',
                                           $role_key,' ',1);
         }
     }
     $message .= "<hr /><br />\n";
-
-#    $r->print(<<ENDRPSCREEN);
-#$message
-#ENDRPSCREEN
-    print_main_menu($r, $message);
+    &print_main_menu($r, $message);
 }
 
 
@@ -518,7 +507,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.')
@@ -552,11 +541,11 @@ sub verify_and_change_screenname {
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'screenname' => $newscreen});
         &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
-        $message=&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.';
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.');
     } else {
         &Apache::lonnet::del('environment',['screenname']);
-        &Apache::lonnet::delenv('environment\.screenname');
-        $message=&mt('Reset screenname.');
+        &Apache::lonnet::delenv('environment.screenname');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset screenname.'));
     }
 # Nickname
     $message.='<br />';
@@ -565,17 +554,14 @@ sub verify_and_change_screenname {
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'nickname' => $newscreen});
         &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
-        $message.=&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.');
     } else {
         &Apache::lonnet::del('environment',['nickname']);
-        &Apache::lonnet::delenv('environment\.nickname');
-        $message.=&mt('Reset nickname.');
+        &Apache::lonnet::delenv('environment.nickname');
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset nickname.'));
     }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -583,10 +569,10 @@ sub verify_and_change_screenname {
 ################################################################
 sub iconchanger {
     my $r = shift;
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &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 +593,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" />
@@ -627,8 +613,7 @@ sub verify_and_change_icons {
 
     &Apache::lonnet::put('environment',{'icons' => $newicons});
     &Apache::lonnet::appenv({'environment.icons' => $newicons});
-#    $r->print(&mt('Set menu mode to [_1].',$newicons));
-    print_main_menu($r, &mt('Set menu mode to [_1].',$newicons));
+    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Set menu mode to [_1].',$newicons)));
 }
 
 ################################################################
@@ -637,10 +622,10 @@ sub verify_and_change_icons {
 
 sub clickerchanger {
     my $r = shift;
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &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'};
@@ -649,14 +634,15 @@ sub clickerchanger {
     my $clickers=$userenv{'clickers'};
     $clickers=~s/\,/\n/gs;
     my $text=&mt('Enter response device ("clicker") numbers');
-    my $change=&mt('Register');
+    my $change=&mt('Save');
     my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration',&mt('Locating your clicker ID'));
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_clicker" />
-<label>$text $helplink<br />
+<label>$helplink<br /><br />$text<br />
 <textarea name="clickers" rows="5" cols="20">$clickers</textarea>
 </label>
+<br />
 <input type="submit" value="$change" />
 </form>
 ENDSCREEN
@@ -675,8 +661,7 @@ sub verify_and_change_clicker {
     $newclickers=~s/\,$//;
     &Apache::lonnet::put('environment',{'clickers' => $newclickers});
     &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
-#    $r->print(&mt('Registering clickers: [_1]',$newclickers));
-    print_main_menu($r, &mt('Registering clickers: [_1]',$newclickers));
+    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers)));
 }
 
 ################################################################
@@ -685,7 +670,7 @@ sub verify_and_change_clicker {
 
 sub domcoordchanger {
     my $r = shift;
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changedomcoord',
                 text => 'Restrict Domain Coordinator Access'});
     $r->print(Apache::loncommon::start_page('Restrict Domain Coordinator Access'));
@@ -700,7 +685,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" />
@@ -719,8 +704,7 @@ sub verify_and_change_domcoord {
     if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
     &Apache::lonnet::put('environment',\%domcoord);
     &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
-#    $r->print(&mt('Registering Domain Coordinator access restrictions.'));
-    print_main_menu($r, &mt('Registering Domain Coordinator access restrictions.'));
+    &print_main_menu($r,&Apache::lonhtmlcommon::confirm_success(&mt('Registering Domain Coordinator access restrictions.')));
 }
 
 #################################################################
@@ -779,16 +763,16 @@ 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',
 		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");
@@ -797,7 +781,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;
@@ -955,8 +939,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>
 |);
 
@@ -1002,7 +986,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;
@@ -1042,7 +1026,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) {
@@ -1051,7 +1035,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) {
@@ -1061,7 +1045,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 {
@@ -1070,7 +1054,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 />';
@@ -1088,18 +1072,21 @@ 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();
     my $domain=&Apache::loncommon::determinedomain();
-    my %colortypes=('pgbg'  => 'Page Background',
-                    'tabbg' => 'Header Background',
-                    'sidebg'=> 'Header Border',
-                    'font'  => 'Font',
-                    'link'  => 'Un-Visited Link',
-                    'vlink' => 'Visited Link',
-                    'alink' => 'Active Link');
+    my %colortypes=&Apache::lonlocal::texthash(
+        'pgbg'     => 'Page Background Color',
+        'tabbg'    => 'Header Background Color',
+        'sidebg'   => 'Header Border Color',
+        'font'     => 'Font Color',
+        'fontmenu' => 'Font Menu Color',
+        'link'     => 'Un-Visited Link Color',
+        'vlink'    => 'Visited Link Color',
+        'alink'    => 'Active Link Color',
+    );
     my $start_data_table = &Apache::loncommon::start_data_table();
     my $chtable='';
     foreach my $item (sort(keys(%colortypes))) {
@@ -1110,13 +1097,16 @@ sub colorschanger {
         '" size="10" value="'.$curcol.
 '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
 "','".$curcol."','"
-	    .$item."','parmform.pres','psub'".');">Select</a></td>'.
+	    .$item."','parmform.pres','psub'".');">'.&mt('Select').'</a></td>'.
 	    &Apache::loncommon::end_data_table_row()."\n";
     }
     my $end_data_table = &Apache::loncommon::end_data_table();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+    my $savebutton = &mt('Save');
+    my $resetbutton = &mt('Reset All');
+    my $resetbuttondesc = &mt('Reset All Colors to Default');
     $r->print(<<ENDCOL);
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -1153,8 +1143,10 @@ $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" />
+<p>
+<input type="submit" value="$savebutton" />
+<input type="submit" name="resetall" value="$resetbutton" title="$resetbuttondesc" />
+</p>
 </form>
 ENDCOL
 }
@@ -1164,13 +1156,16 @@ sub verify_and_change_colors {
 # figure out colors
     my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
-    my %colortypes=('pgbg'  => 'Page Background',
-                    'tabbg' => 'Header Background',
-                    'sidebg'=> 'Header Border',
-                    'font'  => 'Font',
-                    'link'  => 'Un-Visited Link',
-                    'vlink' => 'Visited Link',
-                    'alink' => 'Active Link');
+    my %colortypes=&Apache::lonlocal::texthash(
+        'pgbg'     => 'Page Background Color',
+        'tabbg'    => 'Header Background Color',
+        'sidebg'   => 'Header Border Color',
+        'font'     => 'Font Color',
+	'fontmenu' => 'Font Menu Color',
+        'link'     => 'Un-Visited Link Color',
+        'vlink'    => 'Visited Link Color',
+        'alink'    => 'Active Link Color',
+    );
 
     my $message='';
     foreach my $item (keys %colortypes) {
@@ -1179,24 +1174,21 @@ sub verify_and_change_colors {
 	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
 	    &Apache::lonnet::put('environment',{$entry => $color});
 	    &Apache::lonnet::appenv({'environment.'.$entry => $color});
-	    $message.=&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>.<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.$colortypes{$item}.'</i>','<tt>"'.$color.'"</tt>'))
+                    .'<br />';
 	} else {
 	    &Apache::lonnet::del('environment',[$entry]);
-	    &Apache::lonnet::delenv('environment\.'.$entry);
-	    $message.=&mt('Reset '.$colortypes{$item}.'.').'<br />';
+	    &Apache::lonnet::delenv('environment.'.$entry);
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.$colortypes{$item}.'</i>'))
+                     .'<br />';
 	}
     }
+
     my $now = time;
     &Apache::lonnet::put('environment',{'color.timestamp' => $now});
     &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
 
-    print_main_menu($r, $message);
-#    $r->print(<<ENDVCCOL);
-#$message
-#<form name="client" action="/adm/preferences" method="post">
-#<input type="hidden" name="action" value="changecolors" />
-#</form>
-#ENDVCCOL
+    &print_main_menu($r, $message);
 }
 
 ######################################################
@@ -1208,11 +1200,13 @@ sub passwordchanger {
     # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');
     my ($user,$domain,$currentpass,$defdom);
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &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'};
@@ -1223,7 +1217,9 @@ sub passwordchanger {
             $defdom = $r->dir_config('lonDefDomain');
             my %data = &Apache::lonnet::tmpget($mailtoken);
             if (keys(%data) == 0) {
-                $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));
+                $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
+                             ,'<a href="/adm/resetpw">','</a>')
+                );
                 return;
             }
             if (defined($data{time})) {
@@ -1292,7 +1288,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;
@@ -1338,7 +1334,7 @@ sub client_form {
                 'currentpass' => 'Current Password',
                 'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',
-                'changepass' => 'Change Password');
+                'changepass' => 'Save');
 
     my $output = qq|
 <form name="client" >
@@ -1372,7 +1368,7 @@ sub client_form {
 <tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>
     <td><input type="password" name="newpass_2" size="10"  /> </td></tr>
 <tr><td colspan="2" align="center">
-    <input type="button" value="$lt{'changepass'}" onClick="send();">
+    <input type="button" value="$lt{'changepass'}" onClick="send();" />
 </table>
 <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
 <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
@@ -1548,16 +1544,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);
-#	$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
+        $message = &Apache::lonhtmlcommon::confirm_success(&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);
+        }
     } 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);
-#        $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.'));
+        $message = &Apache::lonhtmlcommon::confirm_success(
+          &mt("The password for [_1] was not changed.",$user).' '.&mt('Please make sure your old password was entered correctly.'),1);
+        unless ($caller eq 'reset_by_email') {
+            &print_main_menu($r, $message);
+        }
         return 1;
     }
     return;
@@ -1571,7 +1570,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'};
@@ -1663,15 +1662,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 {
@@ -1688,25 +1680,22 @@ 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'}) ) {
         my $newmark = $env{'form.newmark'};
         if ($newmark eq 'ondisp') {
-           $message.=&mt('In discussions: new posts will be cease to be identified as "NEW" after display.').'<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will be cease to be identified as "NEW" after display.')).'<br />';
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
             &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
         } else {
-            $message.=&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.').'<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&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);
-#$message
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -1714,7 +1703,7 @@ sub verify_and_change_discussion {
 ################################################################
 sub coursedisplaychanger {
     my $r = shift;
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changecourseinit',
                 text => 'Change Course Init. Pref.'});
     $r->print(Apache::loncommon::start_page('Change Course Initialization Preference'));
@@ -1734,17 +1723,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);
@@ -1754,7 +1743,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>');
 }
 
@@ -1767,7 +1756,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'}.', ';
@@ -1778,7 +1767,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'})) {
@@ -1793,11 +1782,7 @@ sub verify_and_change_coursepage {
                         $refpage.'">'.$lt{'dasp'}.'</a></font>';
         }
     }
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#<br /><br />
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message));
 }
 
 sub print_main_menu {
@@ -1817,7 +1802,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',
@@ -1886,7 +1871,7 @@ my @menu=
     },
     {	categorytitle=>'Message Management',
 	items =>[
-	    {	linktext => 'Messages & Notifications',
+	    {	linktext => 'Messages &amp; Notifications',
 		url => '/adm/preferences?action=changemsgforward',
 		permission => 'F',
 		#help => 'Prefs_Messages',
@@ -1904,7 +1889,7 @@ my @menu=
     },
     {	categorytitle=>'Other',
 	items =>[
-	    {	linktext => 'Register Response Devices ("Clickers")',
+	    {	linktext => 'Register Response Devices (&quot;Clickers&quot;)',
 		url => '/adm/preferences?action=changeclicker',
 		permission => 'F',
 		#help => '',
@@ -1980,7 +1965,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));
@@ -2008,9 +1993,11 @@ sub handler {
     Apache::lonhtmlcommon::clear_breadcrumbs();
     Apache::lonhtmlcommon::add_breadcrumb
         ({href => '/adm/preferences',
-          text => 'Set User Preferences'});
+          text => 'Set User Preferences',
+          help =>
+          'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display'});
     if(!exists $env{'form.action'}) {
-	&print_main_menu($r);
+	    &print_main_menu($r);
     }elsif($env{'form.action'} eq 'changepass'){
         &passwordchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_pass'){
@@ -2068,8 +2055,8 @@ sub handler {
     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
         &verify_and_change_coursepage($r);
     }elsif($env{'form.action'} eq 'debugtoggle'){
-        toggle_debug();
-	print_main_menu($r);
+        &toggle_debug();
+	&print_main_menu($r);
     }
 
     return OK;
@@ -2154,7 +2141,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',
@@ -2350,7 +2337,8 @@ sub handler2 {
                        }));
     }
 
-    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
+    if (($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/)
+     && ($env{'user.domain'} =~/^(msu|gerd)$/)){
         push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',
                           subroutine => \&toggle_debug,
@@ -2431,7 +2419,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});
     }