--- loncom/interface/lonmenu.pm	2025/02/21 04:29:26	1.561
+++ 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.561 2025/02/21 04:29:26 raeburn Exp $
+# $Id: lonmenu.pm,v 1.562 2025/03/25 01:02:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1168,7 +1168,7 @@ sub innerregister {
                 $domselector = &Apache::loncommon::select_dom_form($defdom,'vudom','','','',
                                                                    \@possdoms,'','','vudom').
                                '<span class="LC_visually_hidden"><label for="vudom">'.
-                               &mt("user's domain").'</label></span>';                
+                               &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;
@@ -1956,7 +1956,16 @@ sub switch {
     my ($text,$alttext);
     $text=&mt($top).' '.&mt($bot);
     $text=~s/\s*\-\s*//gs;
-    if ($top) {
+    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");
@@ -1974,23 +1983,14 @@ sub switch {
 	   '" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />';
     if ($env{'browser.interface'} eq 'faketextual') {
 # Main Menu
-	   if ($nobreak==3) {
-	       $inlineremote[$idx]="\n".
-		   '<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>".
-		   '<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>".
-		   '<th align="left">'.
-		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</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>';
-	   }
+        $inlineremote[$idx] = {
+                                linktext => $desc,
+                                url => 'javascript:'.$act,
+                                permission => 'F',
+                                icon => $img,
+                                alttext => $alttext,
+                                linktitle => '',
+                              };
     } else {
 # Inline Menu
         my @tools = (93,91,81,82,83);
@@ -2031,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='<div class="LC_landmark" role="main">'."\n";
+    my $output;
     for (my $col=1; $col<=2; $col++) {
         $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.='<h2 class="LC_hcell LC_heading_2">'.&mt($category_names{$cat}).'</h2>';
-               $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.="</div>";
+        }
+        $output.="</div>";
     }
-    $output .= '<div style="clear:both"></div></div>'."\n";
+    $output .= '<div style="clear:both"></div>'."\n";
     return $output;
 }