--- loncom/interface/lonpreferences.pm	2009/02/10 09:30:16	1.135
+++ loncom/interface/lonpreferences.pm	2010/09/19 14:22:40	1.179.2.4
@@ -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.179.2.4 2010/09/19 14:22:40 raeburn 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();
 
 #
@@ -101,7 +102,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 +127,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 +136,9 @@ 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>');
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('WYSIWYG Editor').'</i>','<tt>'.&mt($newsetting).'</tt>'));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
 }
 
 ################################################################
@@ -149,7 +150,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'};
@@ -165,14 +166,17 @@ sub languagechanger {
 	               = &Apache::loncommon::plainlanguagedescription($_);
 	}
     }
-    my $selectionbox=&Apache::loncommon::select_form($language,'language',
-						     %langchoices);
+    my $selectionbox=
+           &Apache::loncommon::select_form(
+               $language,
+               'language',
+               &Apache::lonlocal::texthash(%langchoices));
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <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 +191,15 @@ 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 [_1] to [_2]','<i>'.&mt('Preferred language').'</i>','<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 [_1]','<i>'.&mt('Preferred language').'</i>'));
     }
+    $message=&Apache::loncommon::confirmwrapper($message);
     &Apache::loncommon::flush_langs_cache($user,$domain);
-    print_main_menu($r, $message);
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -207,9 +209,9 @@ sub texenginechanger {
     my $r = shift;
     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::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed'));
+                text => 'Math display settings'});
+    $r->print(Apache::loncommon::start_page('Content Display Settings'));
+    $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']);
@@ -219,28 +221,48 @@ 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 $selectionbox=
+           &Apache::loncommon::select_form(
+               $texengine,
+               'texengine',
+               &Apache::lonlocal::texthash(%mathchoices));
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
-      'headline' => 'Change Math Preferences',
-      'preftxt'  => 'Preferred method to display Math',
-      'change'   => 'Change',
+      'headline' => 'Change how math is displayed',
+      'preftxt'  => 'Preferred method to display math',
+      'change'   => 'Save',
       'exmpl'    => 'Examples',
       'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',
     );
 
+    my $jsMathWarning='<p>'
+                     .'<div class="LC_warning">'
+                     .&mt("It looks like you don't have the TeX math fonts installed.")
+                     .'</div>'
+                     .'<div>'
+                     .&mt('The jsMath example on this page may not look right without them. '
+                         .'The [_1]jsMath Home Page[_2] has information on how to download the '
+                         .'needed fonts. In the meantime, jsMath will do the best it can '
+                         .'with the fonts you have, but it may not be pretty and some equations '
+                         .'may not be rendered correctly.'
+                         ,'<a href="http://www.math.union.edu/locate/jsMath/" target="_blank">'
+                         ,'</a>')
+                     .'</div>'
+                     .'</p>';
+
     $r->print(<<ENDLSCREEN);
 <h2>$lt{'headline'}</h2>
 <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,20 +272,9 @@ $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;'
-	 +' border-color: #DD0000; background-color: #FFF8F8; width: 75%; text-align: left">'
-	 +'<small><font color="#AA0000"><b>Warning:</b> '
-	 +'It looks like you don\\\'t have the TeX math fonts installed. '
-	 +'The jsMath example on this page may not look right without them. '
-	 +'The <a href="http://www.math.union.edu/locate/jsMath/" target="_blank"> '
-	 +'jsMath Home Page</a> has information on how to download the '
-	 +'needed fonts.  In the meantime, jsMath will do the best it can '
-	 +'with the fonts you have, but it may not be pretty and some equations '
-	 +'may not be rendered correctly. '
-	 +'</font></small></div>');
+    document.writeln($jsMathWarning);
 }
 </script>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
@@ -276,11 +287,11 @@ 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') {
-	$r->print('<script type="text/javascript">jsMath.Process()</script>');
+	$r->print('<script type="text/javascript" language="JavaScript">jsMath.Process()</script>');
     }
 }
 
@@ -303,18 +314,14 @@ 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 [_1] to [_2]','<i>'.&mt('Preferred method to display Math').'</i>','<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 [_1]','<i>'.&mt('Preferred method to display Math').'</i>'));
     }
-
-
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -331,7 +338,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'};
@@ -372,13 +379,13 @@ sub rolesprefchanger {
             my $checked = "";
             my $value = $recent_roles{$role_key};
             if ($frozen_roles{$role_key}) {
-                $checked = "checked=\"checked\"";
+                $checked = ' checked="checked"';
             }
 	    $count++;
             $roles_check_list .=
 		&Apache::loncommon::start_data_table_row().
 		'<td class="LC_table_cell_checkbox">'.
-		"<input type=\"checkbox\" $checked name=\"freezeroles\"".
+		"<input type=\"checkbox\"$checked name=\"freezeroles\"".
 		" id=\"freezeroles$count\" value=\"$role_key\" /></td>".
 		"<td><label for=\"freezeroles$count\">".
 		"$role_text{$role_key}</label></td>".
@@ -390,10 +397,10 @@ sub rolesprefchanger {
     $r->print('
 <p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'
 </p>
-<form name="prefs" action="/adm/preferences" method="POST">
+<form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_rolespref" />
 <br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
-<input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
+<input type="checkbox"'.$checked.' name="recentroles" value="true" /></label>
 <br />'.&mt('Number of '.$role.'s in Hotlist:').'
 <select name="recentrolesn" size="1">
 '.$options.'
@@ -402,7 +409,7 @@ sub rolesprefchanger {
 </p>
 '.$roles_check_list.'
 <br />
-<input type="submit" value="'.&mt('Change').'" />
+<input type="submit" value="'.&mt('Save').'" />
 </form>');
 }
 
@@ -451,7 +458,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 +488,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]','<i>'.$role_text{$role_key}.'</i>'));
 	    &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
         }
     }
@@ -489,17 +496,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]','<i>'.$role_text{$role_key}.'</i>'));
              &Apache::lonhtmlcommon::store_recent('roles',
                                           $role_key,' ',1);
         }
     }
-    $message .= "<hr /><br />\n";
-
-#    $r->print(<<ENDRPSCREEN);
-#$message
-#ENDRPSCREEN
-    print_main_menu($r, $message);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 
@@ -518,7 +522,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.')
@@ -527,10 +531,10 @@ sub screennamechanger {
     $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)'))
+             .&Apache::lonhtmlcommon::row_title(&mt('Screenname').' '.&mt('(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)'))
+             .&Apache::lonhtmlcommon::row_title(&mt('Nickname').' '.&mt('(shown if you post non-anonymously)'))
              .'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'
              .&Apache::lonhtmlcommon::row_closure()
              .&Apache::lonhtmlcommon::row_title()
@@ -552,11 +556,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 [_1] to [_2]','<i>'.&mt('Screenname').'</i>','<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 [_1]','<i>'.&mt('Screenname').'</i>'));
     }
 # Nickname
     $message.='<br />';
@@ -565,17 +569,15 @@ 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 [_1] to [_2]','<i>'.&mt('Nickname').'</i>','<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 [_1]','<i>'.&mt('Nickname').'</i>'));
     }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -583,10 +585,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 +609,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" />
@@ -623,12 +625,13 @@ sub verify_and_change_icons {
     my $r = shift;
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
-    my $newicons  = $env{'form.menumode'};
+    my $newicons   = $env{'form.menumode'};
 
     &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));
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newicons.'</tt>'));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -637,10 +640,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 +652,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 +679,9 @@ 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));
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -685,7 +690,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'));
@@ -696,16 +701,16 @@ sub domcoordchanger {
         ('environment',['domcoord.author']);
     my $constchecked='';
     if ($userenv{'domcoord.author'} eq 'blocked') {
-       $constchecked='checked="checked"';
+       $constchecked=' checked="checked"';
     }
     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" />
 $text<br />
-<label><input type="checkbox" name="construction" $constchecked />$construction</label><br />
+<label><input type="checkbox" name="construction"$constchecked />$construction</label><br />
 <input type="submit" value="$change" />
 </form>
 ENDSCREEN
@@ -719,8 +724,15 @@ 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.'));
+    my $status='';
+    if ($domcoord{'domcoord.author'} eq 'blocked') {
+        $status=&mt('on');
+    } else {
+        $status=&mt('off');
+    }
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to construction space').'</i>','<tt>'.$status.'</tt>'));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
 }
 
 #################################################################
@@ -773,23 +785,23 @@ 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   => '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::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification'));
+		text => 'Messages & Notifications'});
+    $r->print(Apache::loncommon::start_page('Messages &amp; Notifications'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages &amp; 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");
@@ -797,7 +809,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;
@@ -855,11 +867,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
@@ -904,7 +917,7 @@ ENDMSG
                        '<input type="radio" name="notify_type_'.$num. 
                        '" value="'.$type.'" '.$chk{$type}.
                        ' onchange="javascript:address_changes('."'$num'".')" />'.
-                       $lt{$type}.'</label></span>&nbsp;';
+                       $lt{$type}.'</label></span>'.('&nbsp;' x4);
         }
         my $htmlon = '';
         my $htmloff = '';
@@ -916,7 +929,7 @@ ENDMSG
         $output .= '</td><td><label><input type="radio" name="html_'.$num.
                    '" value="1" '.$htmlon.
                    ' onchange="javascript:address_changes('."'$num'".')" />'.
-                   &mt('Yes').'</label>&nbsp;'.
+                   &mt('Yes').'</label>'.('&nbsp;' x3).
                    '<label><input type="radio" name="html_'.$num.'" value="0" '.
                    $htmloff. ' onchange="javascript:address_changes('."'$num'".
 ')" />'.
@@ -941,10 +954,10 @@ ENDMSG
         $output .= '<span class="LC_nobreak"><label>'.
                    '<input type="radio" name="notify_type_'.$num.
                    '" value="'.$type.'" '.$defchk{$type}.'/>'.
-                   $lt{$type}.'</label></span>&nbsp;';
+                   $lt{$type}.'</label></span>'.('&nbsp;' x4);
     }
     $output .= '</td><td><label><input type="radio" name="html_'.$num.
-               '" value="1" />'.&mt('Yes').'</label>&nbsp;'.
+               '" value="1" />'.&mt('Yes').'</label>'.('&nbsp;' x3).
                '<label><input type="radio" name="html_'.$num.'" value="0" '.
                ' checked="checked" />'.
                &mt('No').'</label></td>'.
@@ -955,8 +968,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>
 |);
 
@@ -982,16 +995,21 @@ sub verify_and_change_msgforward {
     my $domain     = $env{'user.domain'};
     my $newscreen  = '';
     my $message='';
-    foreach (split(/\,/,$env{'form.msgforward'})) {
-	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
+    foreach my $recip (split(/\,/,$env{'form.msgforward'})) {
+        my ($msuser,$msdomain);
+        if ($recip =~ /:/) {
+            ($msuser,$msdomain)=split(':',$recip);
+        } else {
+            ($msuser,$msdomain)=split(/\@/,$recip);
+        }
         $msuser = &LONCAPA::clean_username($msuser);
         $msdomain = &LONCAPA::clean_domain($msdomain);
         if (($msuser) && ($msdomain)) {
-	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
-               $newscreen.=$msuser.':'.$msdomain.',';
-	   } else {
-               $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br>';
-           }
+            if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
+                $newscreen.=$msuser.':'.$msdomain.',';
+            } else {
+                $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
+            }
         }
     }
     $newscreen=~s/\,$//;
@@ -1002,7 +1020,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 +1060,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 +1069,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 +1079,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 +1088,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 +1106,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 +1131,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 +1177,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 +1190,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 +1208,22 @@ 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 />';
 	}
     }
+    $message=&Apache::loncommon::confirmwrapper($message);
+
     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 +1235,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 +1252,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 +1323,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;
@@ -1320,6 +1351,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|
@@ -1338,42 +1371,42 @@ sub client_form {
                 'currentpass' => 'Current Password',
                 'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',
-                'changepass' => 'Change Password');
+                'changepass' => 'Save',
+    );
 
-    my $output = qq|
-<form name="client" >
-<table>
-|;
+    my $output = '<form name="client">'
+                .&Apache::lonhtmlcommon::start_pick_box();
     if ($caller eq 'reset_by_email') {
-        $output .= qq|
-<tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
-    <td><input type="text" name="email" size="30" /> </td></tr>
-<tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
-    <td>
-     <input type="text" name="uname" size="15" />
-     <input type="hidden" name="currentpass" value="$currentpass" />
-    </td></tr>
-<tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'domain'}</label>:</td>
-    <td>
-|;
-        $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
-   </td>
-</tr>
-';
+        $output .= &Apache::lonhtmlcommon::row_title(
+                       '<label for="email">'.$lt{'email'}.'</label>')
+                  .'<input type="text" name="email" size="30" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(
+                       '<label for="uname">'.$lt{'username'}.'</label>')
+                  .'<input type="text" name="uname" size="30" />'
+                  .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(
+                       '<label for="udom">'.$lt{'domain'}.'</label>')
+                  .&Apache::loncommon::select_dom_form($defdom,'udom')
+                  .&Apache::lonhtmlcommon::row_closure();
     } else {
-        $output .= qq|
-<tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>
-    <td><input type="password" name="currentpass" size="10"/> </td></tr>
-|;
-    }
-    $output .= <<"ENDFORM";
-<tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>
-    <td><input type="password" name="newpass_1" size="10"  /> </td></tr>
-<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();">
-</table>
+        $output .= &Apache::lonhtmlcommon::row_title(
+                       '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
+                  .'<input type="password" name="currentpass" size="10"/>'
+                  .&Apache::lonhtmlcommon::row_closure();
+    }
+    $output .= &Apache::lonhtmlcommon::row_title(
+                   '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
+              .'<input type="password" name="newpass_1" size="10" />'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title(
+                   '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
+              .'<input type="password" name="newpass_2" size="10" />'
+              .&Apache::lonhtmlcommon::row_closure(1)
+              .&Apache::lonhtmlcommon::end_pick_box();
+    $output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onClick="send();" /></p>'
+              .qq|
 <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
 <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
 <input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />
@@ -1382,7 +1415,7 @@ sub client_form {
 <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>
 </p>
-ENDFORM
+|;
     return $output;
 }
 
@@ -1404,6 +1437,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="" />
 
 |;
     }
@@ -1548,17 +1582,26 @@ 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 user [_1] was successfully changed.','<i>'.$user.'</i>'));
+        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.'));
-        return 1;
+        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;
 }
@@ -1586,7 +1629,7 @@ sub discussionchanger {
         }
     }
     if (defined($userenv{'discmarkread'})) {
-        unless ($userenv{'discdisplay'} eq '') { 
+        unless ($userenv{'discmarkread'} eq '') { 
             $discmark = $userenv{'discmarkread'};
         }
     }
@@ -1630,15 +1673,16 @@ 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" />
 <br />
 $lt{'sdpf'}<br /> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol> 
-<br />
-<br />
 END
+
+    $r->print('<p class="LC_info">'.$lt{'thde'}.'</p>');
+
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(<<"END");
        <tr>
@@ -1663,15 +1707,11 @@ 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 />'
+             .'<input type="submit" name="sub" value="'.&mt('Save').'" />'
+             .'</form>'
+    );
 }
                                                                                                                 
 sub verify_and_change_discussion {
@@ -1682,31 +1722,29 @@ 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');
+            &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);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -1714,7 +1752,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 +1772,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 +1792,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 +1805,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 +1816,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 +1831,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 {
@@ -1816,23 +1850,8 @@ if (&Apache::lonnet::usertools_access($u
 }
 my @menu=
     ({	categorytitle=>'Personal Data',
-	items =>[
-	    {	linktext => 'About Me',
-		url => $aboutmeurl,
-		permission => $permissions{'aboutme'},
-		#help => 'Prefs_About_Me',
-		icon => 'system-users.png',
-		linktitle => 'Edit information about yourself that should be displayed on your public profile.'
-	    },
-	    {	linktext => 'Screen Name',
-		url => '/adm/preferences?action=changescreenname',
-		permission => 'F',
-		#help => 'Prefs_Screen_Name_Nickname',
-		icon => 'preferences-desktop-font.png',
-		linktitle => 'Change the name that is displayed in your posts.'
-	    },
-		]
-    },
+        items =>[]
+     },
     {	categorytitle=>'Page Display Settings',
 	items =>[
 	    {	linktext => 'Color Scheme',
@@ -1842,25 +1861,10 @@ my @menu=
 		icon => 'preferences-desktop-theme.png',
 		linktitle => 'Change LON-CAPA default colors.'
 	    },
-	    {	linktext => 'Menu Display',
-		url => '/adm/preferences?action=changeicons',
-		permission => 'F',
-		#help => '',
-		icon => 'preferences-system-windows.png',
-		linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
-	    }
-
 		]
     },
     {	categorytitle=>'Content Display Settings',
 	items =>[
-	    {	linktext => 'Language',
-		url => '/adm/preferences?action=changelanguages',
-		permission => 'F',
-		#help => 'Prefs_Language',
-		icon => 'preferences-desktop-locale.png',
-		linktitle => 'Choose the default language for this user.'
-	    },
 	    {	linktext => 'WYSIWYG Editor',
 		url => '/adm/preferences?action=changewysiwyg',
 		permission => 'F',
@@ -1868,53 +1872,54 @@ my @menu=
 		icon => 'edit-select-all.png',
 		linktitle => 'Enable or disable the WYSIWYG-Editor.'
 	    },
-	    {	linktext => $role.' Page',
-		url => '/adm/preferences?action=changerolespref',
-		permission => 'F',
-		#help => '',
-		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 &amp; Notifications',
 	items =>[
-	    {	linktext => 'Messages & Notifications',
+	    {	linktext => 'Messages &amp; Notifications',
 		url => '/adm/preferences?action=changemsgforward',
 		permission => 'F',
 		#help => 'Prefs_Messages',
 		icon => 'mail-reply-all.png',
 		linktitle => 'Change messageforwarding or notifications settings.'
 	    },
-	    {	linktext => 'Discussion Display',
-		url => '/adm/preferences?action=changediscussions',
-		permission => 'F',
-		#help => 'Change_Discussion_Display',
-		icon => 'mail-message-new.png',
-		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
-	    },
 		]
     },
     {	categorytitle=>'Other',
-	items =>[
-	    {	linktext => 'Register Response Devices ("Clickers")',
-		url => '/adm/preferences?action=changeclicker',
-		permission => 'F',
-		#help => '',
-		icon => 'network-workgroup.png',
-		linktitle => 'Register your clicker.'
-	    },
-		]
+	items =>[]
     },
     );
 
+    if (&Apache::lonnet::usertools_access($env{'user.name'},
+                                          $env{'user.domain'},'aboutme')) {
+        push(@{ $menu[0]->{items} },
+                {   linktext   => 'Personal Information Page',
+                    url        => $aboutmeurl,
+                    permission => $permissions{'aboutme'},
+                    #help      => 'Prefs_About_Me',
+                    icon       => 'system-users.png',
+                    linktitle  => 'Edit information about yourself that should be displayed on your public profile.'
+                });
+    }
+
+    unless ($env{'user.domain'} eq 'gcitest') {
+        push(@{ $menu[0]->{items} },
+            {   linktext => 'Screen Name',
+                url => '/adm/preferences?action=changescreenname',
+                permission => 'F',
+                #help => 'Prefs_Screen_Name_Nickname',
+                icon => 'preferences-desktop-font.png',
+                linktitle => 'Change the name that is displayed in your posts.'
+            });
+    }
+
     if ($currentauth =~ /^(unix|internal):/) {
 push(@{ $menu[0]->{items} }, {
 	linktext => 'Password',
@@ -1925,25 +1930,29 @@ push(@{ $menu[0]->{items} }, {
 	linktitle => 'Change your password.',
 	});
     }
-    if ($env{'environment.remote'} eq 'off') {
-push(@{ $menu[1]->{items} }, {
-	linktext => 'Launch Remote Control',
-	url => '/adm/remote?url=/adm/preferences?action=launch',
-	permission => 'F',
-	#help => '',
-	icon => 'network-wireless.png',
-	linktitle => 'Launch the remote control for LON-CAPA.',
-	});
-    }else{
-push(@{ $menu[1]->{items} }, {
-	linktext => 'Collapse Remote Control',
-	url => '/adm/remote?url=/adm/preferences?action=collapse',
-	permission => 'F',
-	#help => '',
-	icon => 'network-wireless.png',
-	linktitle => 'Collapse the remote control for LON-CAPA.',
-	});
+
+    unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) {
+        push(@{ $menu[1]->{items} },
+          {   linktext => 'Menu Display',
+              url => '/adm/preferences?action=changeicons',
+              permission => 'F',
+              #help => '',
+              icon => 'preferences-system-windows.png',
+              linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
+          });
+    }
+
+    unless ($env{'user.domain'} eq 'gcitest') {
+        push(@{ $menu[3]->{items} },
+            {   linktext => 'Discussion Display',
+                url => '/adm/preferences?action=changediscussions',
+                permission => 'F',
+                #help => 'Change_Discussion_Display',
+                icon => 'mail-message-new.png',
+                linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
+            });
     }
+
     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
     if (keys(%author_roles) > 0) {
 push(@{ $menu[4]->{items} }, {
@@ -1956,9 +1965,10 @@ push(@{ $menu[4]->{items} }, {
 	});
     }
 
-    if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
-	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
-				    .$env{'request.course.sec'})) {
+    unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) { 
+        if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+	    || &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+	   			        .$env{'request.course.sec'})) {
 push(@{ $menu[4]->{items} }, {
 	linktext => 'Course Initialization',
 	url => '/adm/preferences?action=changecourseinit',
@@ -1968,19 +1978,20 @@ push(@{ $menu[4]->{items} }, {
 	linktitle => 'Set the default page to be displayed when you select a course role.',
 	});
 
+        }
     }
-    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 => '',
 	icon => 'blog.png',
 	linktitle => 'Toggle Debug Messages.',
 	});
-    }   
+    }
 
-    $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 +2019,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,374 +2081,41 @@ 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);
-    }
-
-    return OK;
-
-
-}
-#remove when done
-#old handler routine
-sub handler2 {
-    my $r = shift;
-    my $user = $env{'user.name'};
-    my $domain = $env{'user.domain'};
-    &Apache::loncommon::content_type($r,'text/html');
-    # Some pages contain DES keys and should not be cached.
-    &Apache::loncommon::no_cache($r);
-    $r->send_http_header;
-    return OK if $r->header_only;
-    #
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                   ['action','wysiwyg','returnurl','refpage']);
-    #
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb
-        ({href => '/adm/preferences',
-          text => 'Set User Preferences'});
-
-    my @Options;
-    # Determine current authentication method
-    my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
-    if ($currentauth =~ /^(unix|internal):/) {
-        push (@Options,({ action   => 'changepass',
-                          linktext => 'Change Password',
-                          href     => '/adm/preferences',
-                          help     => 'Change_Password',
-                          subroutine => \&passwordchanger,
-                          breadcrumb => 
-                              { href => '/adm/preferences?action=changepass',
-                                text => 'Change Password'},
-                          },
-                        { action => 'verify_and_change_pass',
-                          subroutine => \&verify_and_change_password,
-                          breadcrumb => 
-                              { href =>'/adm/preferences?action=changepass',
-                                text => 'Change Password'},
-                          printmenu => 'not_on_error',
-                          }));
-    }
-    push (@Options,({ action   => 'changescreenname',
-                      linktext => 'Change Screen Name',
-                      href     => '/adm/preferences',
-                      help     => 'Prefs_Screen_Name_Nickname',
-                      subroutine => \&screennamechanger,
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changescreenname',
-                            text => 'Change Screen Name'},
-                      },
-                    { action   => 'verify_and_change_screenname',
-                      subroutine => \&verify_and_change_screenname,
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changescreenname',
-                            text => 'Change Screen Name'},
-                      printmenu => 'yes',
-                      }));
-
-    push (@Options,({ action   => 'changemsgforward',
-                      linktext => 'Change Message Forwarding and Notification E-mail Addresses',
-                      href     => '/adm/preferences',
-                      help     => 'Prefs_Messages',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changemsgforward',
-                            text => 'Change Message Forwarding/Notification'},
-                      subroutine => \&msgforwardchanger,
-                      },
-                    { action => 'verify_and_change_msgforward',
-                      help   => 'Prefs_Messages',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changemsgforward',
-                            text => 'Change Message Forwarding/Notification'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_msgforward }));
-    my $aboutmeaction=
-        '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
-    push (@Options,{ action => 'none', 
-                     linktext =>
-                         q{Edit the 'About Me' Personal Information Screen},
-		     help => 'Prefs_About_Me',
-                     href => $aboutmeaction});
-    push (@Options,({ action => 'changecolors',
-                      linktext => 'Change Color Scheme',
-                      href => '/adm/preferences',
-                      help => 'Change_Colors',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changecolors',
-                            text => 'Change Colors'},
-                      subroutine => \&colorschanger,
-                  },
-                    { action => 'verify_and_change_colors',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changecolors',
-                            text => 'Change Colors'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_colors,
-                      }));
-    push (@Options,({ action => 'changelanguages',
-                      linktext => 'Change Language Preferences',
-                      href => '/adm/preferences',
-		      help => 'Prefs_Language',
-                      breadcrumb=>
-                          { href => '/adm/preferences?action=changelanguages',
-                            text => 'Change Language'},
-                      subroutine =>  \&languagechanger,
-                  },
-                    { action => 'verify_and_change_languages',
-                      breadcrumb=>
-                          {href => '/adm/preferences?action=changelanguages',
-                           text => 'Change Language'},
-                      printmenu => 'yes',
-                      subroutine=>\&verify_and_change_languages, }
-                    ));
-    push (@Options,({ action => 'changewysiwyg',
-                      linktext => 'Change WYSIWYG Editor Preferences',
-                      href => '/adm/preferences',
-                      breadcrumb => 
-                            { href => '/adm/preferences?action=changewysiwyg',
-                              text => 'Change WYSIWYG Preferences'},
-                      subroutine => \&wysiwygchanger,
-                  },
-                    { action => 'set_wysiwyg',
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changewysiwyg',
-                            text => 'Change WYSIWYG Preferences'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_wysiwyg, }
-                    ));
-    push (@Options,({ action => 'changediscussions',
-                      linktext => 'Change Discussion Display Preferences',
-                      href => '/adm/preferences',
-                      help => 'Change_Discussion_Display',
-                      breadcrumb => 
-                            { href => '/adm/preferences?action=changediscussions',
-                              text => 'Change Discussion Preferences'},
-                      subroutine => \&discussionchanger,
-                  },
-                    { action => 'verify_and_change_discussion',
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changediscussions',
-                            text => 'Change Discussion Preferences'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_discussion, }
-                    ));
-
-    my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
-    push (@Options,({ action   => 'changerolespref',
-                      linktext => 'Change '.$role.' Page Preferences',
-                      href     => '/adm/preferences',
-                      subroutine => \&rolesprefchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changerolespref',
-                            text => 'Change '.$role.' Page Pref'},
-                      },
-                    { action   => 'verify_and_change_rolespref',
-                      subroutine => \&verify_and_change_rolespref,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changerolespref',
-                            text => 'Change '.$role.' Page Preferences'},
-                      printmenu => 'yes',
-                      }));
-
-    push (@Options,({ action   => 'changetexenginepref',
-                      linktext => 'Change How Math Equations Are Displayed',
-                      href     => '/adm/preferences',
-                      subroutine => \&texenginechanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changetexenginepref',
-                            text => 'Change Math Pref'},
-                      },
-                    { action   => 'verify_and_change_texengine',
-                      subroutine => \&verify_and_change_texengine,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changetexenginepref',
-                            text => 'Change Math Preferences'},
-                      printmenu => 'yes',
-                      }));
-
-    if ($env{'environment.remote'} eq 'off') {
-	push (@Options,({ action => 'launch',
-			  linktext => 'Launch Remote Control',
-			  href => '/adm/remote?url=/adm/preferences',
-		      }));
-    } else {
-	push (@Options,({ action => 'collapse',
-			  linktext => 'Collapse Remote Control',
-			  href => '/adm/remote?url=/adm/preferences',
-		      }));
-    }
-
-    push (@Options,({ action   => 'changeicons',
-                      linktext => 'Change How Menus are Displayed',
-                      href     => '/adm/preferences',
-                      subroutine => \&iconchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeicons',
-                            text => 'Change Main Menu'},
-                      },
-                    { action   => 'verify_and_change_icons',
-                      subroutine => \&verify_and_change_icons,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeicons',
-                            text => 'Change Main Menu'},
-                      printmenu => 'yes',
-                      }));
-
-    push (@Options,({ action   => 'changeclicker',
-                      linktext => 'Register Response Devices ("Clickers")',
-                      href     => '/adm/preferences',
-                      subroutine => \&clickerchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeclicker',
-                            text => 'Register Clicker'},
-                      },
-                    { action   => 'verify_and_change_clicker',
-                      subroutine => \&verify_and_change_clicker,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeclicker',
-                            text => 'Register Clicker'},
-                      printmenu => 'yes',
-                      }));
-    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
-    if (keys(%author_roles) > 0) {
-      push (@Options,({ action   => 'changedomcoord',
-                        linktext => 'Restrict Domain Coordinator Access',
-                        href     => '/adm/preferences',
-                        subroutine => \&domcoordchanger,
-                        breadcrumb =>
-                            { href => '/adm/preferences?action=changedomcoord',
-                              text => 'Restrict Domain Coordinator Access'},
-                      },
-                      { action   => 'verify_and_change_domcoord',
-                        subroutine => \&verify_and_change_domcoord,
-                        breadcrumb =>
-                            { href => '/adm/preferences?action=changedomcoord',
-                              text => 'Restrict Domain Coordinator Access'},
-                        printmenu => 'yes',
-                      }));
-    }
-
-    push (@Options,({ action   => 'lockwarning',
-                      subroutine => \&lockwarning,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=lockwarning',
-                            text => 'Lock Warnings'},
-                      },
-                    { action   => 'verify_and_change_locks',
-                      subroutine => \&verify_and_change_lockwarning,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=lockwarning',
-                            text => 'Lockwarnings'},
-                      printmenu => 'yes',
-                      }));
-
-
-    if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
-	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
-				    .$env{'request.course.sec'})) {
-        push (@Options,({ action => 'changecourseinit',
-                          linktext => 'Change Course Initialization Preference',
-                          href => '/adm/preferences',
-                          subroutine => \&coursedisplaychanger,
-                          breadcrumb =>
-                              { href => '/adm/preferences?action=changecourseinit',
-                                text => 'Change Course Init. Pref.'},
-                          },
-                        { action => 'verify_and_change_coursepage',
-                          breadcrumb =>
-                          { href => '/adm/preferences?action=changecourseinit',                               text => 'Change Course Initialization Preference'},
-                        printmenu => 'yes',
-                        subroutine => \&verify_and_change_coursepage,
-                       }));
-    }
-
-    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
-        push (@Options,({ action => 'debugtoggle',
-                          printmenu => 'yes',
-                          subroutine => \&toggle_debug,
-                          }));
-    }
-
-    $r->print(&Apache::loncommon::start_page('Change Preferences'));
-
-    my $call = undef;
-    my $help = undef;
-    my $printmenu = 'yes';
-    foreach my $option (@Options) {
-        if ($option->{'action'} eq $env{'form.action'}) {
-            $call = $option->{'subroutine'};
-            $printmenu = $option->{'printmenu'};
-            if (exists($option->{'breadcrumb'})) {
-                &Apache::lonhtmlcommon::add_breadcrumb
-                    ($option->{'breadcrumb'});
-            }
-	    $help=$option->{'help'};
+        if (&can_toggle_debug()) {
+            &toggle_debug();
         }
+	&print_main_menu($r);
     }
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
-    my $error;
-    if (defined($call)) {
-        $error = $call->($r);
-    }
-    if ( ( ($printmenu eq 'yes')
-	   || ($printmenu eq 'not_on_error' && !$error) )
-	 && (!$env{'form.returnurl'})) {
-        my $optionlist = '<table cellpadding="5">';
-        if ($env{'user.name'} =~ 
-                         /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
-            ) {
-            push (@Options,({ action => 'debugtoggle',
-                              linktext => 'Toggle Debug Messages',
-                              text => 'Current Debug status is -'.
-                                  $env{'user.debug'}.'-.',
-                              href => '/adm/preferences',
-                              printmenu => 'yes',
-                              subroutine => \&toggle_debug,
-                              }));
-        }
-        foreach my $option(@Options) {
-            my $optiontext = '';
-            if (exists($option->{'href'})) {
-		$option->{'href_args'}{'action'}=$option->{'action'};
-		$optiontext .= 
-                    '<a href="'.&add_get_param($option->{'href'},
-					       $option->{'href_args'}).'">'.
-                    &mt($option->{'linktext'}).'</a>';
-            }
-            if (exists($option->{'text'})) {
-                $optiontext .= ' '.&mt($option->{'text'});
-            }
-            if ($optiontext ne '') {
-                $optiontext = '<font size="+1">'.$optiontext.'</font>'; 
-                my $helplink = '&nbsp;';
-                if (exists($option->{'help'})) {
-                    $helplink = &Apache::loncommon::help_open_topic
-                                                    ($option->{'help'});
-                }
-                $optionlist .= '<tr>'.
-                    '<td>'.$helplink.'</td>'.
-                    '<td>'.$optiontext.'</td>'.
-                    '</tr>';
-            }
-        }
-        $optionlist .= '</table>';
-        $r->print($optionlist);
-    } elsif ($env{'form.returnurl'}) {
-	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
-		  &mt('Return').'</font></a>');
+
+    # Properly end the HTML page of all preference pages
+    # started in each sub routine
+    # Exception: print_main_menu has its own end_page call
+    unless (!exists $env{'form.action'} ||
+            $env{'form.action'} eq 'debugtoggle') {
+        $r->print(&Apache::loncommon::end_page());
     }
-    $r->print(&Apache::loncommon::end_page());
+
     return OK;
 }
 
 sub toggle_debug {
     if ($env{'user.debug'}) {
-        &Apache::lonnet::delenv('user\.debug');
+        &Apache::lonnet::delenv('user.debug');
     } else {
         &Apache::lonnet::appenv({'user.debug' => 1});
     }
 }
 
+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__