--- loncom/interface/lonhtmlcommon.pm	2025/02/18 02:51:32	1.417
+++ loncom/interface/lonhtmlcommon.pm	2025/03/25 01:02:59	1.422
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.417 2025/02/18 02:51:32 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.422 2025/03/25 01:02:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -542,7 +542,14 @@ sub date_setter {
     my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
         $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink,$no_mm_ss,$no_ss) = @_;
     my $now = time;
-
+    my %labels = &Apache::lonlocal::texthash(
+                                               day   => 'day',
+                                               month => 'month',
+                                               year  => 'year',
+                                               sec   => 'seconds',
+                                               min   => 'minutes',
+                                               hour  => 'hours',
+                                            );
     my $tzname;
     my ($sec,$min,$hour,$mday,$month,$year) = ('', '', undef,''.''.'');
     #other potentially useful values:    wkday,yrday,is_daylight_savings
@@ -643,7 +650,7 @@ document.$formname.$dname\_year.value,
 </script>
 ENDJS
     $result .= '  <span class="LC_nobreak">';
-    my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
+    my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" aria-label="$labels{'month'}">};
     # Month
     my @Months = qw/January February  March     April   May      June 
                     July    August    September October November December/;
@@ -657,11 +664,11 @@ ENDJS
     }
     $monthselector.= '  </select>';
     # Day
-    my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" />};
+    my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" aria-label="$labels{'day'}" />};
     # Year
-    my $yearselector = qq{<input type="text" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};
+    my $yearselector = qq{<input type="text" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" aria-label="$labels{'year'}" />};
     #
-    my $hourselector = qq{<select name="$dname\_hour" $special $state >};
+    my $hourselector = qq{<select name="$dname\_hour" $special $state aria-label="$labels{'hour'}">};
     if ($includeempty) { 
         $hourselector.=qq{<option value=''></option>};
     }
@@ -683,8 +690,8 @@ ENDJS
         $hourselector .= $timest." </option>\n";
     }
     $hourselector .= "  </select>\n";
-    my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
-    my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
+    my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" aria-label="$labels{'min'}" />};
+    my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" aria-label="$labels{'sec'}" />};
     my $cal_link;
     unless (($nolink) || ($state eq 'disabled')) {
         $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
@@ -2156,7 +2163,7 @@ returns: nothing
         # Return the breadcrumb's line
 
         my $labeltext = &HTML::Entities::encode(&mt('Links for navigation and information'));
-        return '<div class="LC_landmark" role="navigation" aria-label="'.$labeltext.'">'.$links.'</div>';    
+        return '<div class="LC_landmark" role="navigation" aria-label="'.$labeltext.'">'.$links.'</div>';
     }
 
     sub clear_breadcrumbs {
@@ -2456,7 +2463,7 @@ sub docs_breadcrumbs {
 my @row_count;
 
 sub start_pick_box {
-    my ($css_class,$id) = @_;
+    my ($css_class,$id,$caption,$caption_class) = @_;
     if (defined($css_class)) {
 	$css_class = 'class="'.$css_class.'"';
     } else {
@@ -2470,6 +2477,16 @@ sub start_pick_box {
     my $output = <<"END";
  <table $css_class $table_id>
 END
+    if (defined($caption)) {
+        if (defined($caption_class)) {
+            $caption_class = 'class="'.$caption_class.'"';
+        } else {
+            $caption_class = 'class="LC_caption"';
+        }
+        $output .= <<"END";
+ <caption $caption_class>$caption</caption>
+END
+    }
     return $output;
 }
 
@@ -2497,7 +2514,7 @@ sub row_title {
 
     $css_value_class ||= 'LC_pick_box_value';
 
-    if (($title ne '')  && (!$nocolon)) {
+    if (($title ne '') && (!$nocolon)) {
         $title .= ':';
     }
     my $output = <<"ENDONE";
@@ -3947,6 +3964,8 @@ sub list_from_array {
 # Inputs:
 # An array of following structure:
 #   ({	categorytitle => 'Categorytitle',
+#       listclass=>'class to use for <ul> tag for listed items in category (optional)
+#       boxclass=>'a class to use for the div which provides the box for the category (optional),
 #	items => [
 #		    {	
 #           linktext    =>	'Text to be displayed',
@@ -3964,13 +3983,15 @@ sub list_from_array {
 #   ...
 #   )
 #
+# if listclass is not provided, LC_ListStyleNormal will be used.  
+# if box class is not provided, LC_Box will be used.
 # Outputs: A scalar containing the html markup for the menu.
 
 sub generate_menu {
     my @menu = @_;
     # subs for specific html elements
-    my ($h3, $div, $ul, $li, $a, $img) = inittags( qw(h3 div ul li a img) ); 
-    
+    my ($h2, $div, $ul, $li, $a, $img, $span) = inittags( qw(h2 div ul li a img span) );
+
     my @categories; # each element represents the entire markup for a category
    
     foreach my $category (@menu) {
@@ -3992,32 +4013,36 @@ sub generate_menu {
                                 src   => $src,
                                 alt   => mt(defined($$link{alttext}) ?
                                 $$link{alttext} : $$link{linktext})
-                            }), {
-                            href  => $$link{url},
-                            title => mt($$link{linktitle}),
-                            class => 'LC_menubuttons_link'
-                            }).
-                        $a->(mt($$link{linktext}), {
+                            }).$span->(mt($$link{linktext}), {
+                                       class => "LC_menu_text",}), {
                             href  => $$link{url},
                             title => mt($$link{linktitle}),
                             class => "LC_menubuttons_link"
                             }).
-                         (defined($$link{help}) ? 
+                         (defined($$link{help}) ?
                          Apache::loncommon::help_open_topic($$link{help}) : ''),
                          {class => "LC_menubuttons_inline_text"}));
         }
+        my $ulclass = 'LC_ListStyleNormal';
+        if ($category->{'listclass'} ne '') {
+            $ulclass = $category->{'listclass'};
+        }
+        my $boxclass = 'LC_Box';
+        if ($category->{'boxclass'} ne '') {
+            $boxclass = $category->{'boxclass'};
+        }
 
-        # wrap categorytitle in <h3>, concatenate with 
+        # wrap categorytitle in <h2>, concatenate with 
         # joined and in <ul> tags wrapped @links
         # and wrap everything in an enclosing <div> and push it into
         # @categories
         # such that each element looks like:
-        # <div><h3>title</h3><ul><li>...</li>...</ul></div>
+        # <div><h2>title</h2><ul><li>...</li>...</ul></div>
         # the category won't be added if there aren't any links
         push(@categories, 
-            $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
-            $ul->(join('' ,@links),  {class =>"LC_ListStyleNormal" }),
-            {class=>"LC_Box LC_400Box"})) if scalar(@links);
+            $div->($h2->(mt($$category{categorytitle}), {class=>'LC_hcell LC_heading_2'}).
+            $ul->(join('' ,@links),  {class =>"$ulclass" }),
+            {class=>"$boxclass LC_400Box"})) if scalar(@links);
     }
 
     # wrap the joined @categories in another <div> (column layout)