--- loncom/interface/lonmenu.pm	2024/11/22 22:43:54	1.558
+++ loncom/interface/lonmenu.pm	2025/02/21 04:29:26	1.561
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.558 2024/11/22 22:43:54 raeburn Exp $
+# $Id: lonmenu.pm,v 1.561 2025/02/21 04:29:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -615,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'
@@ -813,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>';
 
@@ -1106,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
 
@@ -1143,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 =~ /,/) {
@@ -1159,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;
@@ -1177,6 +1186,7 @@ sub innerregister {
                 $change = 'off';
                 $visibility = 'inline';
                 $leftvis = 'none';
+                $rightvis = 'inline';
                 $defdom = $vudom;
                 $righticon = '&#10006;';
             } else {
@@ -1184,6 +1194,8 @@ sub innerregister {
                 $change = 'on';
                 $visibility = 'none';
                 $leftvis = 'inline';
+                $rightvis = 'none';
+                $righticon = '&#9668;';
                 if ($defdom eq '') {
                     $defdom = $cdom;
                 }
@@ -1208,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
@@ -1221,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
 
@@ -1921,7 +1936,7 @@ sub advtools_crumbs {
 sub clear {
     my ($row,$col)=@_;
     $inlineremote[10*$row+$col]='';
-    return ''; 
+    return '';
 }
 
 # ============================================ Switch a button or create a link
@@ -1932,38 +1947,48 @@ 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) {
+        $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">'.
+		   '<th class="LC_menubuttons_text" align="right">'.$text.
+		   '</th><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>
+		   '<th align="left">'.
+		   '<a href="javascript:'.$act.';">'.$pic.'</a></th>
                     <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">'.
+		   '<th align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</a></td><td class="LC_menubuttons_text" colspan="3">'.
+		   '</a></th><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>';
 	   }
     } else {
@@ -1978,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 '';
@@ -2005,15 +2031,15 @@ 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='<div class="LC_landmark" role="main">'."\n";
     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.='<h2 class="LC_hcell LC_heading_2">'.&mt($category_names{$cat}).'</h2>';
                $output.='<table>';
                my %active=();
                foreach my $menu_item (split(/\:/,$category_members{$cat})) {
@@ -2028,9 +2054,9 @@ sub inlinemenu {
                $output.='</div>';
             }
          }
-         $output.="</td>";
+         $output.="</div>";
     }
-    $output.="</tr></table>";
+    $output .= '<div style="clear:both"></div></div>'."\n";
     return $output;
 }
 
@@ -2564,13 +2590,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';
             }
         }
     }
@@ -2624,16 +2650,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';
@@ -2641,6 +2672,13 @@ function toggleIdentifier(form) {
                     break;
                 }
             }
+            if (identifylabel) {
+                if (userbyuname) {
+                    identifylabel.setAttribute("for","LC_vuname");
+                } else {
+                    identifylabel.setAttribute("for","LC_vid");
+                }
+            }
         }
     }
     return;