--- loncom/interface/lonmenu.pm	2023/12/13 22:12:16	1.543
+++ loncom/interface/lonmenu.pm	2025/03/25 01:02:59	1.562
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.543 2023/12/13 22:12:16 raeburn Exp $
+# $Id: lonmenu.pm,v 1.562 2025/03/25 01:02:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -378,6 +378,7 @@ sub primary_menu {
                         } else {
                             next;
                         }
+                    }
                     if ($env{'request.course.id'} && $menucoll) {
                         next if ($item->[3]) && (!$menuopts{$item->[3]});
                     }
@@ -614,6 +615,10 @@ sub secondary_menu {
                 && !$env{'request.course.id'};
         next if    $$menuitem[4]   =~ /^crsedit/
                 && (!$canedit && !$canvieweditor);
+        next if    $$menuitem[4]  eq 'crseditCourse'
+                && ($crstype eq 'Community');
+        next if    $$menuitem[4]  eq 'crseditCommunity'
+                && ($crstype ne 'Community');
         next if    $$menuitem[4]  eq 'nvgr'
                 && ($canvgr || $ltiexc{'grades'});
         next if    $$menuitem[4]  eq 'vgr'
@@ -812,7 +817,7 @@ sub create_submenu {
     my $menu = '<li class="LC_hoverable '.$addclass.'">'.
                '<a href="'.$link.'"'.$targetattr.'>'.
                '<span class="LC_nobreak">'.$title.
-               '<span class="LC_fontsize_small" style="font-weight:normal;">'.
+               '<span class="LC_fontsize_medium" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.
                '<ul>';
 
@@ -909,7 +914,7 @@ sub innerregister {
     my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname,
         $ltiscope,$ltiuri,$showncrumbsref) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
-    my $is_const_dir = 0;
+    my $in_daxe = 0;
 
     if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
 
@@ -1105,17 +1110,17 @@ sub innerregister {
             if ($perms{'mgr'}) {
                 &switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
                         "gocmd('/adm/grades','gradingmenu')",
-                        'Content Grades');
+                        'Grading for Resource/Folder');
             } elsif ($perms{'vgr'}) {
                 &switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
                         "gocmd('/adm/grades','submission')",
-                        'Content Submissions');
+                        'Submissions for Resource/Folder');
              }
         }
         if (($env{'request.symb'} ne '') && (($perms{'opa'}) || ($perms{'vpa'}))) {
             &switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
                     "gocmd('/adm/parmset','set')",
-                    'Content Settings');
+                    'Content Settings for Resource/Folder');
 	}
 # End grades/submissions check
 
@@ -1142,11 +1147,13 @@ sub innerregister {
         if (($env{'request.symb'} ne '') &&
             ($env{'request.filename'}=~/$LONCAPA::assess_re/) &&
             (($perms{'mgr'}) || ($perms{'vgr'}))) {
-            my ($viewas,$text,$change,$visibility,$vuname,$vudom,$vid,$leftvis,$defdom,
-                $domselector,$righticon);
+            my ($viewas,$text,$change,$visibility,$vuname,$vudom,$vid,$leftvis,$rightvis,
+                $defdom,$domselector,$righticon);
             my %lt = &Apache::lonlocal::texthash(
                                                  view => 'View',
                                                  upda => 'Update',
+                                                 user => 'View as user',
+                                                 choo => 'Choose user',
             );
             my $possdomstr = $env{'course.'.$env{'request.course.id'}.'.internal.userdomains'};
             if ($possdomstr =~ /,/) {
@@ -1158,7 +1165,10 @@ sub innerregister {
                 } elsif (&Apache::lonnet::domain($possdoms[0]) ne '') {
                     $defdom = $possdoms[0];
                 }
-                $domselector = &Apache::loncommon::select_dom_form($defdom,'vudom','','','',\@possdoms);
+                $domselector = &Apache::loncommon::select_dom_form($defdom,'vudom','','','',
+                                                                   \@possdoms,'','','vudom').
+                               '<span class="LC_visually_hidden"><label for="vudom">'.
+                               &mt("user's domain").'</label></span>';
             } elsif (($possdomstr ne '') && (&Apache::lonnet::domain($possdomstr) ne '')) {
                 if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) {
                     $defdom = $1;
@@ -1176,6 +1186,7 @@ sub innerregister {
                 $change = 'off';
                 $visibility = 'inline';
                 $leftvis = 'none';
+                $rightvis = 'inline';
                 $defdom = $vudom;
                 $righticon = '&#10006;';
             } else {
@@ -1183,6 +1194,8 @@ sub innerregister {
                 $change = 'on';
                 $visibility = 'none';
                 $leftvis = 'inline';
+                $rightvis = 'none';
+                $righticon = '&#9668;';
                 if ($defdom eq '') {
                     $defdom = $cdom;
                 }
@@ -1207,11 +1220,14 @@ sub innerregister {
             $input .= '<input name="LC_viewas" type="hidden" value="'.$viewas.'" />',
                       '<input name="symb" type="hidden" value="'.$shownsymb.'" />';
             my $chooser = <<END;
+<span class="LC_visually_hidden">
+<label for="LC_vuname" id="LC_vuidentifier">$lt{'user'}</label>
+</span>
 $selscript
-<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link">
-<span id="usexpand" class="LC_menubuttons_inline_text" style="display:$leftvis">&#9658;&nbsp;</span>
+<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link" id="usexpand" style="display:$leftvis;">
+<span class="LC_menubuttons_inline_text">&#9658;&nbsp;</span>
 </a>
-<fieldset id="LC_selectuser" style="display:$visibility">
+<fieldset id="LC_selectuser" style="display:$visibility;"><legend class="LC_visually_hidden">$lt{'choo'}</legend>
 <form name="userview" action="" method="post" onsubmit="event.preventDefault(); return validCourseUser(this,'$change');">
 <span class="LC_menubuttons_inline_text LC_nobreak">
 $input
@@ -1220,13 +1236,13 @@ $sellink
 &nbsp;<input type="submit" value="$text" />
 </form>
 </fieldset>
-<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link">
-<span id="uscollapse" class="LC_menubuttons_inline_text">$righticon</span>
+<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link" id="uscollapse" style="display:$rightvis">
+<span class="LC_menubuttons_inline_text">$righticon</span>
 </a>
 END
             &switch('','',7,5,'viewuser.png','View As','user[_1]',
                     'toggleViewAsUser('."'$change'".')',
-                    'View As','','',$chooser);
+                    'View resource as user','','',$chooser);
         }
 # End view as user check
 
@@ -1234,8 +1250,8 @@ END
 # End course context
 
 # Prepare the rest of the buttons
-        my ($menuitems,$got_prt,$got_wishlist,$crsauthor);
-        if ($const_space) {
+    my ($menuitems,$got_prt,$got_wishlist,$crsauthor,$toplevel_cstr,$crsauthor_cstr);
+    if ($const_space) {
 #
 # We are in construction space
 #
@@ -1243,17 +1259,15 @@ END
             my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
 	    my ($udom,$uname,$thisdisfn) =
 		($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$});
-            my $crsauthor;
             if (($env{'request.course.id'}) &&
                 ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) &&
                 ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) {
-                $crsauthor = 1;
+                $crsauthor_cstr = 1;
             }
             my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
             if ($currdir =~ m-/$-) {
-                $is_const_dir = 1;
-                if (($thisdisfn eq '') && ($crsauthor)) {
-                    $is_const_dir = 2;
+                if ($thisdisfn eq '') {
+                    $toplevel_cstr = 1;
                 }
                 my $esc_currdir = &Apache::loncommon::escape_single($currdir);
                 $menuitems=(<<ENDMENUITEMS);
@@ -1262,6 +1276,14 @@ s&7&4&docs-22x22.png&Edit Metadata&defau
 s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','$esc_currdir')&Print contents of directory
 s&7&1&del.png&Delete&dir[_3]&gocstr('/adm/cfile?action=delete','$esc_currdir')&Delete this Directory
 ENDMENUITEMS
+                unless ($crsauthor_cstr) {
+                    if (($env{'environment.canarchive'}) &&
+                        ($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) {
+                        $menuitems .= (<<ENDMENUITEMS);
+s&7&7&archive.png&Export&dir[_1]&gocstr('/adm/cfile?action=archive','$esc_currdir')&Export Authoring Space Archive
+ENDMENUITEMS
+                    }
+                }
             } else {
                 $currdir =~ s|[^/]+$||;
 		my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
@@ -1276,7 +1298,7 @@ ENDMENUITEMS
 #
 # Probably should be in mydesk.tab
 #
-                if (($crsauthor) && ($pubfile eq "/res/$udom/$uname/default.rights")) {
+                if (($crsauthor_cstr) && ($pubfile eq "/res/$udom/$uname/default.rights")) {
                     $menuitems=(<<ENDMENUITEMS);
 s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory
 s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
@@ -1298,9 +1320,42 @@ s&7&4&rename.png&Rename&resource[_5]&goc
 s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
 ENDMENUITEMS
                 }
-                $menuitems .= (<<ENDMENUITEMS);
+#
+# Print only makes sense for certain mime types
+#
+                if ($thisdisfn=~/\.(xml|html|htm|xhtml|xhtm|tex)$/ || $thisdisfn=~/$LONCAPA::assess_re/) {
+                    $menuitems .= (<<ENDMENUITEMS);
 s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
+                }
+#
+# "Exit Daxe" in Functions menu when using Daxe
+#
+                if ((($env{'form.editmode'} eq 'daxe') &&
+                     ($thisdisfn=~/\.(xml|html|htm|xhtml|xhtm)$/)) ||
+                    (($env{'form.problemmode'} eq 'daxe') &&
+                     ($thisdisfn=~/$LONCAPA::assess_re/))) {
+                    my %editors = &Apache::loncommon::permitted_editors();
+                    if ($editors{'daxe'}) {
+                        my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn");
+                        $in_daxe = 1;
+                        $menuitems .= (<<ENDMENUITEMS);
+my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn");
+s&7&6&tolastloc.png&Exit Daxe&resource[_1]&go('$privfile')&Exit editing this resource
+ENDMENUITEMS
+                    }
+                }
+            }
+#
+# Editing options usually accessed via "Settings" in inline menu need to be
+# accessed in a different way, when Authoring Space is accessed in course
+# context
+#
+            if ($env{'request.role'} !~/^(aa|ca|au)/) {
+                my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn");
+                $menuitems .= (<<ENDMENUITEMS);
+s&7&5&editops.png&Options&edit[_1]&gocstr('/adm/preferences?action=authorsettings','$privfile')&Authoring Space Options
+ENDMENUITEMS
             }
                 if (ref($bread_crumbs) eq 'ARRAY') {
                     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -1511,8 +1566,13 @@ ENDMENUITEMS
             &Apache::lonhtmlcommon::add_breadcrumb_tool(
                 'tools',@tools);
 
+            #exit editing link/icon when using daxe in construction space 
             #publish button in construction space
             if ($env{'request.state'} eq 'construct'){
+                if ($in_daxe) {
+                    &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                         'advtools', $inlineremote[76]);
+                }
                 &Apache::lonhtmlcommon::add_breadcrumb_tool(
                      'advtools', $inlineremote[63]);
             } else {
@@ -1520,6 +1580,12 @@ ENDMENUITEMS
                      'tools', $inlineremote[63]);
             }
             &advtools_crumbs(@inlineremote);
+            #options link/icon in constructions space viewed with course role
+            if (($env{'request.state'} eq 'construct') &&
+                ($env{'request.role'} !~/^(aa|ca|au)/)) {
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                         'advtools', $inlineremote[75]);
+            }
         }
     } else {
         if ($showprogress) {
@@ -1530,7 +1596,7 @@ ENDMENUITEMS
         }
     }
     my ($topic_help,$topic_help_text);
-    if ($is_const_dir == 2) {
+    if ($toplevel_cstr && !$crsauthor_cstr) {
         if ((($ENV{'SERVER_PORT'} == 443) || 
              ($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) && 
             (&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) {
@@ -1704,7 +1770,14 @@ sub prepare_functions {
         } elsif (($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) &&
                  ($resurl ne '/cgi-bin/printout.pl')) {
             if ($env{'request.filename'}) {
-                my $file=&Apache::lonnet::declutter($env{'request.filename'});
+                my $file;
+                my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+                if ($env{'request.filename'} =~ m{^\Q$londocroot\E/priv/}) {
+                    $file = $env{'request.filename'};
+                    $file =~ s{^\Q$londocroot\E/}{};
+                } else {
+                    $file=&Apache::lonnet::declutter($env{'request.filename'});
+                }
                 ($cfile,$home,$switchserver,$forceedit,$forceview) =
                     &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
                         &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
@@ -1846,7 +1919,7 @@ sub advtools_crumbs {
     } elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
         if ($env{'request.state'} eq 'construct') {
             &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                'advtools', @funcs[61,73,74,71,72]);
+                'advtools', @funcs[61,73,74,71,72,77]);
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb_tool(
                 'advtools', @funcs[61,71,72,73,74,75,92]);
@@ -1863,7 +1936,7 @@ sub advtools_crumbs {
 sub clear {
     my ($row,$col)=@_;
     $inlineremote[10*$row+$col]='';
-    return ''; 
+    return '';
 }
 
 # ============================================ Switch a button or create a link
@@ -1874,40 +1947,50 @@ sub switch {
     my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$form)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
-    $top=&mt($top);
-    $bot=&mt($bot);
     $desc=&mt($desc);
     my $idx=10*$row+$col;
     $category_members{$cat}.=':'.$idx;
 
 # Inline Menu
     if ($nobreak==2) { return ''; }
-    my $text=$top.' '.$bot;
+    my ($text,$alttext);
+    $text=&mt($top).' '.&mt($bot);
     $text=~s/\s*\-\s*//gs;
+    if ($top && $bot) {
+        if ($top =~ /\-\[_\d+\]$/) {
+            $top =~ s/(\-\[_\d+\])//;
+            $alttext = &mt($top.$bot.' icon');
+        } elsif (($top =~ /^\w+\s\w+\[_\d+\]$/) && ($bot =~ /^\w{8}\[_\d+\]$/)) {
+            $alttext = &mt($top.$bot.' icon');
+        } else {
+            $alttext = &mt("$top $bot icon");
+        }
+    } elsif ($top) {
+        $alttext = &mt("$top icon");
+    } elsif ($bot) {
+        $alttext = &mt("$bot icon");
+    } elsif ($nobreak == 3) {
+        $alttext = &mt('Go forward icon');
+    } elsif ($nobreak) {
+        $alttext = &mt('Go back icon');
+    } else {
+        $alttext = &mt('icon');
+    }
 
     my $pic=
-	   '<img alt="'.$text.'" src="'.
+	   '<img alt="'.$alttext.'" src="'.
 	   &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
 	   '" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />';
     if ($env{'browser.interface'} eq 'faketextual') {
 # Main Menu
-	   if ($nobreak==3) {
-	       $inlineremote[$idx]="\n".
-		   '<td class="LC_menubuttons_text" align="right">'.$text.
-		   '</td><td align="left">'.
-		   '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
-	   } elsif ($nobreak) {
-	       $inlineremote[$idx]="\n<tr>".
-		   '<td align="left">'.
-		   '<a href="javascript:'.$act.';">'.$pic.'</a></td>
-                    <td class="LC_menubuttons_text" align="left"><a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$text.'</span></a></td>';
-	   } else {
-	       $inlineremote[$idx]="\n<tr>".
-		   '<td align="left">'.
-		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</a></td><td class="LC_menubuttons_text" colspan="3">'.
-		   '<a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$desc.'</span></a></td></tr>';
-	   }
+        $inlineremote[$idx] = {
+                                linktext => $desc,
+                                url => 'javascript:'.$act,
+                                permission => 'F',
+                                icon => $img,
+                                alttext => $alttext,
+                                linktitle => '',
+                              };
     } else {
 # Inline Menu
         my @tools = (93,91,81,82,83);
@@ -1920,9 +2003,10 @@ sub switch {
             $inlineremote[$idx] =
         '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.'</a>';
         } else {
+            my $linktext = &mt($top);
             $inlineremote[$idx] =
        '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
-       '<span class="LC_menubuttons_inline_text">'.$top.'&nbsp;</span></a>'.$form;
+       '<span class="LC_menubuttons_inline_text">'.$linktext.'&nbsp;</span></a>'.$form;
         }
     }
     return '';
@@ -1947,32 +2031,33 @@ sub inlinemenu {
     undef(%category_members);
 # calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control
     &rawconfig(1);
-    my $output='<table><tr>';
+    my $output;
     for (my $col=1; $col<=2; $col++) {
-        $output.='<td class="LC_mainmenu_col_fieldset">';
+        $output .= '<div class="LC_mainmenu">'."\n";
         for (my $row=1; $row<=8; $row++) {
             foreach my $cat (keys(%category_members)) {
-               if ($category_positions{$cat} ne "$col,$row") { next; }
-               #$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
-               $output.='<div class="LC_Box LC_400Box">';
-	       $output.='<h3 class="LC_hcell">'.&mt($category_names{$cat}).'</h3>';
-               $output.='<table>';
-               my %active=();
-               foreach my $menu_item (split(/\:/,$category_members{$cat})) {
-                  if ($inlineremote[$menu_item]) {
-                     $active{$menu_item}=1;
-                  }
-               }  
-               foreach my $item (sort(keys(%active))) {
-                  $output.=$inlineremote[$item];
-               }
-               $output.='</table>';
-               $output.='</div>';
+                my @menu =  ({ categorytitle=>&mt($category_names{$cat}),
+                               listclass=>'LC_ListStyleMainMenu',
+                               boxclass=>'LC_MainMenu_Box',
+                               items        =>[],});
+                if ($category_positions{$cat} ne "$col,$row") { next; }
+                my %active=();
+                foreach my $menu_item (split(/\:/,$category_members{$cat})) {
+                    if ($inlineremote[$menu_item]) {
+                        $active{$menu_item}=1;
+                    }
+                }
+                foreach my $item (sort(keys(%active))) {
+                    push(@{ $menu[0]->{items} }, $inlineremote[$item]);
+                }
+                if (@{$menu[0]->{items}} > 0) {
+                    $output .= &Apache::lonhtmlcommon::generate_menu(@menu);
+                }
             }
-         }
-         $output.="</td>";
+        }
+        $output.="</div>";
     }
-    $output.="</tr></table>";
+    $output .= '<div style="clear:both"></div>'."\n";
     return $output;
 }
 
@@ -2506,13 +2591,13 @@ function toggleViewAsUser(change) {
         if ((document.getElementById('usexpand')) && (document.getElementById('uscollapse'))) {
             if (currstyle == 'inline') {
                 seluserid.style.display = 'none';
-                document.getElementById('usexpand').innerHTML='&#9658;&nbsp;';
-                document.getElementById('uscollapse').innerHTML='';
+                document.getElementById('usexpand').style.display= 'inline';
+                document.getElementById('uscollapse').style.display = 'none';
             } else {
                 seluserid.style.display = 'inline';
-                document.getElementById('usexpand').innerHTML='';
-                document.getElementById('uscollapse').innerHTML='&#9668;&nbsp;';
                 toggleIdentifier(document.userview);
+                document.getElementById('usexpand').style.display = 'none';
+                document.getElementById('uscollapse').style.display = 'inline';
             }
         }
     }
@@ -2566,16 +2651,21 @@ function validCourseUser(form,change) {
 
 function toggleIdentifier(form) {
     if ((document.getElementById('LC_vuname')) && (document.getElementById('LC_vid'))) {
+        var identifylabel = document.getElementById('LC_vuidentifier');
+        var identifier;
+        var userbyuname;
         var radioelem = form.elements['vuidentifier'];
         if (radioelem.length > 0) {
             var i;
             for (i=0; i<radioelem.length; i++) {
                 if (radioelem[i].checked == true) {
                     if (radioelem[i].value == 'uname') {
+                        userbyuname = 1;
                         document.getElementById('LC_vuname').type = 'text';
                         document.getElementById('LC_vid').type = 'hidden';
                         document.getElementById('LC_vid').value = '';
                     } else {
+                        userbyuname = 0;
                         document.getElementById('LC_vuname').type = 'hidden';
                         document.getElementById('LC_vuname').value = '';
                         document.getElementById('LC_vid').type = 'text';
@@ -2583,6 +2673,13 @@ function toggleIdentifier(form) {
                     break;
                 }
             }
+            if (identifylabel) {
+                if (userbyuname) {
+                    identifylabel.setAttribute("for","LC_vuname");
+                } else {
+                    identifylabel.setAttribute("for","LC_vid");
+                }
+            }
         }
     }
     return;
@@ -2629,6 +2726,7 @@ sub utilityfunctions {
     my $esc_url=&escape($currenturl);
     my $esc_symb=&escape($currentsymb);
     my $newname = &mt('New Name');
+    &js_escape(\$newname);
 
     my $countdown = &countdown_toggle_js();
 
@@ -2637,7 +2735,7 @@ sub utilityfunctions {
         ($env{'request.symb'} ne '') &&
         ($env{'request.filename'}=~/$LONCAPA::assess_re/)) {
         my $canview;
-        foreach my $priv ('msg','vgr') {
+        foreach my $priv ('mgr','vgr') {
             $canview = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
             if (!$canview && $env{'request.course.sec'} ne '') {
                 $canview =
@@ -2762,6 +2860,10 @@ function gocstr(url,filename) {
         this.document.cstrprint.submit();
         return;
     }
+    if (url == '/adm/preferences?action=authorsettings') {
+        document.location.href=url+'&returnurl='+filename;
+        return;
+    }
     if (url !='') {
         this.document.constspace.filename.value = filename;
         this.document.constspace.action = url;
@@ -2879,12 +2981,14 @@ sub serverform {
     if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
         $target = ' target="_self"';
     }
+    my $submit = &mt('Submit');
     return(<<ENDSERVERFORM);
-<form name="server" action="/adm/logout" method="post"$target>
+<form name="server" action="/adm/logout" method="post"$target aria-hidden="true">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />
 <input type="hidden" name="symb" value="none" />
+<input type="submit" value="$submit" class="LC_visually_hidden" tabindex="-1" disabled="disabled" />
 </form>
 ENDSERVERFORM
 }
@@ -3049,7 +3153,7 @@ sub roles_selector {
         $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,
                             \%roledesc,$privref,$menucoll,$menuref);
         $form = 
-            '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles"'.$targetattr.'>'."\n".
+            '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles"'.$targetattr.' aria-hidden="true">'."\n".
             '  <input type="hidden" name="destinationurl" value="'.
             &HTML::Entities::encode($destinationurl).'" />'."\n".
             '  <input type="hidden" name="gotorole" value="1" />'."\n".
@@ -3059,7 +3163,8 @@ sub roles_selector {
             $form .= '  <input type="hidden" name="destsymb" value="'.
                         &HTML::Entities::encode($destsymb).'" />'."\n";
         }
-        $form .= '</form>'."\n";
+        $form .= '<input type="submit" value="'.&mt('Submit').'" class="LC_visually_hidden" tabindex="-1" disabled="disabled" />'."\n".
+                 '</form>'."\n";
         foreach my $role (@roles_order) {
             my $include;
             if (defined($courseroles{$role})) {
@@ -3548,7 +3653,7 @@ $donebutton
 <span id="ddcountcollapse" class="LC_menubuttons_inline_text">
 $collapse
 </span></a>
-<span id="duedatecountdown" class="LC_menubuttons_inline_text" style="display: $currdisp;"></span>
+<span id="duedatecountdown" class="LC_menubuttons_inline_text" style="display: $currdisp;" role="timer"></span>
 <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
 <span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span>
 <img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a>