--- loncom/interface/lonpreferences.pm	2021/12/14 00:30:54	1.196.4.28
+++ loncom/interface/lonpreferences.pm	2025/03/07 02:13:40	1.248
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.196.4.28 2021/12/14 00:30:54 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.248 2025/03/07 02:13:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,6 @@
 package Apache::lonpreferences;
 
 use strict;
-use LONCAPA;
 use Apache::Constants qw(:common);
 use Apache::File;
 use Apache::loncommon();
@@ -40,6 +39,7 @@ use Apache::lonlocal;
 use Apache::lonnet;
 use LONCAPA::lonauthcgi();
 use LONCAPA();
+use DateTime::TimeZone();
 
 ################################################################
 #                       Handler subroutines                    #
@@ -103,16 +103,17 @@ sub languagechanger {
 	    {	href => '/adm/preferences?action=changelanguages',
                 text => 'Change Language'});
     $r->print(Apache::loncommon::start_page('Content Display Settings'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language')); 
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language').
+              '<div class="LC_landmark" role="main">'); 
     my %userenv = &Apache::lonnet::get('environment',['languages']);
     my $language=$userenv{'languages'};
 
     $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>'
+        '<br /><span class="LC_nobreak"><label>'.&mt('Preferred language').':&nbsp;'.
+        &Apache::loncommon::select_language('language',$language,1).'</label></span>'."\n".
+        '<br /><input type="submit" value="'.&mt('Save').'" /></form></div>'
     );
 }
 
@@ -165,7 +166,7 @@ sub texenginechanger {
     my %mathchoices=('' => 'Default',
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
-                     'MathJax' => 'MathJax',
+		     'MathJax' => 'MathJax',
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
@@ -182,7 +183,7 @@ sub texenginechanger {
       '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.',
+      'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.',
       'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',
     );
@@ -192,8 +193,8 @@ sub texenginechanger {
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_texengine" />
 <p>
-$lt{'preftxt'}: $selectionbox 
-<br />
+<label>$lt{'preftxt'}: $selectionbox 
+</label><br />
 <input type="submit" value="$lt{'change'}" />
 </p>
 </form>
@@ -275,12 +276,13 @@ sub rolesprefchanger {
 	    {	href => '/adm/preferences?action=changerolespref',
                 text => $brtext});
     $r->print(Apache::loncommon::start_page('Content Display Settings'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs($brtitle));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs($brtitle).
+              '<div class="LC_landmark" role="main">');
     my $hotlist_flag=$userenv{'recentroles'};
     my $hotlist_n=$userenv{'recentrolesn'};
     my ($checkedon,$checkedoff);
     if ($hotlist_flag) {
-        $checkedon = 'checked="checked"'; 
+	$checkedon = 'checked="checked"';
     } else {
         $checkedoff = 'checked="checked"';
     }
@@ -294,49 +296,49 @@ sub rolesprefchanger {
     }
 
 # Get list of recent roles and display with checkbox in front
-    my $roles_check_list = '';
-    my $role_key='';
+    my $roles_check_list;
     if ($env{'environment.recentroles'}) {
         my %recent_roles =
                &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
         my %frozen_roles =
                &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
-        
+
         my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
         my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text);
 
-        $roles_check_list .=
-	    &Apache::loncommon::start_data_table().
-	    &Apache::loncommon::start_data_table_header_row().
-	    "<th>".&mt('Freeze '.$role)."</th>".
-	    "<th>".&mt($role)."</th>".
-	    &Apache::loncommon::end_data_table_header_row().
-	    "\n";
-	my $count;
-        foreach $role_key (@sorted_roles) {
-            my $checked = "";
-            my $value = $recent_roles{$role_key};
-            if ($frozen_roles{$role_key}) {
-                $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\"".
-		" id=\"freezeroles$count\" value=\"$role_key\" /></td>".
-		"<td><label for=\"freezeroles$count\">".
-		"$role_text{$role_key}</label></td>".
-		&Apache::loncommon::end_data_table_row(). "\n";
+        if (@sorted_roles) {
+            $roles_check_list =
+	        &Apache::loncommon::start_data_table().
+	        &Apache::loncommon::start_data_table_header_row().
+	        "<th>".&mt('Freeze '.$role)."</th>".
+	        "<th>".&mt($role)."</th>".
+	        &Apache::loncommon::end_data_table_header_row()."\n";
+	    my $count = 0;
+            foreach my $role_key (@sorted_roles) {
+                my $checked = "";
+                my $value = $recent_roles{$role_key};
+                if ($frozen_roles{$role_key}) {
+                    $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\"".
+		    " id=\"freezeroles$count\" value=\"$role_key\" /></td>".
+		    "<td><label for=\"freezeroles$count\">".
+		    "$role_text{$role_key}</label></td>".
+		    &Apache::loncommon::end_data_table_row(). "\n";
+            }
+            $roles_check_list .= &Apache::loncommon::end_data_table."\n";
         }
-        $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>');
+    $r->print('<h2 class="LC_heading_2">'.&mt('Recent Roles Hotlist').'</h2>');
     unless ($checkedon) {
         $r->print(&mt('LON-CAPA users with several '.$lc_role.'s may wish to enable the Hotlist.').'<br />');
     }
@@ -344,7 +346,7 @@ sub rolesprefchanger {
 <form name="prefs" action="'.$actionurl.'" method="post">
 <input type="hidden" name="action" value="verify_and_change_rolespref" />
 <input type="hidden" name="returnurl" value="'.$env{'form.returnurl'}.'" />
-<div class="LC_left_float"><h4>'.&mt('Hotlist options').'</h4>
+<div class="LC_left_float"><h3 class="LC_heading_3">'.&mt('Hotlist options').'</h3>
 <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>'.
@@ -365,7 +367,7 @@ $options.'
 </div>');
     if ($roles_check_list) {
         $r->print('<div class="LC_left_float">
-<h4>'.&mt('Freeze Roles').'</h4>
+<h3 class="LC_heading_3">'.&mt('Freeze Roles').'</h3>
 <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>
@@ -378,7 +380,7 @@ $options.'
      $r->print('
 <br clear="all" />
 <input type="submit" value="'.&mt('Save').'" />
-</form>');
+</form></div>');
 }
 
 sub rolespref_get_role_text {
@@ -491,24 +493,22 @@ sub screennamechanger {
                   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('<div class="LC_landmark" role="main">');
+    my $caption = &mt('Name displayed in posts you make').':';            
     $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" />'
+             .'<p><input type="hidden" name="action" value="verify_and_change_screenname" />'
+             .&Apache::lonhtmlcommon::start_pick_box(undef,undef,$caption,'LC_caption_prefs')
+             .&Apache::lonhtmlcommon::row_title('<label for="screenname">'.&mt('Screenname').'</label> '.&mt('(shown if you post anonymously)'))
+             .'<input type="text" size="20" value="'.$screenname.'" name="screenname" id="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_title('<label for="nickname">'.&mt('Nickname').'</label> '.&mt('(shown if you post non-anonymously)'))
+             .'<input type="text" size="20" value="'.$nickname.'" name="nickname" id="nickname" />'
              .&Apache::lonhtmlcommon::row_closure()
-             .&Apache::lonhtmlcommon::row_title()
+             .&Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.&mt('Submit').':</span>','','','',1)
              .'<input type="submit" value="'.&mt('Save').'" />'
              .&Apache::lonhtmlcommon::row_closure(1)
              .&Apache::lonhtmlcommon::end_pick_box()
-             .'</form>'
+             .'</p></form></div>'
     );
 }
 
@@ -556,7 +556,8 @@ sub iconchanger {
             {   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'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Menu Display').
+              '<div class="LC_landmark" role="main">');
 
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
@@ -591,14 +592,19 @@ sub iconchanger {
                       '<ul>'.
                       $iconic_preview.
                       '</ul></li></ul>'; 
+    my $title = &mt('Use of icons and text');
     $r->print(<<ENDSCREEN);
 $classic
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_icons" />
+<fieldset style="display:inline;"><legend>$title</legend>
 <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 />
+</fieldset>
+<p>
 <input type="submit" value="$change" />
-</form>
+</p>
+</form></div>
 ENDSCREEN
 }
 
@@ -657,7 +663,8 @@ sub clickerchanger {
 	    {	href => '/adm/preferences?action=changeclicker',
                 text => 'Register Clicker'});
     $r->print(Apache::loncommon::start_page('Other'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Register Clicker'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Register Clicker').
+              '<div class="LC_landmark" role="main">');
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
@@ -668,14 +675,17 @@ sub clickerchanger {
     my $change=&mt('Save');
     my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration',&mt('Locating your clicker ID'));
     $r->print(<<ENDSCREEN);
+<br />
 <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 />
+<p>
 <input type="submit" value="$change" />
+</p>
 </form>
+</div>
 ENDSCREEN
 }
 
@@ -683,16 +693,51 @@ 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/\,$//;
-    &Apache::lonnet::put('environment',{'clickers' => $newclickers});
-    &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
-    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+    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);
 }
@@ -813,14 +858,24 @@ sub msgforwardchanger {
                                           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',
+                                          acti => 'Action',
+                                          type => 'Types of message for which notification is sent',
+                                          nota => 'Notification address',
+                                          exce => 'Excerpt retains HTML tags in message',
+                                          modi => 'Modify',
+                                          dele => 'Delete',
+                                          addn => 'Add new address',
+                                          yes  => 'Yes',
+                                          no   => 'No',
                                         );
     $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'});
+		text => 'Messages &amp; Notifications'});
     $r->print(Apache::loncommon::start_page('Messages &amp; Notifications'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages &amp; Notifications'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages &amp; Notifications').
+              '<div class="LC_landmark" role="main">');
     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");
@@ -829,6 +884,7 @@ sub msgforwardchanger {
     my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();
     my $jscript = qq|
 <script type="text/javascript" language="JavaScript">
+// <![CDATA[
 function validate() {
     for (var i=0; i<document.prefs.numnotify.value; i++) {
         var checkaddress = 0;
@@ -881,46 +937,48 @@ function modify_address(adnum) {
 } 
 
 $validatescript
+
+// ]]>
 </script>
 |;
     $r->print(<<ENDMSG);
 $jscript
 $message
-<h3>$lt{'fwdm'} $forwardingHelp</h3>
+<h2 class="LC_heading_2">$lt{'fwdm'} $forwardingHelp</h2>
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_msgforward" />
-$lt{'foad'} ($lt{'foad_exmpl'}):
-<input type="text" size="40" value="$msgforward" name="msgforward" />
-<br /><br />
-<h3>$lt{'noti'} $notificationHelp</h3>
-$lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
+<label for="msgforward">$lt{'foad'}</label> ($lt{'foad_exmpl'}):
+<input type="text" size="40" value="$msgforward" name="msgforward" id="msgforward" />
+<p />
+<h2 class="LC_heading_2">$lt{'noti'} $notificationHelp</h2>
+<span id="LC_email_notify">$lt{'mnot'}</span> ($lt{'mnot_exmpl'}):<br />
 ENDMSG
-    my @sortforwards = sort (keys(%allnot));
+    my @sortnotify = 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').
+                 '<th>#</th>'.
+                 '<th>'.$lt{'acti'}.'</th>'.
+                 '<th>'.$lt{'nota'}.'</th><th>'.
+                 $lt{'type'}.
                  $criticalMessageHelp.'</th><th>'.
-                 &mt('Excerpt retains HTML tags in message').'</th>'.
+                 $lt{'exce'}.'</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().
+    foreach my $item (@sortnotify) {
+        $output .= &Apache::loncommon::start_data_table_row('LC_prefs_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; '.
+                   $lt{'modi'}.'</label></span> '.('&nbsp;' x2).
                    '<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_'.
+                   $lt{'dele'}.'</label></span></td>'.
+                   '<td><span style="padding: 10px;"><input type="text" value="'.$item.'" name="address_'.
                    $num.'" onfocus="javascript:address_changes('."'$num'".
-                   ')" /></td><td>';
+                   ')" aria-labelledby="LC_email_notify" /></span></td><td>';
         my %chk;
         if (defined($allnot{$item}{'crit'})) {
             if (defined($allnot{$item}{'reg'})) {
@@ -931,13 +989,15 @@ ENDMSG
         } else {
             $chk{'reg'} = 'checked="checked" ';
         }
+        $output .= '<fieldset class="LC_landmark" style="display:inline"><legend class="LC_visually_hidden">'.$lt{'type'}.'</legend>';
         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);
+                       $lt{$type}.'</label></span> '.('&nbsp;' x2);
         }
+        $output .= '</fieldset>';
         my $htmlon = '';
         my $htmloff = '';
         if (grep/^\Q$item\E/,@allow_html) {
@@ -945,14 +1005,16 @@ ENDMSG
         } else {
             $htmloff = 'checked="checked" ';
         }
-        $output .= '</td><td><label><input type="radio" name="html_'.$num.
+        $output .= '</td><td>'.
+                   '<fieldset class="LC_landmark" style="display:inline"><legend class="LC_visually_hidden">'.$lt{'exce'}.'</legend>'.
+                   '<label><input type="radio" name="html_'.$num.
                    '" value="1" '.$htmlon.
                    ' onchange="javascript:address_changes('."'$num'".')" />'.
-                   &mt('Yes').'</label>'.('&nbsp;' x3).
+                   $lt{'yes'}.'</label> '.('&nbsp;' x2).
                    '<label><input type="radio" name="html_'.$num.'" value="0" '.
                    $htmloff. ' onchange="javascript:address_changes('."'$num'".
 ')" />'.
-                   &mt('No').'</label></td>'.
+                   $lt{'no'}.'</label></fieldset></td>'.
                    &Apache::loncommon::end_data_table_row();
         $num ++;
         $counter ++;
@@ -962,24 +1024,27 @@ ENDMSG
                    crit => '',
                    reg => '',
                  );
-    $output .= &Apache::loncommon::start_data_table_row().
+    $output .= &Apache::loncommon::start_data_table_row('LC_prefs_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>';
+               '" value="1" />'.$lt{'addn'}.'</label></span></td>'.
+               '<td><span style="padding: 10px;"><input type="text" value="" name="address_'.$num.
+               '" onfocus="javascript:new_address('."'$num'".')" aria-labelledby="LC_email_notify" /></span></td><td>';
+    $output .= '<fieldset class="LC_landmark" style="display:inline"><legend class="LC_visually_hidden">'.$lt{'type'}.'</legend>';
     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);
+                   $lt{$type}.'</label></span> '.('&nbsp;' x2);
     }
-    $output .= '</td><td><label><input type="radio" name="html_'.$num.
-               '" value="1" />'.&mt('Yes').'</label>'.('&nbsp;' x3).
+    $output .= '</fieldset></td><td>'.
+               '<fieldset class="LC_landmark" style="display:inline"><legend class="LC_visually_hidden">'.$lt{'exce'}.'</legend>'.
+               '<label><input type="radio" name="html_'.$num.
+               '" value="1" />'.$lt{'yes'}.'</label> '.('&nbsp;' x2).
                '<label><input type="radio" name="html_'.$num.'" value="0" '.
                ' checked="checked" />'.
-               &mt('No').'</label></td>'.
+               $lt{'no'}.'</label></fieldset></td>'.
                &Apache::loncommon::end_data_table_row().
                &Apache::loncommon::end_data_table();
     $num ++;
@@ -989,7 +1054,7 @@ ENDMSG
 <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>
+</form></div>
 |);
 
 }
@@ -1123,7 +1188,8 @@ sub colorschanger {
 	    {	href => '/adm/preferences?action=changecolors',
                 text => 'Change Colors'});
     $r->print(Apache::loncommon::start_page('Page Display Settings'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Colors'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Colors').
+              '<div class="LC_landmark" role="main">');
 # figure out colors
     my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
@@ -1137,15 +1203,20 @@ sub colorschanger {
         'vlink'    => 'Visited Link Color',
         'alink'    => 'Active Link Color',
     );
-    my $start_data_table = &Apache::loncommon::start_data_table();
+    my $start_data_table = &Apache::loncommon::start_data_table().
+                           &Apache::loncommon::data_table_caption(&mt('Colors for LON-CAPA pages')).
+                           &Apache::loncommon::start_data_table_header_row().
+                           '<th>'.&mt('Page Element').'</th><th>'.&mt('Color').'</th>'.
+                           &Apache::loncommon::end_data_table_header_row();
     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><input name="'.$item.
-                 '" class="colorchooser"  size="10" value="'.$curcol.
-                 '" /></td>'.
-	         &Apache::loncommon::end_data_table_row()."\n";
+	   '<td><label for="'.$item.'">'.$colortypes{$item}.'</label></td>'.
+	   '<td><input name="'.$item.
+        '" class="colorchooser" id="'.$item.'" 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();
@@ -1154,7 +1225,8 @@ sub colorschanger {
     my $resetbuttondesc = &mt('Reset All Colors to Default');
     my $colorchooser=&Apache::lonhtmlcommon::color_picker();
     $r->print('<script type="text/javascript" language="JavaScript">
-' . $colorchooser . '
+// <![CDATA[' ."\n". $colorchooser . "\n". '
+// ]]>
 </script>
 ');
     $r->print(<<ENDCOL);
@@ -1164,6 +1236,7 @@ sub colorschanger {
 <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />
 </form>
+<br />
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_colors" />
 $start_data_table
@@ -1174,7 +1247,7 @@ $end_data_table
 <input type="submit" value="$savebutton" />
 <input type="submit" name="resetall" value="$resetbutton" title="$resetbuttondesc" />
 </p>
-</form>
+</form></div>
 ENDCOL
 }
 
@@ -1197,9 +1270,9 @@ sub verify_and_change_colors {
     my $message='';
     foreach my $item (keys(%colortypes)) {
         my $color=$env{'form.'.$item};
-        if (!($color =~ /^#/)) {
-            $color = '#' . $color;
-        }
+	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});
@@ -1237,7 +1310,8 @@ sub passwordchanger {
                   text => 'Change Password'});
     unless ($caller eq 'reset_by_email') {
         $r->print(Apache::loncommon::start_page('Personal Data'));
-        $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
+        $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password').
+                  '<div class="LC_landmark" role="main">');
     }
     if ((!defined($caller)) || ($caller eq 'preferences')) {
         $user = $env{'user.name'};
@@ -1248,7 +1322,7 @@ sub passwordchanger {
         my ($blocked,$blocktext) =
             &Apache::loncommon::blocking_status('passwd',$clientip);
         if ($blocked) {
-            $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+            $r->print('<p class="LC_warning">'.$blocktext.'</p></div>');
             return;
         }
     } elsif ($caller eq 'reset_by_email') {
@@ -1285,9 +1359,9 @@ sub passwordchanger {
         } else {
             $r->print(
                 '<p class="LC_warning">'
-                .&mt('Sorry, the URL generated when you requested reset of'
-                    .' your password contained incomplete information.')
-                .'</p>'
+               .&mt('Sorry, the URL generated when you requested reset of'
+                   .' your password contained incomplete information.')
+               .'</p>'
             );
             return;
         }
@@ -1298,13 +1372,18 @@ sub passwordchanger {
         $r->print(
             '<p class="LC_error">'
            .&mt('Page requested in unexpected context')
-           .'</p>'
+           .'</p></div>'
         );
         return;
     }
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
     # Check for authentication types that allow changing of the password.
-    return if ($currentauth !~ /^(unix|internal):/);
+    if ($currentauth !~ /^(unix|internal):/) {
+        unless ($caller eq 'reset_by_email') {
+            $r->print('</div>');
+        }
+        return;
+    }
     #
     # Generate keys
     my ($lkey_cpass ,$ukey_cpass ) = &Apache::loncommon::des_keys();
@@ -1336,14 +1415,16 @@ sub passwordchanger {
     $r->print(<<ENDFORM);
 $errormessage
 
-<p>
+<p></p>
 <!-- We separate the forms into 'server' and 'client' in order to
      ensure that unencrypted passwords will not be sent out by a
      crappy browser -->
 ENDFORM
     $r->print(&server_form($logtoken,$caller,$mailtoken,$extrafields));
     $r->print(&client_form($caller,\%hexkey,$currentpass,$domain,$extrafields));
-
+    unless ($caller eq 'reset_by_email') {
+        $r->print('</div>');
+    }
     #
     return;
 }
@@ -1402,7 +1483,7 @@ sub jscript_send {
             var posspass = this.document.client.elements.newpass_1.value;
             if (min > 0) {
                 if (posspass.length < min) {
-                    errors.push("$js_lt{'short'}"); 
+                    errors.push("$js_lt{'short'}");
                 }
             }
             if (currauth == 'internal:') {
@@ -1431,7 +1512,7 @@ sub jscript_send {
                         } else if (rules[i] == 'spec') {
                             var pattern = /^[!@#$%^&*()_+\\-=\\[\\]{};':"\\\|,.<a>\\/?]/;
                             if (!posspass.match(pattern)) {
-                                errors.push("$js_lt{'spec'}"); 
+                                errors.push("$js_lt{'spec'}");
                             }
                         }
                     }
@@ -1445,7 +1526,7 @@ sub jscript_send {
 ENDJS
     my $output = qq|
 <script type="text/javascript" language="JavaScript">
-
+// <![CDATA[
     function send() {
 $passwdcheck
         uextkey=this.document.client.elements.ukey_cpass.value;
@@ -1484,6 +1565,7 @@ $passwdcheck
         this.document.pserver.submit();
     }
 
+// ]]>
 </script>
 |;
 }
@@ -1522,16 +1604,16 @@ sub client_form {
     } else {
         $output .= &Apache::lonhtmlcommon::row_title(
                        '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
-                  .'<input type="password" name="currentpass" size="20"/>'
+                  .'<input type="password" name="currentpass" id="currentpass" size="20" />'
                   .&Apache::lonhtmlcommon::row_closure();
     }
     $output .= &Apache::lonhtmlcommon::row_title(
                    '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
-              .'<input type="password" name="newpass_1" size="20" />'
+              .'<input type="password" name="newpass_1" id="newpass_1" size="20" />'
               .&Apache::lonhtmlcommon::row_closure()
               .&Apache::lonhtmlcommon::row_title(
                    '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
-              .'<input type="password" name="newpass_2" size="20" />'
+              .'<input type="password" name="newpass_2" id="newpass_2" size="20" />'
               .&Apache::lonhtmlcommon::row_closure(1)
               .&Apache::lonhtmlcommon::end_pick_box();
     if ($caller eq 'reset_by_email') {
@@ -1546,7 +1628,6 @@ sub client_form {
 <input type="hidden" name="ukey_npass2" value="$hexkey->{'ukey_npass2'}" />
 <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>
-</p>
 |;
     return $output;
 }
@@ -1725,10 +1806,10 @@ ENDERROR
     } else {
         my $warning = &Apache::loncommon::check_passwd_rules($domain,$newpass1);
         if ($warning) {
-	    &passwordchanger($r,'<span class="LC_warning">'.
-                             $warning.
-			     &mt('Please try again.').'</span>',
-                             $caller,$mailtoken,$timelimit,$extrafields);
+            &passwordchanger($r,'<span class="LC_warning">'.
+                            $warning.
+                            &mt('Please try again.').'</span>',
+                            $caller,$mailtoken,$timelimit,$extrafields);
             if ($caller eq 'reset_by_email') {
                 return 'rules';
             } else {
@@ -1813,7 +1894,8 @@ sub discussionchanger {
 	    {	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'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences').
+              '<div class="LC_landmark" role="main">');
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
@@ -1881,15 +1963,15 @@ END
 
     $r->print('<p class="LC_info">'.$lt{'thde'}.'</p>');
 
-    $r->print(&Apache::loncommon::start_data_table());
+    $r->print(&Apache::loncommon::start_data_table().
+              &Apache::loncommon::start_data_table_header_row());
     $r->print(<<"END");
-       <tr>
         <th>$lt{'pref'}</th>
         <th>$lt{'curr'}</th>
         <th>$lt{'actn'}?</th>
-       </tr>
 END
-    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(&Apache::loncommon::end_data_table_header_row().
+              &Apache::loncommon::start_data_table_row());
     $r->print(<<"END");
        <td>$lt{'disa'}</td>
        <td>$lt{$discdisp}</td>
@@ -1901,14 +1983,13 @@ END
        <td>$lt{'npmr'}</td>
        <td>$lt{$discmark}</td>
        <td><label><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</label></td>
-      </tr>
 END
     $r->print(&Apache::loncommon::end_data_table_row().
 	      &Apache::loncommon::end_data_table());
 
     $r->print('<br />'
              .'<input type="submit" name="sub" value="'.&mt('Save').'" />'
-             .'</form>'
+             .'</form></div>'
     );
 }
                                                                                                                 
@@ -2043,9 +2124,117 @@ sub author_space_settings {
     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 ($showdomdefs,$js,$args,@items);
+        my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\'');
+        if (&expanded_authoring_settings()) {
+            @items = ('nocodemirror');
+            if (&daxe_permitted(\%author_roles)) {
+                push(@items,'daxecollapse');
+            }
+            push(@items,('copyright','sourceavail'));
+            $showdomdefs = 1;
+            $js = &toggle_options_js();
+            my $onload;
+            foreach my $item (@items) {
+                $onload .= "javascript:toggleOptions(document.prefs,'$item','user_$item');"
+            }
+            $args = { 'add_entries' => { 'onload' => $onload } };
+        }
+        $r->print(Apache::loncommon::start_page('Authoring Space Settings',$js,$args));
+        $r->print(Apache::lonhtmlcommon::breadcrumbs('Authoring Space Settings'));
+        if ($showdomdefs) {
+            my %userenv = &Apache::lonnet::get('environment',\@items);
+            my %domdefs = &Apache::lonnet::get_domain_defaults($domain);
+            my %staticdefaults = (
+                            'nocodemirror'  => '0',
+                            'daxecollapse'  => '0',
+                            'copyright'     => 'default',
+                            'sourceavail'   => 'closed',
+            );
+            my %lt = &authoring_settings_text();
+            my %titles = &authoring_settings_titles();
+            $r->print("<h3>$lt{'auss'}</h3>".
+                      '<form name="prefs" action="/adm/preferences" method="post">'."\n".
+                      '<input type="submit" value="'.$lt{'save'}.'" /><br /><hr />'."\n".
+                      '<input type="hidden" name="returnurl" value="'.$returnurl.'" />'."\n".
+                      '<input type="hidden" name="action" value="change_authoring_settings" />'."\n");
+            foreach my $item (@items) {
+                my ($domdef,$checkeddom,$checkeduser,$domdefdisplay,$divsty,$userelem);
+                $checkeddom = ' checked="checked"';
+                $divsty = 'display:none';
+                if (exists($domdefs{$item})) {
+                    $domdef = $domdefs{$item};
+                } else {
+                    $domdef = $staticdefaults{$item};
+                }
+                if ($item eq 'copyright') {
+                    $domdefdisplay = &Apache::loncommon::copyrightdescription($domdef);
+                    $userelem = &selectbox('userchoice_'.$item,$userenv{$item},'',
+                                           \&Apache::loncommon::copyrightdescription,
+                                           (grep !/^priv|custom$/,(&Apache::loncommon::copyrightids)));
+                } elsif ($item eq 'sourceavail') {
+                    $domdefdisplay = &Apache::loncommon::source_copyrightdescription($domdef);
+                    $userelem = &selectbox('userchoice_'.$item,$userenv{$item},'',
+                                           \&Apache::loncommon::source_copyrightdescription,
+                                           (&Apache::loncommon::source_copyrightids));
+                } elsif (($item eq 'nocodemirror') || ($item eq 'daxecollapse')) {
+                    if ($domdef) {
+                        if ($item eq 'daxecollapse') {
+                            $domdefdisplay = $lt{'coll'};
+                        } else {
+                            $domdefdisplay = $lt{'yes'};
+                        }
+                    } else {
+                        if ($item eq 'daxecollapse') {
+                            $domdefdisplay = $lt{'expa'};
+                        } else {
+                            $domdefdisplay = $lt{'no'};
+                        }
+                    }
+                    my (%checked,%text);
+                    $checked{'no'} = ' checked="checked"';
+                    if ($userenv{$item} eq 'yes') {
+                        $checked{'yes'} = $checked{'no'};
+                        $checked{'no'} = '';
+                    }
+                    if ($item eq 'daxecollapse') {
+                        %text = (
+                                 yes => $lt{'coll'},
+                                 no  => $lt{'expa'},
+                               );
+                    } else {
+                        %text = (
+                                 yes => $lt{'yes'},
+                                 no  => $lt{'no'},
+                               );
+                    }
+                    $userelem = '<span class="LC_nobreak">';
+                    foreach my $choice ('yes','no') {
+                        $userelem .= '<label><input type="radio" name="userchoice_'.$item.'" value="'.$choice.'"'.
+                                     $checked{$choice}.' />'.$text{$choice}.'</label>&nbsp;&nbsp;&nbsp;';
+                    }
+                    $userelem .= '</span>';
+                }
+                if ($userenv{$item} ne '') {
+                    $checkeduser = $checkeddom;
+                    $checkeddom = '';
+                    $divsty = 'display:inline-block';
+                }
+                $r->print(<<"END");
+<h3 class="LC_heading_3"><span class="LC_nobreak">$titles{$item}</span></h3>
+<p class="LC_nobreak">$lt{'curd'}: <span style="font-style:italic">$domdefdisplay</span></p>
+<p class="LC_nobreak">
+<label><input type="radio" name="$item" value="dom" onclick="toggleOptions(this.form,'$item','user_$item');"$checkeddom />$lt{'used'}</label>&nbsp;&nbsp;&nbsp;
+<label><input type="radio" name="$item" value="user" onclick="toggleOptions(this.form,'$item','user_$item');"$checkeduser />$lt{'usyo'}</label></p>
+<fieldset id="user_$item" style="$divsty">
+<legend style="font-weight:normal;font-style:italic;">$lt{'ousv'}</legend>
+$userelem
+</fieldset><br /><hr />
+END
+            }
+            $r->print('<input type="submit" value="'.$lt{'save'}.'" />'.
+                      '</form>'."\n");
+        } else {
             my $constchecked='';
             if ($env{'environment.nocodemirror'}) {
                $constchecked=' checked="checked"';
@@ -2053,7 +2242,6 @@ sub author_space_settings {
             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');
-            my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\'');
             $r->print(<<ENDSCREEN);
         <form name="prefs" action="/adm/preferences" method="post">
         <input type="hidden" name="returnurl" value="$returnurl" />
@@ -2063,6 +2251,7 @@ sub author_space_settings {
         <input type="submit" value="$change" />
         </form>
 ENDSCREEN
+        }
     }
 }
 
@@ -2072,6 +2261,8 @@ sub change_authoring_settings {
     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 $message;
+        if (!&expanded_authoring_settings()) {
             my %ausettings=('environment.nocodemirror' => '');
             if ($env{'form.cmoff'}) { $ausettings{'environment.nocodemirror'}='yes'; }
             &Apache::lonnet::put('environment',\%ausettings);
@@ -2082,25 +2273,195 @@ sub change_authoring_settings {
             } 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::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Deactivate CodeMirror in Authoring Space').'</i>','<tt>'.$status.'</tt>'));
             $message=&Apache::loncommon::confirmwrapper($message);
-            if ($env{'form.returnurl'}) {
-                &do_redirect($r,$env{'form.returnurl'},$message);
+        } else {
+            my @items = ('nocodemirror');
+            if (&daxe_permitted(\%author_roles)) {
+                push(@items,'daxecollapse');
+            }
+            push(@items,('copyright','sourceavail'));
+            my %oldsettings = &Apache::lonnet::get('environment',\@items);
+            my %domdefs = &Apache::lonnet::get_domain_defaults($domain);
+            my %lt = &authoring_settings_text();
+            my %titles = &authoring_settings_titles();
+            my ($result,%newsettings,%changes,@delete,@unchanged,@delerrors,@adderrors);
+            foreach my $item (@items) {
+                if ($env{'form.'.$item} eq 'dom') {
+                    if ($oldsettings{$item} eq '') {
+                        push(@unchanged,$item);
+                    } else {
+                        push(@delete,$item);
+                    }
+                } elsif ($env{'form.'.$item} eq 'user') {
+                    my $newval = $env{'form.userchoice_'.$item};
+                    my @possibles;
+                    if (($item eq 'nocodemirror') || ($item eq 'daxecollapse')) {
+                        if ($newval =~ /^yes|no$/) {
+                            $newsettings{$item} = $newval;
+                        }
+                    } elsif ($item eq 'copyright') {
+                        @possibles = (grep !/^priv|custom$/,(&Apache::loncommon::copyrightids));
+                        if (grep(/^\Q$newval\E$/,@possibles)) {
+                            $newsettings{$item} = $newval;
+                        }
+                    } elsif ($item eq 'sourceavail') {
+                        @possibles = (&Apache::loncommon::source_copyrightids);
+                        if (grep(/^\Q$newval\E$/,@possibles)) {
+                            $newsettings{$item} = $newval;
+                        }
+                    }
+                    if ($oldsettings{$item} eq $newsettings{$item}) {
+                        push(@unchanged,$item);
+                    } else {
+                        $changes{$item} = $newsettings{$item};
+                    }
+                }
+            }
+            if (@delete) {
+                if (&Apache::lonnet::del('environment',\@delete) eq 'ok') {
+                    foreach my $key (@delete) {
+                        &Apache::lonnet::delenv('environment.'.$key);
+                    }
+                } else {
+                    @delerrors = @delete;
+                }
+            }
+            if (keys(%changes)) {
+                if (&Apache::lonnet::put('environment',\%changes) eq 'ok') {
+                    my %newenvhash;
+                    map {$newenvhash{'environment.'.$_} = $changes{$_}; } (keys(%changes));
+                    &Apache::lonnet::appenv(\%newenvhash);
+                } else {
+                    foreach my $item (@items) {
+                        if (exists($changes{$item})) {
+                            push(@adderrors,$item);
+                        }
+                    }
+                }
+            }
+            if (@adderrors) {
+                $result = &mt('An error occurred when saving user-specific settings for').': '.
+                          join(', ', map { $titles{$_} } @adderrors);
+                $message = &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result,1));
+            } elsif (keys(%changes)) {
+                $result = &mt('User-specific settings saved:').'<ul>';
+                foreach my $item (@items) {
+                    next unless (exists($changes{$item}));
+                    my $value = $changes{$item};
+                    if ($item eq 'nocodemirror') {
+                        $value = $lt{$changes{$item}};
+                    } elsif ($item eq 'daxecollapse') {
+                        if ($value eq 'yes') {
+                            $value = $lt{'coll'};
+                        } else {
+                            $value = $lt{'expa'};
+                        }
+                    } elsif ($item eq 'copyright') {
+                        $value = &Apache::loncommon::copyrightdescription($changes{$item});
+                    } elsif ($item eq 'sourceavail') {
+                        $value = &Apache::loncommon::source_copyrightdescription($changes{$item});
+                    }
+                    $result .= '<li>'.
+                               &mt('[_1] set to [_2]',
+                                   $titles{$item},
+                                   '<span style="font-style:italic">'.$value.'</span>').
+                               '</li>';
+                }
+                $result .= '</ul>';
+                $message = &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result));
+            }
+            if (@delerrors) {
+                $result = &mt('An error occurred when deleting user-specific settings for').':<ul><li>'.
+                          join('</li><li>', map { $titles{$_} } @delerrors).'</li></ul>';
+                $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result,1));
+            } elsif (@delete) {
+                $result = &mt('Set use of domain default for').':<ul><li>'.
+                          join('</li><li>', map { $titles{$_} } @delete).'</li></ul>';
+                $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result));
+            }
+            if (@unchanged) {
+                $result = &mt('No changes made for').':<ul><li>'.
+                          join('</li><li>', map { $titles{$_} } @unchanged).'</li></ul>';
+                $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result));
+            }
+        }
+        if ($env{'form.returnurl'}) {
+            &do_redirect($r,$env{'form.returnurl'},$message);
+        } else {
+            &print_main_menu($r,$message);
+        }
+    }
+}
+
+sub authoring_settings_text {
+    return &Apache::lonlocal::texthash(
+               'auss' => 'Authoring Space Settings',
+               'used' => 'Use domain default',
+               'usyo' => 'Use your own user-specific setting',
+               'curd' => 'Current domain default is',
+               'ousv' => 'Own user-specific value',
+               'save' => 'Save',
+               'yes'  => 'Deactivated',
+               'no'   => 'Activated',
+               'expa' => 'Start Expanded',
+               'coll' => 'Start Collapsed',
+     );
+}
+
+sub authoring_settings_titles {
+    return &Apache::lonlocal::texthash(
+               'nocodemirror' => 'CodeMirror for EditXML editor',
+               'daxecollapse' => 'Daxe editor: collapsible standard LON-CAPA menus',
+               'copyright'    => 'Default Copyright/Distribution in new metadata file',
+               'sourceavail'  => 'Default Source Available in new metadata file',
+    );
+}
+
+sub expanded_authoring_settings {
+    my $reqdmajor = 2;
+    my $reqdminor = 12;
+    my $loncaparev = &Apache::lonnet::get_server_loncaparev($env{'user.domain'},$env{'user.home'});
+    my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
+    unless (($major eq '' && $minor eq '') ||
+            ($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor))) {
+        return 1;
+    }
+    return;
+}
+
+sub daxe_permitted {
+    my ($aurolesref) = @_;
+    my $hasdaxe;
+    if (ref($aurolesref) eq 'HASH') {
+        my %editors;
+        foreach my $key (keys(%{$aurolesref})) {
+            if ($key =~ /^:$LONCAPA::match_domain:au$/) {
+                if (exists($env{'environment.editors'})) {
+                    if (grep(/^daxe$/,split(/,/,$env{'environment.editors'}))) {
+                        $hasdaxe = 1;
+                        last;
+                    }
+                }
             } else {
-                &print_main_menu($r,$message);
+                my ($auname,$audom) = ($key =~ /^($LONCAPA::match_username):($LONCAPA::match_domain):(ca|aa)$/);
+                if (exists($env{"environment.internal.editors./$audom/$auname"})) {
+                    if (grep(/^daxe$/,split(/,/,$env{"environment.internal.editors./$audom/$auname"}))) {
+                        $hasdaxe = 1;
+                        last;
+                    }
+                }
             }
+        }
     }
+    return $hasdaxe;
 }
 
 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='';
+    my $ended;
     if (&can_toggle_namelocking()) {
         if ($userenv{'lockedname'}) {
             $lockedname = ' checked="checked"';
@@ -2118,6 +2479,11 @@ sub lockednameschanger {
             }
         }
         if (keys(%updateable)) {
+            &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 %longnames = &Apache::lonlocal::texthash (
                                 firstname  => 'First Name',
                                 middlename => 'Middle Name',
@@ -2144,11 +2510,14 @@ 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);
+            $ended = 1;
         }
     } 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);
+        $ended = 1;
     }
+    return $ended;
 }
 
 sub verify_and_change_lockednames {
@@ -2179,6 +2548,94 @@ sub verify_and_change_lockednames {
     &print_main_menu($r,$message);
 }
 
+sub timezonechanger {
+    my $r = shift;
+    my $uname = $env{'user.name'};
+    my $udom = $env{'user.domain'};
+    if (&Apache::lonnet::usertools_access($uname,$udom,'timezone')) {
+        my $js = &toggle_options_js();
+        my %loaditems = (
+                           onload => "javascript:toggleOptions(document.prefs,'settimezone','LC_timezone_selector');",
+                        );
+        my $args = { 'add_entries' => \%loaditems };
+        &Apache::lonhtmlcommon::add_breadcrumb(
+                {   href => '/adm/preferences?action=',
+                    text => 'Set Your Time Zone'});
+        $r->print(Apache::loncommon::start_page('Set Your Time Zone',$js,$args));
+        $r->print(Apache::lonhtmlcommon::breadcrumbs('Set Your Time Zone').
+                  '<div class="LC_landmark" role="main">');
+        my %userenv = &Apache::lonnet::get('environment',['timezone']);
+        my $timezone = $userenv{'timezone'};
+        my %lt = &Apache::lonlocal::texthash(
+                     tztu  => 'Time Zone in use',
+                     lctz  => 'Use Time Zone set by LON-CAPA',
+                     owntz => 'Use Time Zone set by you',
+                     save  => 'Save',
+        );
+        my (%checked,$tzsty);
+        if ($userenv{'timezone'} ne '') {
+            $checked{'owntz'} = ' checked="checked"';
+            $tzsty = 'inline-block';
+        } else {
+            $checked{'lctz'} = ' checked="checked"';
+            $tzsty = 'none';
+        }
+        my $onclick = ' onclick="javascript:toggleOptions(this.form,'."'settimezone','LC_timezone_selector'".');"';
+        my $selector = &Apache::loncommon::select_timezone('timezone',$timezone,undef,1);
+        $r->print(<<"END");
+<form name="prefs" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_timezone" />
+<fieldset style="display:inline; padding: 5px;"><legend>$lt{'tztu'}</legend>
+<span class="LC_nobreak">
+<label><input type="radio" name="settimezone" value="0"$checked{'lctz'}$onclick />
+$lt{'lctz'}</label></span><br />
+<span class="LC_nobreak">
+<label><input type="radio" name="settimezone" value="1"$checked{'owntz'}$onclick />
+$lt{'owntz'}</label></span><div style="display:$tzsty" id="LC_timezone_selector">&nbsp;
+$selector
+</div></fieldset><p>
+<input type="submit" value="$lt{'save'}" />
+</p></form></div>
+END
+    }
+    return;
+}
+
+sub verify_and_change_timezone {
+    my $r = shift;
+    my $currtimezone = $env{'environment.timezone'};
+    my $newtimezone;
+    if ($env{'form.settimezone'}) {
+        $newtimezone = $env{'form.timezone'};
+        if (DateTime::TimeZone->is_valid_name($env{'form.timezone'})) {
+            $newtimezone = $env{'form.timezone'};
+        }
+    }
+    my $message='';
+    if ($newtimezone) {
+        if ($newtimezone eq $currtimezone) {
+            $message = &mt('Time Zone settings unchanged');
+        } else {
+            &Apache::lonnet::put('environment',{'timezone' => $newtimezone});
+            &Apache::lonnet::appenv({'environment.timezone' => $newtimezone});
+            $message=&Apache::lonhtmlcommon::confirm_success(
+                &mt('Set [_1] to [_2]',
+                    '<i>'.&mt('Your Time Zone').'</i>',
+                    '<tt>"'.$newtimezone.'"</tt>.')).
+               '<br />';
+        }
+    } elsif ($currtimezone) {
+        &Apache::lonnet::del('environment',['timezone']);
+        &Apache::lonnet::delenv('environment.timezone');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Time Zone now set by LON-CAPA'));
+    } else {
+        $message = &mt('Time Zone settings unchanged');
+    }
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
+    return;
+}
+
 sub print_main_menu {
     my ($r, $message) = @_;
     # Determine current authentication method
@@ -2193,6 +2650,11 @@ my %permissions;
 if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
     $permissions{'aboutme'} = 'F';
 }
+if (&Apache::lonnet::usertools_access($user,$domain,'timezone')) {
+    $permissions{'timezone'} = 'F';
+}
+my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
+my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
 my @menu=
     ({	categorytitle=>'Personal Data',
 	items =>[
@@ -2201,6 +2663,7 @@ my @menu=
 		permission => $permissions{'aboutme'},
 		#help => 'Prefs_About_Me',
 		icon => 'system-users.png',
+                alttext => 'About Me Icon',
 		linktitle => 'Edit information about yourself that should be displayed on your public profile.'
 	    },
 	    {	linktext => 'Screen Name',
@@ -2208,6 +2671,7 @@ my @menu=
 		permission => 'F',
 		#help => 'Prefs_Screen_Name_Nickname',
 		icon => 'preferences-desktop-font.png',
+                alttext => 'Nickname Icon',
 		linktitle => 'Change the name that is displayed in your posts.'
 	    },
 		]
@@ -2219,6 +2683,7 @@ my @menu=
 		permission => 'F',
 		#help => 'Prefs_Language',
 		icon => 'preferences-desktop-locale.png',
+                alttext => 'Language Icon',
 		linktitle => 'Choose the default language for this user.'
 	    },
 	    {	linktext => $role.' Page',
@@ -2226,6 +2691,7 @@ my @menu=
 		permission => 'F',
 		#help => '',
 		icon => 'role_hotlist.png',
+                alttext => 'Switch Role Icon',
 		linktitle => 'Configure the roles hotlist.'
 	    },
 	    {	linktext => 'Math display settings',
@@ -2233,8 +2699,18 @@ my @menu=
 		permission => 'F',
 		#help => '',
 		icon => 'dismath.png',
+                alttext => 'Math Icon',
 		linktitle => 'Change how math is displayed.'
 	    },
+            {
+                linktext => 'Time Zone',
+                url => '/adm/preferences?action=changetimezone',
+                permission => $permissions{'timezone'},
+                #help => '',
+                icon => 'timezone.png',
+                alttext => 'Clock Icon',
+                linktitle => 'Set your time zone.',
+             }
 		]
     },
     {	categorytitle=>'Page Display Settings',
@@ -2244,6 +2720,7 @@ my @menu=
 		permission => 'F',
 		#help => 'Change_Colors',
 		icon => 'preferences-desktop-theme.png',
+                alttext => 'Colors Icon',
 		linktitle => 'Change LON-CAPA default colors.'
 	    },
             {   linktext => 'Menu Display',
@@ -2251,6 +2728,7 @@ my @menu=
                 permission => 'F',
                 #help => '',
                 icon => 'preferences-system-windows.png',
+                alttext => 'Menus Icon',
                 linktitle => 'Change whether the menus are displayed with icons or icons and text.'
             }
 		]
@@ -2262,6 +2740,7 @@ my @menu=
 		permission => 'F',
 		#help => 'Prefs_Messages',
 		icon => 'mail-reply-all.png',
+                alttext => 'Notifications Icon',
 		linktitle => 'Change messageforwarding or notifications settings.'
 	    },
 	    {	linktext => 'Discussion Display',
@@ -2269,10 +2748,40 @@ my @menu=
 		permission => 'F',
 		#help => 'Change_Discussion_Display',
 		icon => 'chat.png',
+                alttext => 'Discussions Icon',
 		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
 	    },
 		]
     },
+    );
+if (keys(%author_coauthor_roles) > 0) {
+    push(@menu,
+    {    categorytitle=>'Authoring Settings',
+         items => [
+             {
+                  linktext => 'Authoring Space Configuration',
+                  url => '/adm/preferences?action=authorsettings',
+                  permission => 'F',
+                  icon => 'codemirror.png',
+                  alttext => 'Coding Icon',
+                  linktitle => 'Settings for your authoring space.',
+             },
+                  ]
+    },
+    );
+    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',
+        alttext => 'Lock Icon',
+        linktitle => 'Restrict domain coordinator access.',
+        });
+    }
+}
+push(@menu,
     {	categorytitle=>'Other',
 	items =>[
 	    {	linktext => 'Register Response Devices (&quot;Clickers&quot;)',
@@ -2280,41 +2789,24 @@ my @menu=
 		permission => 'F',
 		#help => '',
 		icon => 'network-workgroup.png',
+                alttext => 'Clicker Icon',
 		linktitle => 'Register your clicker.'
 	    },
 		]
     },
-    );
+);
 
     if ($currentauth =~ /^(unix|internal):/) {
-push(@{ $menu[0]->{items} }, {
+        push(@{ $menu[0]->{items} }, {
 	linktext => 'Password',
 	url => '/adm/preferences?action=changepass',
 	permission => 'F',
 	#help => 'Change_Password',
 	icon => 'emblem-readonly.png',
+        alttext => 'Secure Icon',
 	linktitle => 'Change your password.',
 	});
     }
-    if ($env{'environment.remote'} eq 'off') {
-push(@{ $menu[1]->{items} }, {
-        linktext => 'Launch Remote Control',
-        url => '/adm/remote?url=/adm/preferences&amp;action=launch',
-        permission => 'F',
-        #help => '',
-        icon => 'remotecontrol.png',
-        linktitle => 'Launch the remote control for LON-CAPA.',
-        });
-    }else{
-push(@{ $menu[1]->{items} }, {
-        linktext => 'Collapse Remote Control',
-        url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
-        permission => 'F',
-        #help => '',
-        icon => 'remotecontrol.png',
-        linktitle => 'Collapse the remote control for LON-CAPA.',
-        });
-    }
 
     if (&can_toggle_namelocking()) {
         push(@{ $menu[0]->{items} }, {
@@ -2323,62 +2815,42 @@ push(@{ $menu[1]->{items} }, {
         permission => 'F',
         #help => '',
         icon => 'system-lock-screen.png',
+        alttext => 'Screen Lock Icon',
         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} }, {
+push(@{ $menu[-1]->{items} }, {
 	linktext => 'Course Initialization',
 	url => '/adm/preferences?action=changecourseinit',
 	permission => 'F',
 	#help => '',
 	icon => 'course_ini.png',
+        alttext => 'Course Launch Icon',
 	linktitle => 'Set the default page to be displayed when you select a course role.',
 	});
 
     }
 
-    my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
-    if (keys(%author_coauthor_roles) > 0) {
-        push(@{ $menu[4]->{items} }, {
-            linktext => 'Authoring Space Configuration',
-            url => '/adm/preferences?action=authorsettings',
-            permission => 'F',
-            icon => 'codemirror.png',
-            linktitle => 'Settings for your authoring space.',
-        });
-    }
-
     if (&can_toggle_debug()) {
-push(@{ $menu[4]->{items} }, {
+push(@{ $menu[-1]->{items} }, {
 	linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
 	url => '/adm/preferences?action=debugtoggle',
 	permission => 'F',
 	#help => '',
 	icon => 'blog.png',
+        alttext => 'Debugging Icon',
 	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('<div class="LC_landmark" role="main">'."\n".$message);
+    $r->print(Apache::lonhtmlcommon::generate_menu(@menu)."\n".'</div>');
     $r->print(Apache::loncommon::end_page());
 }
 
@@ -2427,8 +2899,8 @@ sub handler {
           text => $brtxt,
           help => $brhelp,});
     if(!exists $env{'form.action'}) {
-	    &print_main_menu($r);
-            $ended = 1;
+	&print_main_menu($r);
+        $ended = 1;
     }elsif($env{'form.action'} eq 'changepass'){
         &passwordchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_pass'){
@@ -2508,10 +2980,14 @@ sub handler {
 	&print_main_menu($r);
         $ended = 1;
     } elsif ($env{'form.action'} eq 'changelockednames') {
-        &lockednameschanger($r);
+        $ended = &lockednameschanger($r);
     } elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {
         &verify_and_change_lockednames($r);
         $ended = 1;
+    } elsif ($env{'form.action'} eq 'changetimezone') {
+        &timezonechanger($r);
+    } elsif ($env{'form.action'} eq 'verify_and_change_timezone') {
+        &verify_and_change_timezone($r);
     }
 
     # Properly end the HTML page of all preference pages
@@ -2593,13 +3069,66 @@ sub updateable_userinfo {
 sub do_redirect {
     my ($r,$url,$msg) = @_;
     $r->print(
-        &Apache::loncommon::start_page('Switching Server ...',undef,
-                                       {'redirect'       => [0.5,$url]}).
+        &Apache::loncommon::start_page('Loading ...',undef,
+                                       {'redirect'       => [2,$url]}).
         '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n".
         "$msg\n".
         &Apache::loncommon::end_page());
     return;
 }
 
+sub toggle_options_js {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function toggleOptions(form,radioname,divid) {
+    var num = form.elements[radioname].length;
+    if (num) {
+        var setvis = '';
+        var onvalue = 'user';
+        if (radioname == 'settimezone') {
+            onvalue = '1';
+        }
+        for (var i=0; i<num; i++) {
+            if (form.elements[radioname][i].checked) {
+                if (form.elements[radioname][i].value == onvalue) {
+                    if (document.getElementById(divid)) {
+                        document.getElementById(divid).style.display = 'inline-block';
+                    }
+                    setvis = 1;
+                }
+                break;
+            }
+        }
+        if (!setvis) {
+            if (document.getElementById(divid)) {
+                document.getElementById(divid).style.display = 'none';
+            }
+        }
+    }
+    return;
+}
+// ]]>
+</script>
+ENDSCRIPT
+}
+
+sub selectbox {
+    my ($name,$value,$readonly,$functionref,@idlist)=@_;
+    my $selout = '<select name="'.$name.'">';
+    foreach my $id (@idlist) {
+        $selout.='<option value="'.$id.'"';
+        if ($id eq $value) {
+            $selout.=' selected="selected"';
+        }
+        if ($readonly) {
+            $selout .= ' disabled="disabled"';
+        }
+        $selout.='>'.&{$functionref}($id).'</option>';
+    }
+    $selout.='</select>';
+    return $selout;
+}
+
 1;
 __END__