--- loncom/interface/lonpreferences.pm	2007/05/02 01:33:49	1.101
+++ loncom/interface/lonpreferences.pm	2016/01/31 21:25:37	1.218
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.101 2007/05/02 01:33:49 albertel Exp $
+# $Id: lonpreferences.pm,v 1.218 2016/01/31 21:25:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,58 +36,13 @@ use strict;
 use LONCAPA;
 use Apache::Constants qw(:common);
 use Apache::File;
-use Crypt::DES;
-use DynaLoader; # for Crypt::DES version
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA::lonauthcgi();
 use LONCAPA();
 
-#
-# Write lonnet::passwd to do the call below.
-# Use:
-#   my $answer=reply("encrypt:passwd:$udom:$uname:$upass",$tryserver);
-#
-##################################################
-#          password associated functions         #
-##################################################
-sub des_keys {
-    # Make a new key for DES encryption.
-    # Each key has two parts which are returned separately.
-    # Please note:  Each key must be passed through the &hex function
-    # before it is output to the web browser.  The hex versions cannot
-    # be used to decrypt.
-    my @hexstr=('0','1','2','3','4','5','6','7',
-                '8','9','a','b','c','d','e','f');
-    my $lkey='';
-    for (0..7) {
-        $lkey.=$hexstr[rand(15)];
-    }
-    my $ukey='';
-    for (0..7) {
-        $ukey.=$hexstr[rand(15)];
-    }
-    return ($lkey,$ukey);
-}
-
-sub des_decrypt {
-    my ($key,$cyphertext) = @_;
-    my $keybin=pack("H16",$key);
-    my $cypher;
-    if ($Crypt::DES::VERSION>=2.03) {
-        $cypher=new Crypt::DES $keybin;
-    } else {
-        $cypher=new DES $keybin;
-    }
-    my $plaintext=
-	$cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,0,16))));
-    $plaintext.=
-	$cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,16,16))));
-    $plaintext=substr($plaintext,1,ord(substr($plaintext,0,1)) );
-    return $plaintext;
-}
-
 ################################################################
 #                       Handler subroutines                    #
 ################################################################
@@ -98,6 +53,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"';
@@ -108,14 +69,19 @@ sub wysiwygchanger {
     }
     my $switchoff=&mt('Disable WYSIWYG editor');
     my $switchon=&mt('Enable WYSIWYG editor');
+    my $warning='';
+    if ($env{'user.adv'}) {
+       $warning.='<p class="LC_warning">'.&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
+    }
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="set_wysiwyg" />
+$warning
 <br />
 <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').'" />');
 }
 
 
@@ -123,8 +89,10 @@ sub verify_and_change_wysiwyg {
     my $r = shift;
     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>');
+    &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);
+    &print_main_menu($r,$message);
 }
 
 ################################################################
@@ -132,28 +100,22 @@ sub verify_and_change_wysiwyg {
 ################################################################
 sub languagechanger {
     my $r = shift;
-    my $user       = $env{'user.name'};
-    my $domain     = $env{'user.domain'};
-    my %userenv = &Apache::lonnet::get
-        ('environment',['languages']);
+    
+    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 %userenv = &Apache::lonnet::get('environment',['languages']);
     my $language=$userenv{'languages'};
 
-    my $pref=&mt('Preferred language');
-    my %langchoices=('' => 'No language preference');
-    foreach (&Apache::loncommon::languageids()) {
-	if (&Apache::loncommon::supportedlanguagecode($_)) {
-	    $langchoices{&Apache::loncommon::supportedlanguagecode($_)}
-	               = &Apache::loncommon::plainlanguagedescription($_);
-	}
-    }
-    my $selectionbox=&Apache::loncommon::select_form($language,'language',
-						     %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(
+        '<form name="prefs" action="/adm/preferences" method="post">'."\n".
+        '<input type="hidden" name="action" value="verify_and_change_languages" />'.
+        '<br /><span class="LC_nobreak">'.&mt('Preferred language').':&nbsp;'.
+        &Apache::loncommon::select_language('language',$language,1).'</span>'."\n".
+        '<br /><input type="submit" value="'.&mt('Save').'" /></form>'
+    );
 }
 
 
@@ -167,16 +129,21 @@ sub verify_and_change_languages {
     my $message='';
     if ($newlanguage) {
         &Apache::lonnet::put('environment',{'languages' => $newlanguage});
-        &Apache::lonnet::appenv('environment.languages' => $newlanguage);
-        $message='Set new preferred languages to '.$newlanguage;
+        &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
+        $message=&Apache::lonhtmlcommon::confirm_success(
+            &mt('Set [_1] to [_2]',
+                '<i>'.&mt('Preferred language').'</i>',
+                '<tt>"'.$newlanguage.'"</tt>.'))
+           .'<br />'
+           .&mt('The change will become active on the next page.');
     } else {
         &Apache::lonnet::del('environment',['languages']);
-        &Apache::lonnet::delenv('environment\.languages');
-        $message='Reset preferred language';
+        &Apache::lonnet::delenv('environment.languages');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred language').'</i>'));
     }
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &Apache::loncommon::flush_langs_cache($user,$domain);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -184,62 +151,105 @@ ENDVCSCREEN
 ################################################################
 sub texenginechanger {
     my $r = shift;
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changetexenginepref',
+                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']);
     my $texengine=$userenv{'texengine'};
 
-    my $pref=&mt('Preferred method to display Math');
     my %mathchoices=('' => 'Default',
-		     'tth' => 'TeX to HTML',
+		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
-		     'mimetex' => 'Convert to Images'
+		     'MathJax' => 'MathJax',
+		     'mimetex' => 'mimetex (Convert to Images)',
+                     'raw' => 'Raw (Screen Reader)'
                      );
-    my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
-						     %mathchoices);
+    %mathchoices = &Apache::lonlocal::texthash(%mathchoices);
+    my $selectionbox=
+           &Apache::loncommon::select_form(
+               $texengine,
+               'texengine',
+               \%mathchoices);
+    my $MathJax_start=&Apache::lontexconvert::MathJax_header();
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
-    my $change=&mt('Change');
-    $r->print(<<ENDLSCREEN);
-<br />
+    my %lt=&Apache::lonlocal::texthash(
+      'headline' => 'Change how math is displayed',
+      'preftxt'  => 'Preferred method to display math',
+      'change'   => 'Save',
+      'exmpl'    => 'Examples',
+      'mathjax'  => 'MathJax:',
+      'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.',
+      '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>$pref: $selectionbox</p>
-<p><input type="submit" value="$change" /></p>
+<p>
+$lt{'preftxt'}: $selectionbox 
+<br />
+<input type="submit" value="$lt{'change'}" />
+</p>
 </form>
-Examples:
-<p> TeX to HTML <br /> 
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>
+<br />
+<hr />
+$lt{'exmpl'}
+
+<h3>$lt{'mathjax'}</h3>
+</script>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="150"></iframe>
 </p>
-<p>jsMath <br /> 
+<p>
+$lt{'mathjaxinfo'}
+</p>
+
+<h3>$lt{'jsmath'}</h3> 
+<p>
 $jsMath_start
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 if (jsMath.nofonts == 1) {
-    document.writeln
-        ('<center><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></center>');
+    document.writeln($jsMathWarning);
 }
+
 </script>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="150"></iframe>
+</p>
 
+<h3>$lt{'mimetex'}</h3>
+<p>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="150"></iframe>
 </p>
-<p> Convert to Images <br />
-<br />
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>
+
+<h3>$lt{'tth'}</h3>
+<p>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="150"></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>');
     }
 }
 
@@ -252,27 +262,24 @@ sub verify_and_change_texengine {
     my $newtexengine  = $env{'form.texengine'};
     $newtexengine=~s/[^\-\w]//g;
     if ($newtexengine eq 'ttm') {
-	&Apache::lonnet::appenv('browser.mathml' => 1);
+	&Apache::lonnet::appenv({'browser.mathml' => 1});
     } else {
 	if ($env{'environment.texengine'} eq 'ttm') {
-	    &Apache::lonnet::appenv('browser.mathml' => 0);
+	    &Apache::lonnet::appenv({'browser.mathml' => 0});
 	}
     }
     my $message='';
     if ($newtexengine) {
         &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
-        &Apache::lonnet::appenv('environment.texengine' => $newtexengine);
-        $message='Set new preferred math display to '.$newtexengine;
+        &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
+        $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='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
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -286,11 +293,25 @@ sub rolesprefchanger {
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['recentroles','recentrolesn']);
+    my $brtext = 'Change '.$role.' Page Pref';
+    my $brtitle;
+    if ($env{'form.returnurl'} eq '/adm/roles') {
+        $brtext = 'Configure Hotlist';
+    } else {
+        $brtitle = $brtext;
+    }
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changerolespref',
+                text => $brtext});
+    $r->print(Apache::loncommon::start_page('Content Display Settings'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs($brtitle));
     my $hotlist_flag=$userenv{'recentroles'};
     my $hotlist_n=$userenv{'recentrolesn'};
-    my $checked;
+    my ($checkedon,$checkedoff);
     if ($hotlist_flag) {
-	$checked = 'checked="checked"';
+	$checkedon = 'checked="checked"';
+    } else {
+        $checkedoff = 'checked="checked"';
     }
     
     if (!$hotlist_n) { $hotlist_n=3; }
@@ -317,7 +338,7 @@ sub rolesprefchanger {
 	    &Apache::loncommon::start_data_table().
 	    &Apache::loncommon::start_data_table_header_row().
 	    "<th>".&mt('Freeze '.$role)."</th>".
-	    "<th>".&mt($role)."</td>".
+	    "<th>".&mt($role)."</th>".
 	    &Apache::loncommon::end_data_table_header_row().
 	    "\n";
 	my $count;
@@ -325,13 +346,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>".
@@ -340,22 +361,52 @@ sub rolesprefchanger {
         $roles_check_list .= "</table>\n";
     }
 
+    my $actionurl = '/adm/preferences';
+    if ($env{'form.returnurl'} eq '/adm/roles') {
+        $actionurl = '/adm/roles';
+    }
+    $r->print('<h3>'.&mt('Recent Roles Hotlist').'</h3>');
+    unless ($checkedon) {
+        $r->print(&mt('LON-CAPA users with several '.$lc_role.'s may wish to enable the Hotlist.').'<br />');
+    }
     $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="'.$actionurl.'" 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>
-<br />'.&mt('Number of '.$role.'s in Hotlist:').'
-<select name="recentrolesn" size="1">
-'.$options.'
-</select>
-<p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
+<input type="hidden" name="returnurl" value="'.$env{'form.returnurl'}.'" />
+<div class="LC_left_float"><h4>'.&mt('Hotlist options').'</h4>
+<p>'.
+&mt('When enabled, the Hotlist keeps track of the last N '.$lc_role.'s visited.').'<br />'.
+&mt('Those N '.$lc_role.'s are then shown in a table at the top of the '.$lc_role.'s page.').'</p>'.
+&Apache::lonhtmlcommon::start_pick_box().
+&Apache::lonhtmlcommon::row_title(&mt('Use Recent '.$role.'s Hotlist')).
+'<span class="LC_nobreak">
+<label><input id="Hotliston" type="radio" '.$checkedon.' name="recentroles" value="1" />'.&mt('Yes').'</label>'.
+('&nbsp;'x2).
+'<label><input id="Hotlistoff" type="radio" '.$checkedoff.' name="recentroles" value="0" />'.&mt('No').'</label>
+</span>'.
+&Apache::lonhtmlcommon::row_closure().
+&Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').
+'<select name="recentrolesn" size="1" id ="NumberOfRoles">'.
+$options.'
+</select>'.
+&Apache::lonhtmlcommon::row_closure(1).
+&Apache::lonhtmlcommon::end_pick_box().'
+</div>');
+    if ($roles_check_list) { 
+        $r->print('<div class="LC_left_float">
+<h4>'.&mt('Freeze Roles').'</h4>
+<p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.
+&mt('Those '.$lc_role.'s marked frozen will not be removed from the list, even if not recently used.').'
 </p>
 '.$roles_check_list.'
-<br />
-<input type="submit" value="'.&mt('Change').'" />
+</div>');
+     } else {
+         $r->print('<br clear="all" />'.
+                   &mt('Once the Hotlist contains recently visited '.$lc_role.'s you can return to this page to also set frozen roles.'));
+     }
+     $r->print('
+<br clear="all" />
+<input type="submit" value="'.&mt('Save').'" />
 </form>');
 }
 
@@ -400,20 +451,16 @@ sub verify_and_change_rolespref {
     my $message='<hr />';
     if ($hotlist_flag) {
         &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
-        &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);
-        $message=&mt('Recent '.$role.'s Hotlist is Enabled');
+        &Apache::lonnet::appenv({'environment.recentroles' => $hotlist_flag});
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Recent '.$role.'s Hotlist is Enabled.')." ".&mt('Display [_1] Most Recent '.$role.'s.',$hotlist_n));
     } else {
         &Apache::lonnet::del('environment',['recentroles']);
-        &Apache::lonnet::delenv('environment\.recentroles');
-        $message=&mt('Recent '.$role.'s Hotlist is Disabled');
+        &Apache::lonnet::delenv('environment.recentroles');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Recent '.$role.'s Hotlist is Disabled'));
     }
     if ($hotlist_n) {
         &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
-        &Apache::lonnet::appenv('environment.recentrolesn' => $hotlist_n);
-        if ($hotlist_flag) {
-            $message.="<br />".
-		&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
-        }
+        &Apache::lonnet::appenv({'environment.recentrolesn' => $hotlist_n});
     }
 
 # Get list of froze roles and list of recent roles
@@ -434,7 +481,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);
         }
     }
@@ -442,16 +489,18 @@ 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
+    $message=&Apache::loncommon::confirmwrapper($message);
+    if ($env{'form.returnurl'} eq '/adm/roles') {
+        return $message;
+    } else {
+        &print_main_menu($r, $message);
+    }
 }
 
 
@@ -467,16 +516,30 @@ sub screennamechanger {
         ('environment',['screenname','nickname']);
     my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};
-    $r->print(<<ENDSCREEN);
-<form name="prefs" action="/adm/preferences" method="post">
-<input type="hidden" name="action" value="verify_and_change_screenname" />
-<br />New screenname (shown if you post anonymously):
-<input type="text" size="20" value="$screenname" name="screenname" />
-<br />New nickname (shown if you post non-anonymously):
-<input type="text" size="20" value="$nickname" name="nickname" />
-<input type="submit" value="Change" />
-</form>
-ENDSCREEN
+    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>'
+    );
+    $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('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('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()
+             .'<input type="submit" value="'.&mt('Save').'" />'
+             .&Apache::lonhtmlcommon::row_closure(1)
+             .&Apache::lonhtmlcommon::end_pick_box()
+             .'</form>'
+    );
 }
 
 sub verify_and_change_screenname {
@@ -489,12 +552,12 @@ sub verify_and_change_screenname {
     my $message='';
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'screenname' => $newscreen});
-        &Apache::lonnet::appenv('environment.screenname' => $newscreen);
-        $message='Set new screenname to '.$newscreen;
+        &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
+        $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='Reset screenname';
+        &Apache::lonnet::delenv('environment.screenname');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Screenname').'</i>'));
     }
 # Nickname
     $message.='<br />';
@@ -502,17 +565,16 @@ sub verify_and_change_screenname {
     $newscreen=~s/[^ \w]//g;
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'nickname' => $newscreen});
-        &Apache::lonnet::appenv('environment.nickname' => $newscreen);
-        $message.='Set new nickname to '.$newscreen;
+        &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
+        $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.='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
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -520,31 +582,51 @@ ENDVCSCREEN
 ################################################################
 sub iconchanger {
     my $r = shift;
+    &Apache::lonhtmlcommon::add_breadcrumb(
+            {   href => '/adm/preferences?action=changeicons',
+                text => 'Change Menu Display'});
+    $r->print(Apache::loncommon::start_page('Page Display Settings'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Menu Display'));
+
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
-    my %userenv = &Apache::lonnet::get
-        ('environment',['icons']);
+    my %userenv = &Apache::lonnet::get('environment',['icons']);
     my $iconic='checked="checked"';
-    my $classic='';
-    my $onlyicon='';
+    my ($classic,$onlyicon,$iconic_preview,$iconsonly_preview);
     if ($userenv{'icons'} eq 'classic') {
-       $classic='checked="checked"';
-       $iconic='';
+        $iconic='';
+        $classic='<div class="LC_info">'.
+                 &mt('Your current selection: "Use buttons and text" is deprecated - it is recommended that you change this to "Use icons and text".').'</div>';
     }
     if ($userenv{'icons'} eq 'iconsonly') {
        $onlyicon='checked="checked"';
        $iconic='';
     }
-    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');
+    my %lt = &icon_options();
+    my ($inlinetools,$toolsorder) = &icon_previews();
+    if ((ref($inlinetools) eq 'HASH') && (ref($toolsorder) eq 'ARRAY')) {
+        foreach my $tool (@{$toolsorder}) {
+            my ($command,$row,$col,$img,$top,$bot,$act,$desc) = 
+                split(/\&/,$inlinetools->{$tool});
+            $iconic_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" /><span class="LC_menubuttons_inline_text">'.$top.('&nbsp;' x 2).'</span></a></li>';
+            $iconsonly_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" />&nbsp;</a></li>';
+        }
+    }
+    $iconsonly_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
+                         '<ul>'.
+                         $iconsonly_preview.
+                         '</ul></li></ul>';
+    $iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
+                      '<ul>'.
+                      $iconic_preview.
+                      '</ul></li></ul>'; 
     $r->print(<<ENDSCREEN);
+$classic
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_icons" />
-<label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />
-<label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />
-<label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />
+<label><input type="radio" name="menumode" value="iconic" $iconic /> $lt{'iconic'}</label>$iconic_preview<br />
+<label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $lt{'iconsonly'}</label>$iconsonly_preview<br />
 <input type="submit" value="$change" />
 </form>
 ENDSCREEN
@@ -554,45 +636,435 @@ 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'};
+    my %lt = &icon_options();
+    my $newchoice = $newicons;
+    if ($lt{$newicons}) {
+        $newchoice = $lt{$newicons};
+    }
     &Apache::lonnet::put('environment',{'icons' => $newicons});
-    &Apache::lonnet::appenv('environment.icons' => $newicons);
-    $r->print(&mt('Set menu mode to [_1].',$newicons));
+    &Apache::lonnet::appenv({'environment.icons' => $newicons});
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newchoice.'</tt>'));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
+}
+
+sub icon_options {
+    return &Apache::lonlocal::texthash(
+                                        iconic    => 'Use icons and text',
+                                        iconsonly => 'Use icons only',
+                                      );
+}
+
+sub icon_previews {
+     my %icon_text = (
+                      annotate => 'Notes',
+                      wishlist => 'Stored Links',
+                      catalog  => 'Info',
+                      evaluate => 'Evaluate',
+                      feedback => 'Communicate',
+                      printout => 'Print',
+                     );
+    my %inlinetools = (
+        printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",
+        wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository",
+        evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",
+        feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource",
+        annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",
+        catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata",
+    );
+    my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
+    return (\%inlinetools,\@toolsorder);
+}
+
+################################################################
+#                     Clicker Subroutines                      #
+################################################################
+
+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
+        ('environment',['clickers']);
+    my $clickers=$userenv{'clickers'};
+    $clickers=~s/\,/\n/gs;
+    my $text=&mt('Enter response device ("clicker") numbers');
+    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>$helplink<br /><br />$text<br />
+<textarea name="clickers" rows="5" cols="20">$clickers</textarea>
+</label>
+<br />
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+}
+
+sub verify_and_change_clicker {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my $uhome      = $env{'user.home'};
+    my $newclickers  = $env{'form.clickers'};
+    my $message;
+    $newclickers=~s/[^\w\:\-]+/\,/gs;
+    $newclickers=~tr/a-z/A-Z/;
+    $newclickers=~s/[\:\-]+/\-/g;
+    $newclickers=~s/\,+/\,/g;
+    $newclickers=~s/^\,//;
+    $newclickers=~s/\,$//;
+    my @oldclickers = split(/,/,$env{'environment.clickers'});
+    my @newclickers = split(/,/,$newclickers);
+    my %newuniq;
+    map { $newuniq{$_} = 1; }  @newclickers;
+    @newclickers = sort(keys(%newuniq));
+    my @differences = &Apache::loncommon::compare_arrays(\@oldclickers,\@newclickers);
+    if (@differences) {
+        my $putres = &Apache::lonnet::put('environment',{'clickers' => $newclickers});
+        if ($putres eq 'ok') {
+            my @adds = ();
+            my @dels = ();
+            foreach my $item (@differences) {
+                if (grep(/^\Q$item\E$/,@newclickers)) {
+                    push(@adds,$item);
+                } else {
+                    push(@dels,$item);
+                }
+            }
+            if (@dels) {
+                 my %delclicker;
+                 map { $delclicker{$_} = $user; } @dels;
+                 my $putresult = &Apache::lonnet::iddel($domain,\%delclicker,$uhome,'clickers');
+            }
+            if (@adds) {
+                 my %addclicker;
+                 map { $addclicker{$_} = $user; } @adds;
+                 my $putresult = &Apache::lonnet::updateclickers($domain,'add',\%addclicker,$uhome,1);
+            }
+            &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
+            $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+        } else {
+            $message=&Apache::lonhtmlcommon::confirm_success(&mt('Error saving clicker ID').1);
+        }
+    } else {
+        $message='<span class="LC_info">'.&mt('Clicker information unchanged').'</span>';
+    }
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
+}
+
+################################################################
+#               Domcoord Access Subroutines                    #
+################################################################
+
+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
+        ('environment',['domcoord.author']);
+    my $constchecked='';
+    if ($userenv{'domcoord.author'} eq 'blocked') {
+       $constchecked=' checked="checked"';
+    }
+    my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.');
+    my $construction=&mt('Block access to Authoring Space');
+    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 />
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+}
+
+sub verify_and_change_domcoord {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my %domcoord=('domcoord.author' => '');
+    if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
+    &Apache::lonnet::put('environment',\%domcoord);
+    &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
+    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 Authoring Space').'</i>','<tt>'.$status.'</tt>'));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
+}
+
+#################################################################
+##                      Lock Subroutines                        #
+#################################################################
+
+sub lockwarning {
+    my $r = shift;
+    my $title=&mt('Action locked');
+    my $texttop=&mt('LON-CAPA is currently performing the following actions:');
+    my $textbottom=&mt('Changing roles or logging out may result in data corruption.');
+    my ($num,%which)=&Apache::lonnet::get_locks();
+    my $which='';
+    foreach my $id (keys(%which)) {
+       $which.='<li>'.$which{$id}.'</li>';
+    }
+    my $change=&mt('Override');
+    $r->print(<<ENDSCREEN);
+<form name="prefs" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_locks" />
+<h1>$title</h1>
+$texttop
+<ul>
+$which
+</ul>
+$textbottom
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+}
+
+sub verify_and_change_lockwarning {
+    my $r = shift;
+    &Apache::lonnet::remove_all_locks();
+    $r->print(&mt('Cleared locks.'));
 }
 
+
 ################################################################
 #         Message Forward                                      #
 ################################################################
 
 sub msgforwardchanger {
-    my $r = shift;
+    my ($r,$message) = @_;
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
-    my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification']);
+    my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification','notifywithhtml']);
     my $msgforward=$userenv{'msgforward'};
-    my $notification=$userenv{'notification'};
-    my $critnotification=$userenv{'critnotification'};
-    my $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding",
-							    "What are forwarding ".
-							    "and notification ".
-							    "addresses");
-    my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",
-								 "What are critical messages");
+    my %lt = &Apache::lonlocal::texthash(
+                                          all   => 'All',
+                                          crit  => 'Critical only',
+                                          reg   => 'Non-critical only',
+                                          foad  => 'Forward to account(s)',
+                                          fwdm  => 'Forward messages to other account(s) in LON-CAPA',
+                                          noti  => 'E-mail notification of LON-CAPA messages',
+                                          mnot  => 'E-mail address(es) which should be notified about new LON-CAPA messages',
+                                          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',
+                                        );
+    $lt{'foad_exmpl'} = &mt('e.g. [_1]userA:domain1,userB:domain2,...[_2]','<tt>','</tt>');
+    $lt{'mnot_exmpl'} = &mt('e.g. [_1]joe@doe.com[_2]','<tt>','</tt>');
+    Apache::lonhtmlcommon::add_breadcrumb(
+	    {	href => '/adm/preferences?action=changemsgforward',
+		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");
+    my @allow_html = split(/,/,$userenv{'notifywithhtml'});
+    my %allnot = &get_notifications(\%userenv);
+    my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();
+    my $jscript = qq|
+<script type="text/javascript" language="JavaScript">
+function validate() {
+    for (var i=0; i<document.prefs.numnotify.value; i++) {
+        var checkaddress = 0;
+        var addr = document.prefs.elements['address_'+i].value;
+        var rownum = i+1;
+        if (i < document.prefs.numnotify.value-1) {
+            if (document.prefs.elements['modify_notify_'+i].checked) {
+                checkaddress = 1;
+            }
+        } else {
+            if (document.prefs.elements['add_notify_'+i].checked == true) { 
+                checkaddress = 1;
+            }
+        }
+        if (checkaddress == 1)  {
+            var addr = document.prefs.elements['address_'+i].value;
+            if (validmail(document.prefs.elements['address_'+i]) == false) {
+                var multimsg = '';
+                if (addr.indexOf(",") >= 0) {
+                    multimsg = "\\n($lt{'toen'}).";
+                }
+                alert("$lt{'email'} "+rownum+" ('"+addr+"') $lt{'notv'}."+multimsg);
+                return;
+            }
+        }
+    }
+    document.prefs.submit();
+}
+
+function address_changes (adnum) {
+     if (!document.prefs.elements['del_notify_'+adnum].checked) { 
+         document.prefs.elements['modify_notify_'+adnum].checked = true;
+     }   
+}
+
+function new_address(adnum) {
+     document.prefs.elements['add_notify_'+adnum].checked = true;
+}
 
+function delete_address(adnum) {
+     if (document.prefs.elements['del_notify_'+adnum].checked) {
+          document.prefs.elements['modify_notify_'+adnum].checked = false;
+     }
+}
+
+function modify_address(adnum) {
+    if (document.prefs.elements['modify_notify_'+adnum].checked) {
+        document.prefs.elements['del_notify_'+adnum].checked = false;
+    }
+} 
+
+$validatescript
+</script>
+|;
     $r->print(<<ENDMSG);
-$forwardingHelp <br />
+$jscript
+$message
+<h3>$lt{'fwdm'} $forwardingHelp</h3>
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_msgforward" />
-New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):
-<input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
-New Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):
-<input type="text" size="40" value="$notification" name="notification" /><hr />
-New Critical Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):
-<input type="text" size="40" value="$critnotification" name="critnotification" />$criticalMessageHelp<hr />
-<input type="submit" value="Change" />
-</form>
+$lt{'foad'} ($lt{'foad_exmpl'}):
+<input type="text" size="40" value="$msgforward" name="msgforward" />
+<br /><br />
+<h3>$lt{'noti'} $notificationHelp</h3>
+$lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
 ENDMSG
+    my @sortforwards = sort (keys(%allnot));
+    my $output = &Apache::loncommon::start_data_table().
+                 &Apache::loncommon::start_data_table_header_row().
+                 '<th>&nbsp;</th>'.
+                 '<th>'.&mt('Action').'</th>'.
+                 '<th>'.&mt('Notification address').'</th><th>'.
+                 &mt('Types of message for which notification is sent').
+                 $criticalMessageHelp.'</th><th>'.
+                 &mt('Excerpt retains HTML tags in message').'</th>'.
+                 &Apache::loncommon::end_data_table_header_row();
+    my $num = 0;
+    my $counter = 1;
+    foreach my $item (@sortforwards) {
+        $output .= &Apache::loncommon::start_data_table_row().
+                   '<td><b>'.$counter.'</b></td>'.
+                   '<td><span class="LC_nobreak"><label>'.
+                   '<input type="checkbox" name="modify_notify_'.
+                   $num.'" onclick="javscript:modify_address('."'$num'".')" />'.
+                   &mt('Modify').'</label></span>&nbsp;&nbsp; '.
+                   '<span class="LC_nobreak"><label>'.
+                   '<input type="checkbox" name="del_notify_'.$num.
+                   '" onclick="javscript:delete_address('."'$num'".')" />'.
+                   &mt('Delete').'</label></span></td>'.
+                   '<td><input type="text" value="'.$item.'" name="address_'.
+                   $num.'" onfocus="javascript:address_changes('."'$num'".
+                   ')" /></td><td>';
+        my %chk;
+        if (defined($allnot{$item}{'crit'})) {
+            if (defined($allnot{$item}{'reg'})) {
+                $chk{'all'} = 'checked="checked" ';
+            } else {
+                $chk{'crit'} = 'checked="checked" ';
+            }
+        } else {
+            $chk{'reg'} = 'checked="checked" ';
+        }
+        foreach my $type ('all','crit','reg') {
+            $output .= '<span class="LC_nobreak"><label>'.
+                       '<input type="radio" name="notify_type_'.$num. 
+                       '" value="'.$type.'" '.$chk{$type}.
+                       ' onchange="javascript:address_changes('."'$num'".')" />'.
+                       $lt{$type}.'</label></span>'.('&nbsp;' x4);
+        }
+        my $htmlon = '';
+        my $htmloff = '';
+        if (grep/^\Q$item\E/,@allow_html) {
+            $htmlon = 'checked="checked" '; 
+        } else {
+            $htmloff = 'checked="checked" ';
+        }
+        $output .= '</td><td><label><input type="radio" name="html_'.$num.
+                   '" value="1" '.$htmlon.
+                   ' onchange="javascript:address_changes('."'$num'".')" />'.
+                   &mt('Yes').'</label>'.('&nbsp;' x3).
+                   '<label><input type="radio" name="html_'.$num.'" value="0" '.
+                   $htmloff. ' onchange="javascript:address_changes('."'$num'".
+')" />'.
+                   &mt('No').'</label></td>'.
+                   &Apache::loncommon::end_data_table_row();
+        $num ++;
+        $counter ++;
+    }
+    my %defchk = (
+                   all => 'checked="checked" ',
+                   crit => '',
+                   reg => '',
+                 );
+    $output .= &Apache::loncommon::start_data_table_row().
+               '<td><b>'.$counter.'</b></td>'.
+               '<td><span class="LC_nobreak"><label>'.
+               '<input type="checkbox" name="add_notify_'.$num.
+               '" value="1" />'.&mt('Add new address').'</label></span></td>'.
+               '<td><input type="text" value="" name="address_'.$num.
+               '" onfocus="javascript:new_address('."'$num'".')" /></td><td>';
+    foreach my $type ('all','crit','reg') {
+        $output .= '<span class="LC_nobreak"><label>'.
+                   '<input type="radio" name="notify_type_'.$num.
+                   '" value="'.$type.'" '.$defchk{$type}.'/>'.
+                   $lt{$type}.'</label></span>'.('&nbsp;' x4);
+    }
+    $output .= '</td><td><label><input type="radio" name="html_'.$num.
+               '" value="1" />'.&mt('Yes').'</label>'.('&nbsp;' x3).
+               '<label><input type="radio" name="html_'.$num.'" value="0" '.
+               ' checked="checked" />'.
+               &mt('No').'</label></td>'.
+               &Apache::loncommon::end_data_table_row().
+               &Apache::loncommon::end_data_table();
+    $num ++;
+    $r->print($output);
+    $r->print(qq|
+<br /><hr />
+<input type="hidden" name="numnotify" value="$num" />
+<input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
+<input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
+</form>
+|);
+
+}
+
+sub get_notifications {
+    my ($userenv) = @_;
+    my %allnot;
+    my @critnot = split(/,/,$userenv->{'critnotification'});
+    my @regnot = split(/,/,$userenv->{'notification'});
+    foreach my $item (@critnot) {
+        $allnot{$item}{crit} = 1;
+    }
+    foreach my $item (@regnot) {
+        $allnot{$item}{reg} = 1;
+    }
+    return %allnot;
 }
 
 sub verify_and_change_msgforward {
@@ -601,53 +1073,103 @@ 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.='No such user: '.$msuser.':'.$msdomain.'<br>';
-           }
+                $newscreen.=$msuser.':'.$msdomain.',';
+	    } else {
+                $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
+            }
         }
     }
     $newscreen=~s/\,$//;
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'msgforward' => $newscreen});
-        &Apache::lonnet::appenv('environment.msgforward' => $newscreen);
-        $message.='Set new message forwarding to '.$newscreen.'<br />';
+        &Apache::lonnet::appenv({'environment.msgforward' => $newscreen});
+        $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.<br />');
     } else {
         &Apache::lonnet::del('environment',['msgforward']);
-        &Apache::lonnet::delenv('environment\.msgforward');
-        $message.='Reset message forwarding<br />';
+        &Apache::lonnet::delenv('environment.msgforward');
+        $message.= &Apache::lonhtmlcommon::confirm_success(&mt("Set message forwarding to 'off'.").'<br />');
     }
-    my $notification=$env{'form.notification'};
+    my $critnotification;
+    my $notification;
+    my $notify_with_html;
+    my $lastnotify = $env{'form.numnotify'}-1;
+    my $totaladdresses = 0;
+    for (my $i=0; $i<$env{'form.numnotify'}; $i++) {
+        if ((!defined($env{'form.del_notify_'.$i})) &&  
+           ((($i==$lastnotify) && ($env{'form.add_notify_'.$lastnotify} == 1)) ||
+            ($i<$lastnotify))) {
+            if (defined($env{'form.address_'.$i})) {
+                if ($env{'form.notify_type_'.$i} eq 'all') {
+                    $critnotification .= $env{'form.address_'.$i}.',';
+                    $notification .= $env{'form.address_'.$i}.',';
+                } elsif ($env{'form.notify_type_'.$i} eq 'crit') {
+                    $critnotification .= $env{'form.address_'.$i}.',';
+                } elsif ($env{'form.notify_type_'.$i} eq 'reg') {
+                    $notification .= $env{'form.address_'.$i}.','; 
+                }
+                if ($env{'form.html_'.$i} eq '1') {
+		    $notify_with_html .= $env{'form.address_'.$i}.',';       	
+                }
+                $totaladdresses ++;
+            }
+        }
+    }
+    $critnotification =~ s/,$//;
+    $critnotification=~s/\s//gs;
+    $notification =~ s/,$//;
     $notification=~s/\s//gs;
+    $notify_with_html =~ s/,$//;
+    $notify_with_html =~ s/\s//gs;
     if ($notification) {
         &Apache::lonnet::put('environment',{'notification' => $notification});
-        &Apache::lonnet::appenv('environment.notification' => $notification);
-        $message.='Set message notification address to '.$notification.'<br />';
+        &Apache::lonnet::appenv({'environment.notification' => $notification});
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />');
     } else {
         &Apache::lonnet::del('environment',['notification']);
-        &Apache::lonnet::delenv('environment\.notification');
-        $message.='Reset message notification<br />';
+        &Apache::lonnet::delenv('environment.notification');
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set non-critical message notification to 'off'.").'<br />');
     }
-    my $critnotification=$env{'form.critnotification'};
-    $critnotification=~s/\s//gs;
     if ($critnotification) {
         &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
-        &Apache::lonnet::appenv('environment.critnotification' => $critnotification);
-        $message.='Set critical message notification address to '.$critnotification;
+        &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />');
     } else {
         &Apache::lonnet::del('environment',['critnotification']);
-        &Apache::lonnet::delenv('environment\.critnotification');
-        $message.='Reset critical message notification<br />';
+        &Apache::lonnet::delenv('environment.critnotification');
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set critical message notification to 'off'.").'<br />');
     }
-    $r->print(<<ENDVCMSG);
-$message
-ENDVCMSG
+    if ($critnotification || $notification) {
+        if ($notify_with_html) {
+            &Apache::lonnet::put('environment',{'notifywithhtml' => $notify_with_html});
+            &Apache::lonnet::appenv({'environment.notifywithhtml' => $notify_with_html});
+            $message.=&Apache::lonhtmlcommon::confirm_success(&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');
+            if ($totaladdresses == 1) {
+                $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set notification address to receive excerpts with html stripped."));
+            } else {
+                $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set all notification addresses to receive excerpts with html stripped."));
+            }
+        }
+    } else {
+        &Apache::lonnet::del('environment',['notifywithhtml']);
+        &Apache::lonnet::delenv('environment.notifywithhtml');
+    }
+    &Apache::loncommon::flush_email_cache($user,$domain);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &msgforwardchanger($r,$message);
 }
 
 ################################################################
@@ -656,59 +1178,47 @@ ENDVCMSG
 
 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',
-                    '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))) {
        my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
        $chtable.=&Apache::loncommon::start_data_table_row().
-	   '<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.
-        '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><input name="'.$item.
-        '" size="10" value="'.$curcol.
-'" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
-"','".$curcol."','"
-	    .$item."','parmform.pres','psub'".');">Select</a></td>'.
+	   '<td>'.$colortypes{$item}.'<td><input name="'.$item.
+        '" class="colorchooser"  size="10" value="'.$curcol.
+'" /></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');
+    my $colorchooser=&Apache::lonhtmlcommon::color_picker();
+    $r->print('<script type="text/javascript" language="JavaScript">
+' . $colorchooser . '
+</script>
+');
     $r->print(<<ENDCOL);
-<script type="text/javascript">
-
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
-    $pjump_def
-
-    function psub() {
-        pclose();
-        if (document.parmform.pres_marker.value!='') {
-            if (document.parmform.pres_type.value!='') {
-                eval('document.prefs.'+
-                     document.parmform.pres_marker.value+
-		     '.value=document.parmform.pres_value.value;');
-	    }
-        } else {
-            document.parmform.pres_value.value='';
-            document.parmform.pres_marker.value='';
-        }
-    }
 
-
-</script>
-<form name="parmform">
+<form name="parmform" action="">
 <input type="hidden" name="pres_marker" />
 <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />
@@ -719,8 +1229,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
 }
@@ -730,38 +1242,43 @@ 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) {
+    foreach my $item (keys(%colortypes)) {
         my $color=$env{'form.'.$item};
+	if (!($color =~ /^#/)) {
+	    $color = '#' . $color;
+	}
         my $entry='color.'.$function.'.'.$item;
 	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
 	    &Apache::lonnet::put('environment',{$entry => $color});
-	    &Apache::lonnet::appenv('environment.'.$entry => $color);
-	    $message.='Set '.$colortypes{$item}.' to '.$color.'<br />';
+	    &Apache::lonnet::appenv({'environment.'.$entry => $color});
+            $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.='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);
+    &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);
 }
 
 ######################################################
@@ -772,7 +1289,20 @@ sub passwordchanger {
     # This function is a bit of a mess....
     # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');
-    my ($user,$domain,$currentpass,$defdom);
+    my ($user,$domain,$currentpass);
+    &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'));
+    }
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('passwd');
+    if ($blocked) {
+        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+        return;
+    }
     if ((!defined($caller)) || ($caller eq 'preferences')) {
         $user = $env{'user.name'};
         $domain = $env{'user.domain'};
@@ -780,10 +1310,14 @@ sub passwordchanger {
             $caller = 'preferences';
         }
     } elsif ($caller eq 'reset_by_email') {
-            $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(
+                    '<p class="LC_warning">'
+                   .&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>')
+                   .'</p>'
+                );
                 return;
             }
             if (defined($data{time})) {
@@ -792,15 +1326,32 @@ sub passwordchanger {
                     $domain = $data{'domain'};
                     $currentpass = $data{'temppasswd'};
                 } else {
-                    $r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />');
+                    $r->print(
+                        '<p class="LC_warning">'
+                       .&mt('Sorry, the token generated when you requested'
+                           .' a password reset has expired.')
+                       .'</p>'
+                    );
                     return;
                 }
             } else {
-                $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
+                $r->print(
+                    '<p class="LC_warning">'
+                   .&mt('Sorry, the URL generated when you requested reset of'
+                       .' your password contained incomplete information.')
+                   .'</p>'
+                );
                 return;
             }
-   } else {
-        $r->print(&mt('Page requested in unexpected context').'<br />');
+            if (&Apache::lonnet::domain($domain) eq '') {
+                $domain = $r->dir_config('lonDefDomain');
+            }
+    } else {
+        $r->print(
+            '<p class="LC_error">'
+           .&mt('Page requested in unexpected context')
+           .'</p>'
+        );
         return;
     }
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
@@ -808,9 +1359,9 @@ sub passwordchanger {
     return if ($currentauth !~ /^(unix|internal):/);
     #
     # Generate keys
-    my ($lkey_cpass ,$ukey_cpass ) = &des_keys();
-    my ($lkey_npass1,$ukey_npass1) = &des_keys();
-    my ($lkey_npass2,$ukey_npass2) = &des_keys();
+    my ($lkey_cpass ,$ukey_cpass ) = &Apache::loncommon::des_keys();
+    my ($lkey_npass1,$ukey_npass1) = &Apache::loncommon::des_keys();
+    my ($lkey_npass2,$ukey_npass2) = &Apache::loncommon::des_keys();
     # Store the keys in the log files
     my $lonhost = $r->dir_config('lonHostID');
     my $logtoken=Apache::lonnet::reply('tmpput:'
@@ -843,7 +1394,7 @@ $errormessage
      crappy browser -->
 ENDFORM
     $r->print(&server_form($logtoken,$caller,$mailtoken));
-    $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
+    $r->print(&client_form($caller,\%hexkey,$currentpass,$domain));
 
     #
     return;
@@ -852,7 +1403,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;
@@ -880,6 +1431,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|
@@ -892,48 +1445,48 @@ sub jscript_send {
 sub client_form {
     my ($caller,$hexkey,$currentpass,$defdom) = @_;
     my %lt=&Apache::lonlocal::texthash(
-                'email' => 'EMail Address',
+                'email' => 'E-mail Address',
                 'username' => 'Username',
                 'domain' => 'Domain',
                 '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" action="">'
+                .&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{'udom'}</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="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();
     } 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'}" />
@@ -942,7 +1495,7 @@ sub client_form {
 <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>
 </p>
-ENDFORM
+|;
     return $output;
 }
 
@@ -964,6 +1517,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="" />
 
 |;
     }
@@ -977,6 +1531,12 @@ sub server_form {
 sub verify_and_change_password {
     my ($r,$caller,$mailtoken) = @_;
     my ($user,$domain,$homeserver);
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('passwd');
+    if ($blocked) {
+        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+        return;
+    }
     if ($caller eq 'reset_by_email') {
         $user       = $env{'form.uname'};
         $domain     = $env{'form.udom'};
@@ -1046,32 +1606,39 @@ ENDERROR
     }
     my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
     # 
-    $currentpass = &des_decrypt($ckey ,$currentpass);
-    $newpass1    = &des_decrypt($n1key,$newpass1);
-    $newpass2    = &des_decrypt($n2key,$newpass2);
+    $currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);
+    $newpass1    = &Apache::loncommon::des_decrypt($n1key,$newpass1);
+    $newpass2    = &Apache::loncommon::des_decrypt($n2key,$newpass2);
     #
     if ($caller eq 'reset_by_email') {
         my %data = &Apache::lonnet::tmpget($mailtoken);
+        if (keys(%data) == 0) {
+            &passwordchanger($r,
+                         '<span class="LC_error">'.
+                         &mt('Could not verify current authentication.').'  '.
+                         &mt('Please try again.').'</span>',$caller,$mailtoken);
+            return 1;
+        }
         if ($currentpass ne $data{'temppasswd'}) {
             &passwordchanger($r,
                          '<span class="LC_error">'.
-                         &mt('Could not verify current authentication').'.  '.
-                         &mt('Please try again').'.</span>',$caller,$mailtoken);
+                         &mt('Could not verify current authentication.').'  '.
+                         &mt('Please try again.').'</span>',$caller,$mailtoken);
             return 1;
         }
     } 
     if ($newpass1 ne $newpass2) {
 	&passwordchanger($r,
-			 '<span class="LC_error">'.
-			 &mt('The new passwords you entered do not match').'.  '.
-			 &mt('Please try again').'.</span>',$caller,$mailtoken);
+			 '<span class="LC_warning">'.
+			 &mt('The new passwords you entered do not match.').'  '.
+			 &mt('Please try again.').'</span>',$caller,$mailtoken);
 	return 1;
     }
     if (length($newpass1) < 7) {
 	&passwordchanger($r,
-			 '<span class="LC_error">'.
-			 &mt('Passwords must be a minimum of 7 characters long').'.  '.
-			 &mt('Please try again').'</span>.',$caller,$mailtoken);
+			 '<span class="LC_warning">'.
+			 &mt('Passwords must be a minimum of 7 characters long.').'  '.
+			 &mt('Please try again.').'</span>',$caller,$mailtoken);
 	return 1;
     }
     #
@@ -1082,8 +1649,8 @@ ENDERROR
     }
     if ($badpassword) {
 	# I can't figure out how to enter bad characters on my browser.
-	my $errormessage ='<span class="LC_error">'.
-           &mt('The password you entered contained illegal characters').'.<br />'.
+	my $errormessage ='<span class="LC_warning">'.
+           &mt('The password you entered contained illegal characters.').'<br />'.
            &mt('Valid characters are').(<<"ENDERROR");
 : space and <br />
 <pre>
@@ -1099,13 +1666,29 @@ ENDERROR
     my $result = &Apache::lonnet::changepass
 	($user,$domain,$currentpass,$newpass1,$homeserver,$caller);
     # Inform the user the password has (not?) been changed
+    my $message;
     if ($result =~ /^ok$/) {
-	$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>'));
+        $message = &Apache::loncommon::confirmwrapper($message);
+        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
-        $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;
 }
@@ -1115,6 +1698,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('Change Discussion Preferences'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences'));
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
@@ -1128,7 +1716,7 @@ sub discussionchanger {
         }
     }
     if (defined($userenv{'discmarkread'})) {
-        unless ($userenv{'discdisplay'} eq '') { 
+        unless ($userenv{'discmarkread'} eq '') { 
             $discmark = $userenv{'discmarkread'};
         }
     }
@@ -1143,16 +1731,16 @@ sub discussionchanger {
         'pref' => 'Display Preference',
         'curr' => 'Current setting ',
         'actn' => 'Action',
-        'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.',
+        'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
         'prca' => 'Preferences can be set that determine',
-        'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and',
-        'unwh' => 'Under what circumstances posts are identfied as "New"',
+        'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
+        'unwh' => 'Under what circumstances posts are identified as "NEW"',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'ondisp' => 'Once displayed',
-        'onmark' => 'Once marked as read',
+        'onmark' => 'Once marked not NEW',
         'disa' => 'Posts displayed?',
-        'npmr' => 'New posts cease to be identified as "New"?',
+        '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 '
     );
@@ -1172,15 +1760,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>
@@ -1205,15 +1794,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 Changes" />
-<br />
-<br />
-Note: $lt{'thde'}
-</form>
-END
+
+    $r->print('<br />'
+             .'<input type="submit" name="sub" value="'.&mt('Save').'" />'
+             .'</form>'
+    );
 }
                                                                                                                 
 sub verify_and_change_discussion {
@@ -1224,30 +1809,29 @@ sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {
-            $message .='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);
+            &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
         } else {
-            $message .= '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.='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 cease to be identified as "NEW" after display.')).'<br />';
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
-            &Apache::lonnet::appenv('environment.discmarkread' => $newmark);
+            &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
         } else {
-            $message.='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 not "NEW".')).'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);
-            &Apache::lonnet::delenv('environment\.discmarkread');
+            &Apache::lonnet::delenv('environment.discmarkread');
         }
     }
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -1255,6 +1839,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']);
@@ -1268,14 +1857,21 @@ sub coursedisplaychanger {
 	    $whatsnewselect = '';
         }
     }
-    my %pagenames = (
+    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] in the course.','<b>first resource</b>');
-    my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</b>");
+    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]" page in the course',"<i>What's New</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" />
@@ -1283,7 +1879,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>');
 }
 
@@ -1296,18 +1892,18 @@ 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'}.', ';
     if ($newdisp eq 'firstres') {
         $message .= $lt{'ywbt'}.'<br />';
         &Apache::lonnet::put('environment',{'course_init_display' => $newdisp});
-        &Apache::lonnet::appenv('environment.course_init_display' => $newdisp);
+        &Apache::lonnet::appenv({'environment.course_init_display' => $newdisp});
     } 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'})) {
@@ -1316,18 +1912,339 @@ sub verify_and_change_coursepage {
             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; 
             my ($furl,$ferr)=
                 &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-            $message .= '<br /><font size="+1"><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a></font>';
+            $message .= '<br /><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a>';
         } else {
-            $message .= '<br /><font size="+1"><a href="/adm/whatsnew?refpage='.
-                        $refpage.'">'.$lt{'dasp'}.'</a></font>';
+            $message .= '<br /><a href="/adm/whatsnew?refpage='.
+                        $refpage.'">'.$lt{'dasp'}.'</a>';
         }
     }
-    $r->print(<<ENDVCSCREEN);
-$message
-<br /><br />
-ENDVCSCREEN
+    $message = &Apache::lonhtmlcommon::confirm_success($message);
+    $message = &Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
+}
+
+sub author_space_settings {
+    my $r = shift;
+    &Apache::lonhtmlcommon::add_breadcrumb(
+            {   href => '/adm/preferences?action=authorsettings',
+                text => 'Authoring Space Settings'});
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
+    if (keys(%author_roles) > 0) {
+            $r->print(Apache::loncommon::start_page('Authoring Space Settings'));
+            $r->print(Apache::lonhtmlcommon::breadcrumbs('Authoring Space Settings'));
+            my %userenv = &Apache::lonnet::get('environment',['nocodemirror']);
+            my $constchecked='';
+            if ($env{'environment.nocodemirror'}) {
+               $constchecked=' checked="checked"';
+            }
+            my $text=&mt('By default, CodeMirror an editor with advanced functionality for editing code is activated for authors.');
+            my $cmoff=&mt('Deactivate CodeMirror. This can improve performance on slow computers and accessibility.');
+            my $change=&mt('Save');
+            $r->print(<<ENDSCREEN);
+        <form name="prefs" action="/adm/preferences" method="post">
+        <input type="hidden" name="action" value="change_authoring_settings" />
+        $text<br />
+        <label><input type="checkbox" name="cmoff"$constchecked />$cmoff</label><br />
+        <input type="submit" value="$change" />
+        </form>
+ENDSCREEN
+    }
+}
+
+sub change_authoring_settings {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
+    if (keys(%author_roles) > 0) {
+            my %ausettings=('environment.nocodemirror' => '');
+            if ($env{'form.cmoff'}) { $ausettings{'environment.nocodemirror'}='yes'; }
+            &Apache::lonnet::put('environment',\%ausettings);
+            &Apache::lonnet::appenv({'environment.nocodemirror' => $ausettings{'environment.nocodemirror'}});
+            my $status='';
+            if ($ausettings{'environment.nocodemirror'} eq 'yes') {
+                $status=&mt('on');
+            } else {
+                $status=&mt('off');
+            }
+            my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Deactivate CodeMirror in Authoring Space').'</i>','<tt>'.$status.'</tt>'));
+            $message=&Apache::loncommon::confirmwrapper($message);
+            &print_main_menu($r,$message);
+    }
+}
+
+sub lockednameschanger {
+    my $r = shift;
+    &Apache::lonhtmlcommon::add_breadcrumb(
+            {   href => '/adm/preferences?action=changelockednames',
+                text => 'Automatic name changes'});
+    $r->print(Apache::loncommon::start_page('Automatic name changes'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Allow/disallow name updates'));
+    my %userenv = &Apache::lonnet::get('environment',['lockedname']);
+    my $lockedname='';
+    if (&can_toggle_namelocking()) {
+        if ($userenv{'lockedname'}) {
+            $lockedname = ' checked="checked"';
+        }
+        my %updateable;
+        my %domconfig =
+            &Apache::lonnet::get_dom('configuration',['autoupdate'],$env{'user.domain'});
+        if (ref($domconfig{'autoupdate'}) eq 'HASH') {
+            if ($domconfig{'autoupdate'}{'run'}) {
+                my @inststatuses = split(':',$env{'environment.inststatus'});
+                unless (@inststatuses) {
+                    @inststatuses = ('default');
+                }
+                %updateable = &updateable_userinfo($domconfig{'autoupdate'},\@inststatuses);
+            }
+        }
+        if (keys(%updateable)) {
+            my %longnames = &Apache::lonlocal::texthash (
+                                firstname  => 'First Name',
+                                middlename => 'Middle Name',
+                                lastname   => 'Last Name',
+                            );
+            my $text=&mt('By default, based on your institutional affiliation, your LON-CAPA account can be automatically updated nightly based on directory information from your institution.').'<br />'.&mt('The following may be updated, unless you disallow updates:').
+                     '<ul>';
+           foreach my $item ('firstname','middlename','lastname') {
+               if ($updateable{$item}) {
+                   $text .= '<li>'.$longnames{$item}.'</li>';
+               }
+           }
+           $text .= '</ul>'; 
+           my $locking=&mt('Disallow automatic updates to name information for your LON-CAPA account');
+           my $change=&mt('Save');
+           $r->print(<<ENDSCREEN);
+<form name="prefs" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_lockednames" />
+$text<br />
+<label><input type="checkbox" value="1" name="lockednames"$lockedname />$locking</label><br />
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+        } else {
+            my $message = &mt('Based on your institutional affiliation no name information is automatically updated for your LON-CAPA account.');
+            &print_main_menu($r,$message);
+        }
+    } else {
+        my $message = &mt('You are not permitted to set a user preference for automatic name updates for your LON-CAPA account.');
+        &print_main_menu($r,$message);
+    }
 }
 
+sub verify_and_change_lockednames {
+    my $r = shift;
+    my $message;
+    if (&can_toggle_namelocking()) {
+        my $newlockedname = $env{'form.lockednames'};
+        $newlockedname =~ s/\D//g;
+        my $currlockedname = $env{'environment.lockedname'};
+        if ($newlockedname ne $currlockedname) {
+            if ($newlockedname) {
+                if (&Apache::lonnet::put('environment',{lockedname => $newlockedname}) eq 'ok') {
+                    &Apache::lonnet::appenv({'environment.lockedname' => $newlockedname});
+                }
+            } elsif (&Apache::lonnet::del('environment',['lockedname']) eq 'ok') {
+                &Apache::lonnet::delenv('environment.lockedname');
+            }
+        }
+        my $status='';
+        if ($newlockedname) {
+            $status=&mt('disallowed');
+        } else {
+            $status=&mt('allowed');
+        }
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]','<i>'.&mt('Automatic update of first, middle and last names if institutional directory information indicates changes').'</i>','<tt>'.$status.'</tt>'));
+        $message=&Apache::loncommon::confirmwrapper($message);
+    }
+    &print_main_menu($r,$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=>'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 => $role.' Page',
+		url => '/adm/preferences?action=changerolespref',
+		permission => 'F',
+		#help => '',
+		icon => 'role_hotlist.png',
+		linktitle => 'Configure the roles hotlist.'
+	    },
+	    {	linktext => 'Math display settings',
+		url => '/adm/preferences?action=changetexenginepref',
+		permission => 'F',
+		#help => '',
+		icon => 'dismath.png',
+		linktitle => 'Change how math is displayed.'
+	    },
+		]
+    },
+    {	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 icons or icons and text.'
+            }
+		]
+    },
+    {	categorytitle=>'Messages &amp; Notifications',
+	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 => 'chat.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 (&can_toggle_namelocking()) {
+        push(@{ $menu[0]->{items} }, {
+        linktext => 'Automatic name changes',
+        url => '/adm/preferences?action=changelockednames',
+        permission => 'F',
+        #help => '',
+        icon => 'system-lock-screen.png',
+        linktitle => 'Allow/disallow propagation of name changes from institutional directory service',
+        });
+    }
+
+    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 => 'course_ini.png',
+	linktitle => 'Set the default page to be displayed when you select a course role.',
+	});
+
+    }
+
+    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
+    if (keys(%author_roles) > 0) {
+        push(@{ $menu[4]->{items} }, {
+            linktext => 'Authoring Space Configuration',
+            url => '/adm/preferences?action=authorsettings',
+            permission => 'F',
+            icon => 'course_ini.png',
+            linktitle => 'Settings for your authoring space.',
+        });
+    }
+
+    if (&can_toggle_debug()) {
+push(@{ $menu[4]->{items} }, {
+	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('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               #
@@ -1336,313 +2253,179 @@ ENDVCSCREEN
 ################################################################
 #                          Main handler                        #
 ################################################################
-sub handler {
+sub handler {    
     my $r = shift;
-    my $user = $env{'user.name'};
-    my $domain = $env{'user.domain'};
-    &Apache::loncommon::content_type($r,'text/html');
+    Apache::loncommon::content_type($r,'text/html');
     # Some pages contain DES keys and should not be cached.
-    &Apache::loncommon::no_cache($r);
+    Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
     #
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+    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'});
+    Apache::lonhtmlcommon::clear_breadcrumbs();
+    my ($brlink,$brtxt,$brhelp);
+    if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) {
+        $brlink ='/adm/roles';
+        $brtxt = 'User Roles';
+    } else {
+        $brlink ='/adm/preferences';
+        $brtxt = 'Set User Preferences';
+        $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';   
+    }
+    Apache::lonhtmlcommon::add_breadcrumb
+        ({href => $brlink,
+          text => $brtxt,
+          help => $brhelp,});
+    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 'authorsettings'){
+        &author_space_settings($r);
+    }elsif($env{'form.action'} eq 'change_authoring_settings'){
+        &change_authoring_settings($r);
+    }elsif($env{'form.action'} eq 'debugtoggle'){
+        if (&can_toggle_debug()) {
+            &toggle_debug();
+        }
+	&print_main_menu($r);
+    } elsif ($env{'form.action'} eq 'changelockednames') {
+        &lockednameschanger($r);
+    } elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {
+        &verify_and_change_lockednames($r);
+    }
+
+    # 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());
+    }
 
-    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 Email Addresses',
-                      href     => '/adm/preferences',
-                      help     => 'Prefs_Forwarding',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changemsgforward',
-                            text => 'Change Message Forwarding'},
-                      subroutine => \&msgforwardchanger,
-                      },
-                    { action => 'verify_and_change_msgforward',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changemsgforward',
-                            text => 'Change Message Forwarding'},
-                      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',
-                      }));
+    return OK;
+}
 
-    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|koretemey|korte|hallmat3|turtle|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'};
-        }
-    }
-    $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'});
+sub 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;
+}
+
+sub can_toggle_namelocking {
+    my $lockablenames;
+    my %domconfig =
+        &Apache::lonnet::get_dom('configuration',['autoupdate'],$env{'user.domain'});
+    if (ref($domconfig{'autoupdate'}) eq 'HASH') {
+        if ($domconfig{'autoupdate'}{'run'}) {
+            my @inststatuses = split(':',$env{'environment.inststatus'});
+            unless (@inststatuses) {
+                @inststatuses = ('default');
+            }
+            my %updateable = &updateable_userinfo($domconfig{'autoupdate'},\@inststatuses);
+            if ($updateable{'lastname'} || $updateable{'firstname'} ||
+                $updateable{'middlename'}) { 
+                if (ref($domconfig{'autoupdate'}{'lockablenames'}) eq 'ARRAY') {
+                    unless (@inststatuses) {
+                        @inststatuses = ('default');
+                    }
+                    foreach my $status (@inststatuses) {
+                        if (grep(/^\Q$status\E$/,@{$domconfig{'autoupdate'}{'lockablenames'}})) {
+                            $lockablenames = 1;
+                            last;
+                        }
+                    }
                 }
-                $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>');
     }
-    $r->print(&Apache::loncommon::end_page());
-    return OK;
+    return $lockablenames;
 }
 
-sub toggle_debug {
-    if ($env{'user.debug'}) {
-        &Apache::lonnet::delenv('user\.debug');
-    } else {
-        &Apache::lonnet::appenv('user.debug' => 1);
+sub updateable_userinfo {
+    my ($autoupdate,$inststatuses) = @_;
+    my %updateable;
+    return %updateable unless ((ref($autoupdate) eq 'HASH') && 
+                               (ref($inststatuses) eq 'ARRAY'));
+    if (ref($autoupdate->{'fields'}) eq 'HASH') {
+        foreach my $status (@{$inststatuses}) {
+            if (ref($autoupdate->{'fields'}{$status}) eq 'ARRAY') {
+                foreach my $field (@{$autoupdate->{'fields'}{$status}}) {
+                    $updateable{$field} = 1;
+                }
+            }
+        }
     }
+    return %updateable;
 }
 
 1;