--- loncom/interface/lonpreferences.pm	2009/12/07 00:04:10	1.125.8.4
+++ loncom/interface/lonpreferences.pm	2009/05/06 16:19:34	1.159
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.125.8.4 2009/12/07 00:04:10 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.159 2009/05/06 16:19:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,6 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonnet;
-use LONCAPA::lonauthcgi();
 use LONCAPA();
 
 #
@@ -99,6 +98,12 @@ sub des_decrypt {
 
 sub wysiwygchanger {
     my $r = shift;
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changewysiwyg',
+                text => '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
         ('environment',['wysiwygeditor']);
     my $onselect='checked="checked"';
@@ -132,9 +137,7 @@ sub verify_and_change_wysiwyg {
     &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
     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);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r,$message);
 }
 
 ################################################################
@@ -142,6 +145,12 @@ ENDVCSCREEN
 ################################################################
 sub languagechanger {
     my $r = shift;
+    
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changelanguages',
+                text => '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'};
     my %userenv = &Apache::lonnet::get
@@ -186,9 +195,7 @@ sub verify_and_change_languages {
     }
     $message=&Apache::loncommon::confirmwrapper($message);
     &Apache::loncommon::flush_langs_cache($user,$domain);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -196,6 +203,11 @@ ENDVCSCREEN
 ################################################################
 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('Content Display Settings'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed'));
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get('environment',['texengine']);
@@ -205,8 +217,7 @@ sub texenginechanger {
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
-		     'mimetex' => 'mimetex (Convert to Images)',
-                     'raw' => 'Raw (Screen Reader)'
+		     'mimetex' => 'mimetex (Convert to Images)'
                      );
     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
 						     %mathchoices);
@@ -221,27 +232,12 @@ sub texenginechanger {
       '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'}: $selectionbox
+$lt{'preftxt'}: $selectionbox 
 <br />
 <input type="submit" value="$lt{'change'}" />
 </p>
@@ -253,9 +249,20 @@ $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($jsMathWarning);
+    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>');
 }
 </script>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
@@ -272,7 +279,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>');
     }
 }
 
@@ -302,9 +309,7 @@ sub verify_and_change_texengine {
         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred method to display Math').'</i>'));
     }
     $message=&Apache::loncommon::confirmwrapper($message);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -318,11 +323,16 @@ sub rolesprefchanger {
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['recentroles','recentrolesn']);
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changerolespref',
+                text => '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'};
     my $checked;
     if ($hotlist_flag) {
-	$checked = ' checked="checked"';
+	$checked = 'checked="checked"';
     }
     
     if (!$hotlist_n) { $hotlist_n=3; }
@@ -375,7 +385,7 @@ 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>
@@ -466,7 +476,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 />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
+	    $message .= "<br />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
 	    &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
         }
     }
@@ -481,9 +491,7 @@ sub verify_and_change_rolespref {
         }
     }
     $message=&Apache::loncommon::confirmwrapper($message);
-    $r->print(<<ENDRPSCREEN);
-$message
-ENDRPSCREEN
+    &print_main_menu($r, $message);
 }
 
 
@@ -499,6 +507,11 @@ sub screennamechanger {
         ('environment',['screenname','nickname']);
     my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};
+    Apache::lonhtmlcommon::add_breadcrumb(
+		{ href => '/adm/preferences?action=changescreenname',
+                  text => '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.')
              .'</p>'
@@ -506,10 +519,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()
@@ -531,7 +544,7 @@ sub verify_and_change_screenname {
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'screenname' => $newscreen});
         &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Screenname').'</i>','<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');
@@ -544,7 +557,7 @@ sub verify_and_change_screenname {
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'nickname' => $newscreen});
         &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
-        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Nickname').'</i>','<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');
@@ -552,9 +565,7 @@ sub verify_and_change_screenname {
     }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
     $message=&Apache::loncommon::confirmwrapper($message);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -562,6 +573,12 @@ ENDVCSCREEN
 ################################################################
 sub iconchanger {
     my $r = shift;
+    &Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changeicons',
+                text => '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'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
@@ -596,15 +613,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});
     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newicons.'</tt>'));
     $message=&Apache::loncommon::confirmwrapper($message);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -613,6 +628,11 @@ ENDVCSCREEN
 
 sub clickerchanger {
     my $r = shift;
+    &Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changeclicker',
+                text => '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'};
     my %userenv = &Apache::lonnet::get
@@ -620,7 +640,7 @@ 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">
@@ -649,9 +669,7 @@ sub verify_and_change_clicker {
     &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
     $message=&Apache::loncommon::confirmwrapper($message);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -660,6 +678,11 @@ ENDVCSCREEN
 
 sub domcoordchanger {
     my $r = shift;
+    &Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changedomcoord',
+                text => 'Restrict Domain Coordinator Access'});
+    $r->print(Apache::loncommon::start_page('Restrict Domain Coordinator Access'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Restrict Domain Coordinator Access'));
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
@@ -697,9 +720,7 @@ sub verify_and_change_domcoord {
     }
     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);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r,$message);
 }
 
 #################################################################
@@ -756,13 +777,19 @@ sub msgforwardchanger {
                                           noti  => 'Notification E-mail Address(es)', 
                                           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_exmpl => 'e.g. <tt>joe@doe.com</tt>',
                                           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 'Save' and then add the next one", 
+                                          toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one", 
                                           prme => 'Back',
                                         );
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changemsgforward',
+		text => '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");
     my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message");
@@ -770,7 +797,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;
@@ -963,7 +990,7 @@ sub verify_and_change_msgforward {
 	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
                $newscreen.=$msuser.':'.$msdomain.',';
 	   } else {
-               $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
+               $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br>';
            }
         }
     }
@@ -1058,16 +1085,24 @@ sub verify_and_change_msgforward {
 
 sub colorschanger {
     my $r = shift;
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changecolors',
+                text => '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 Color',
-                    'tabbg' => 'Header Background Color',
-                    'sidebg'=> 'Header Border Color',
-                    'font'  => 'Font Color',
-                    'link'  => 'Un-Visited Link Color',
-                    'vlink' => 'Visited Link Color',
-                    'alink' => 'Active Link Color');
+    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))) {
@@ -1087,7 +1122,7 @@ sub colorschanger {
     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",
@@ -1124,8 +1159,10 @@ $start_data_table
 $chtable
 $end_data_table
 </table>
+<p>
 <input type="submit" value="$savebutton" />
 <input type="submit" name="resetall" value="$resetbutton" title="$resetbuttondesc" />
+</p>
 </form>
 ENDCOL
 }
@@ -1135,13 +1172,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 Color',
-                    'tabbg' => 'Header Background Color',
-                    'sidebg'=> 'Header Border Color',
-                    'font'  => 'Font Color',
-                    'link'  => 'Un-Visited Link Color',
-                    'vlink' => 'Visited Link Color',
-                    'alink' => 'Active Link Color');
+    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) {
@@ -1165,12 +1205,7 @@ sub verify_and_change_colors {
     &Apache::lonnet::put('environment',{'color.timestamp' => $now});
     &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
 
-    $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);
 }
 
 ######################################################
@@ -1182,6 +1217,13 @@ sub passwordchanger {
     # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');
     my ($user,$domain,$currentpass,$defdom);
+    &Apache::lonhtmlcommon::add_breadcrumb(
+		{ href => '/adm/preferences?action=changepass',
+                  text => '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'};
@@ -1192,8 +1234,8 @@ 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 [_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>')
+                $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;
             }
@@ -1263,7 +1305,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;
@@ -1291,8 +1333,6 @@ 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|
@@ -1312,39 +1352,41 @@ sub client_form {
                 'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',
                 'changepass' => 'Save');
-    my $output = '<form name="client">'
-                .&Apache::lonhtmlcommon::start_pick_box();
+
+    my $output = qq|
+<form name="client" >
+<table>
+|;
     if ($caller eq 'reset_by_email') {
-        $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="15" />'
-                  .'<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();
+        $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>
+';
     } else {
-        $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|
+        $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>
 <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'}" />
@@ -1353,7 +1395,7 @@ sub client_form {
 <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>
 </p>
-|;
+ENDFORM
     return $output;
 }
 
@@ -1375,7 +1417,6 @@ 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="" />
 
 |;
     }
@@ -1520,25 +1561,21 @@ ENDERROR
     # Inform the user the password has (not?) been changed
     my $message;
     if ($result =~ /^ok$/) {
-        $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
+        $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 {
-            $r->print(&Apache::loncommon::confirmwrapper($message));
+            &print_main_menu($r, $message);
         }
     } else {
 	# error error: run in circles, scream and shout
-        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);
-            $r->print(&Apache::loncommon::confirmwrapper($message));
+        $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);
+        unless ($caller eq 'reset_by_email') {
+            $message=&Apache::loncommon::confirmwrapper($message);
+            &print_main_menu($r, $message);
         }
+        return 1;
     }
     return;
 }
@@ -1548,6 +1585,11 @@ ENDERROR
 ################################################################
 sub discussionchanger {
     my $r = shift;
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changediscussions',
+                text => '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'};
     my %userenv = &Apache::lonnet::get
@@ -1561,7 +1603,7 @@ sub discussionchanger {
         }
     }
     if (defined($userenv{'discmarkread'})) {
-        unless ($userenv{'discmarkread'} eq '') { 
+        unless ($userenv{'discdisplay'} eq '') { 
             $discmark = $userenv{'discmarkread'};
         }
     }
@@ -1587,7 +1629,7 @@ sub discussionchanger {
         'disa' => 'Posts displayed?',
         'npmr' => 'New posts cease to be identified as "New"?',
         'thde'  => 'The preferences you set here can be overridden within each individual discussion.',
-        'chgt' => 'Change to ',
+        'chgt' => 'Change to '
     );
     my $dispchange = $lt{'unread'};
     my $markchange = $lt{'ondisp'};
@@ -1612,6 +1654,7 @@ sub discussionchanger {
 <br />
 $lt{'sdpf'}<br /> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol> 
 END
+
     $r->print('<p class="LC_info">'.$lt{'thde'}.'</p>');
 
     $r->print(&Apache::loncommon::start_data_table());
@@ -1638,9 +1681,11 @@ END
 END
     $r->print(&Apache::loncommon::end_data_table_row().
 	      &Apache::loncommon::end_data_table());
-    $r->print('<br />'.
-              '<input type="submit" name="sub" value="'.&mt('Save').'" />'.
-              '</form>');
+
+    $r->print('<br />'
+             .'<input type="submit" name="sub" value="'.&mt('Save').'" />'
+             .'</form>'
+    );
 }
                                                                                                                 
 sub verify_and_change_discussion {
@@ -1651,11 +1696,11 @@ sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {
-            $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
+            $message .=&mt('In discussions: only new posts will be displayed.').'<br />';
             &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
             &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
         } else {
-            $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
+            $message .= &mt('In discussions: all posts will be displayed.').'<br />';
             &Apache::lonnet::del('environment',['discdisplay']);
             &Apache::lonnet::delenv('environment.discdisplay');
         }
@@ -1673,9 +1718,7 @@ sub verify_and_change_discussion {
         }
     }
     $message=&Apache::loncommon::confirmwrapper($message);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -1683,6 +1726,11 @@ ENDVCSCREEN
 ################################################################
 sub coursedisplaychanger {
     my $r = shift;
+    &Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changecourseinit',
+                text => 'Change Course Init. Pref.'});
+    $r->print(Apache::loncommon::start_page('Change Course Initialization Preference'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Course Init. Pref.'));
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get('environment',['course_init_display']);
@@ -1696,19 +1744,21 @@ sub coursedisplaychanger {
 	    $whatsnewselect = '';
         }
     }
-    my %pagenames = (
+    my %pagenames = &Apache::lonlocal::texthash(
                        firstres => 'First resource',
                        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>');
 
-    $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] page in the course.",'<i>','</i>').
-              '<br /><br />');
+    $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>')
+             .'<br /><br />'
+    );
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_coursepage" />
@@ -1755,12 +1805,195 @@ sub verify_and_change_coursepage {
                         $refpage.'">'.$lt{'dasp'}.'</a></font>';
         }
     }
-    $message = &Apache::lonhtmlcommon::confirm_success($message);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message));
 }
 
+sub print_main_menu {
+    my ($r, $message) = @_;
+    # Determine current authentication method
+    my $user = $env{'user.name'};
+    my $domain = $env{'user.domain'};
+    my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
+
+    # build the data structure for menu generation
+my $aboutmeurl='/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
+my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
+my %permissions;
+if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
+    $permissions{'aboutme'} = 'F';
+}
+my @menu=
+    ({	categorytitle=>'Personal Data',
+	items =>[
+	    {	linktext => '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.'
+	    },
+	    {	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.'
+	    },
+		]
+    },
+    {	categorytitle=>'Page Display Settings',
+	items =>[
+	    {	linktext => 'Color Scheme',
+		url => '/adm/preferences?action=changecolors',
+		permission => 'F',
+		#help => 'Change_Colors',
+		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',
+		#help => '',
+		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',
+		url => '/adm/preferences?action=changetexenginepref',
+		permission => 'F',
+		#help => '',
+		icon => 'stat.png',
+		linktitle => 'Change how Scientific Equations are displayed.'
+	    },
+		]
+    },
+    {	categorytitle=>'Message Management',
+	items =>[
+	    {	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 (&quot;Clickers&quot;)',
+		url => '/adm/preferences?action=changeclicker',
+		permission => 'F',
+		#help => '',
+		icon => 'network-workgroup.png',
+		linktitle => 'Register your clicker.'
+	    },
+		]
+    },
+    );
+
+    if ($currentauth =~ /^(unix|internal):/) {
+push(@{ $menu[0]->{items} }, {
+	linktext => 'Password',
+	url => '/adm/preferences?action=changepass',
+	permission => 'F',
+	#help => 'Change_Password',
+	icon => 'emblem-readonly.png',
+	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.',
+	});
+    }
+    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
+    if (keys(%author_roles) > 0) {
+push(@{ $menu[4]->{items} }, {
+	linktext => 'Restrict Domain Coordinator Access',
+	url => '/adm/preferences?action=changedomcoord',
+	permission => 'F',
+	#help => '',
+	icon => 'system-lock-screen.png',
+	linktitle => 'Restrict domain coordinator access.',
+	});
+    }
+
+    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',
+	permission => 'F',
+	#help => '',
+	icon => 'edit-copy.png',
+	linktitle => 'Set the default page to be displayed when you select a course role.',
+	});
+
+    }
+    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
+push(@{ $menu[4]->{items} }, {
+	linktext => 'Toggle Debug Messages (Current:'.$env{'user.debug'}.')',
+	url => '/adm/preferences?action=debugtoggle',
+	permission => 'F',
+	#help => '',
+	icon => 'blog.png',
+	linktitle => 'Toggle Debug Messages.',
+	});
+    }   
+
+    $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));
+    $r->print(Apache::loncommon::end_page());
+}
 
 ######################################################
 #            other handler subroutines               #
@@ -1769,7 +2002,93 @@ ENDVCSCREEN
 ################################################################
 #                          Main handler                        #
 ################################################################
-sub handler {
+sub handler {    
+    my $r = shift;
+    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',
+          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);
+    }elsif($env{'form.action'} eq 'changepass'){
+        &passwordchanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_pass'){
+        &verify_and_change_password($r);
+    }elsif($env{'form.action'} eq 'changescreenname'){
+        &screennamechanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_screenname'){
+        &verify_and_change_screenname($r);
+    }elsif($env{'form.action'} eq 'changemsgforward'){
+        &msgforwardchanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_msgforward'){
+        &verify_and_change_msgforward($r);
+    }elsif($env{'form.action'} eq 'changecolors'){
+        &colorschanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_colors'){
+        &verify_and_change_colors($r);
+    }elsif($env{'form.action'} eq 'changelanguages'){
+        &languagechanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_languages'){
+        &verify_and_change_languages($r);
+    }elsif($env{'form.action'} eq 'changewysiwyg'){
+        &wysiwygchanger($r);
+    }elsif($env{'form.action'} eq 'set_wysiwyg'){
+        &verify_and_change_wysiwyg($r);
+    }elsif($env{'form.action'} eq 'changediscussions'){
+        &discussionchanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_discussion'){
+        &verify_and_change_discussion($r);
+    }elsif($env{'form.action'} eq 'changerolespref'){
+        &rolesprefchanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_rolespref'){
+        &verify_and_change_rolespref($r);
+    }elsif($env{'form.action'} eq 'changetexenginepref'){
+        &texenginechanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_texengine'){
+        &verify_and_change_texengine($r);
+    }elsif($env{'form.action'} eq 'changeicons'){
+        &iconchanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_icons'){
+        &verify_and_change_icons($r);
+    }elsif($env{'form.action'} eq 'changeclicker'){
+        &clickerchanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_clicker'){
+        &verify_and_change_clicker($r);
+    }elsif($env{'form.action'} eq 'changedomcoord'){
+        &domcoordchanger($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_domcoord'){
+        &verify_and_change_domcoord($r);
+    }elsif($env{'form.action'} eq 'lockwarning'){
+        &lockwarning($r);
+    }elsif($env{'form.action'} eq 'verify_and_change_locks'){
+        &verify_and_change_lockwarning($r);
+    }elsif($env{'form.action'} eq 'changecourseinit'){
+        &coursedisplaychanger($r);
+    }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'};
@@ -1826,7 +2145,7 @@ sub handler {
                       }));
 
     push (@Options,({ action   => 'changemsgforward',
-                      linktext => 'Messages &amp; Notifications',
+                      linktext => 'Change Message Forwarding and Notification E-mail Addresses',
                       href     => '/adm/preferences',
                       help     => 'Prefs_Messages',
                       breadcrumb => 
@@ -1839,15 +2158,15 @@ sub handler {
                       breadcrumb => 
                           { href => '/adm/preferences?action=changemsgforward',
                             text => 'Change Message Forwarding/Notification'},
-                      printmenu => 'no',
+                      printmenu => 'yes',
                       subroutine => \&verify_and_change_msgforward }));
-    if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
-        my $aboutmeaction = '/adm/'.$domain.'/'.$user.'/aboutme';
-        push (@Options,{ action   => 'none', 
-                         linktext =>"Edit the Personal Information Page",
-                         help     => 'Prefs_About_Me',
-                         href => $aboutmeaction});
-    }
+    my $aboutmeaction=
+        '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
+    push (@Options,{ action => 'none', 
+                     linktext =>
+                         q{Edit the Personal Information Page},
+		     help => 'Prefs_About_Me',
+                     href => $aboutmeaction});
     push (@Options,({ action => 'changecolors',
                       linktext => 'Change Color Scheme',
                       href => '/adm/preferences',
@@ -1864,24 +2183,22 @@ sub handler {
                       printmenu => 'yes',
                       subroutine => \&verify_and_change_colors,
                       }));
-    if ($env{'user.adv'}) {
-        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 => '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',
@@ -1974,23 +2291,22 @@ sub handler {
                             text => 'Change Main Menu'},
                       printmenu => 'yes',
                       }));
-    if ($env{'user.adv'}) {
-        push (@Options,({ action   => 'changeclicker',
-                          linktext => 'Register Response Devices (&quot;Clickers&quot;)',
-                          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',
-                          }));
-    }
+
+    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',
@@ -2044,7 +2360,8 @@ sub handler {
                        }));
     }
 
-    if (&can_toggle_debug()) {
+    if (($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/)
+     && ($env{'user.domain'} =~/^(msu|gerd)$/)){
         push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',
                           subroutine => \&toggle_debug,
@@ -2076,11 +2393,13 @@ sub handler {
 	   || ($printmenu eq 'not_on_error' && !$error) )
 	 && (!$env{'form.returnurl'})) {
         my $optionlist = '<table cellpadding="5">';
-        if (&can_toggle_debug()) {
+        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'} ? 'on' : 'off'),
+                              text => 'Current Debug status is -'.
+                                  $env{'user.debug'}.'-.',
                               href => '/adm/preferences',
                               printmenu => 'yes',
                               subroutine => \&toggle_debug,
@@ -2122,24 +2441,12 @@ sub handler {
 }
 
 sub toggle_debug {
-    if (&can_toggle_debug()) {
+    if ($env{'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__