From raeburn at source.lon-capa.org  Mon May 11 07:49:47 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 11 May 2026 11:49:47 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /homework structuretags.pm
Message-ID: <cvsraeburn1778500187@cvsserver>

raeburn		Mon May 11 11:49:47 2026 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
  Log:
  - WCAG 2 compliance: include labels for form elements.
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.599 loncom/homework/structuretags.pm:1.600
--- loncom/homework/structuretags.pm:1.599	Fri Apr  3 18:09:24 2026
+++ loncom/homework/structuretags.pm	Mon May 11 11:49:47 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.599 2026/04/03 18:09:24 raeburn Exp $
+# $Id: structuretags.pm,v 1.600 2026/05/11 11:49:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -958,7 +958,7 @@
 	&mt('Show All Instances')
 	: &mt('Show All Foils');
 
-    my $show_all= '<span class="LC_nobreak"><label for="showallfoils">'
+    my $show_all= '<span class="LC_nobreak"><label>'
                  .'<input type="checkbox" name="showallfoils"';
     if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
     $show_all.= ' /> '.$show_all_foils_text
@@ -970,9 +970,9 @@
     if (!$Apache::lonhomework::parsing_a_task) {
 	$result.="
 <div class='LC_edit_problem_header_row1'>
-<span class=\"LC_nobreak\">
-".&mt("Problem Status:")."
-<select name='problemstate'>
+<span class=\"LC_nobreak\"><label for=\"problemstate\">
+".&mt("Problem Status:")."</label>
+<select name='problemstate' id='problemstate'>
   <option value=''></option>
   ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
   ".&option('CAN_ANSWER'           ,'problemstate').&mt("Answerable")."</option>
@@ -981,9 +981,9 @@
   ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>
 </select>
 </span>
-<span class=\"LC_nobreak\">
-".&mt("Problem Type:")."
-<select name='problemtype'>
+<span class=\"LC_nobreak\"><label for=\"problemtype\">
+".&mt("Problem Type:")."</label>
+<select name='problemtype' id='problemtype'>
   <option value=''></option>
   ".&option('exam'   ,'problemtype').&mt("Bubblesheet Exam Problem")."</option>
   ".&option('problem','problemtype').&mt("Homework Problem")."</option>
@@ -998,9 +998,9 @@
 $show_all
 </div>
 <div class='LC_edit_problem_header_row2'>
-<span class=\"LC_nobreak\">
-".&mt("Feedback Mode:")."
-<select name='problemstatus'>
+<span class=\"LC_nobreak\"><label for=\"problemstatus\">
+".&mt("Feedback Mode:")."</label>
+<select name='problemstatus' id='problemstatus'>
   <option value=''></option>
   ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
   ".&option('no', 'problemstatus').&mt("Don't Show Incorrect/Correct Feedback")."</option>
@@ -1026,9 +1026,9 @@
 ";
     }
     $result.='
-       <span class="LC_nobreak">
+       <span class="LC_nobreak"><label>
        '.&mt('Apply style file: ').'
-         <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
+         <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" /></label>
          <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
        </span>
      </div>
@@ -1046,7 +1046,7 @@
      <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
      <input type="text" name="rndseed" size="24" value="'.
 	       $rndseed.'"
-             onchange="javascript:document.lonhomework.changerandseed.click()" />';
+             onchange="javascript:document.lonhomework.changerandseed.click()" aria-label="'.&mt('Enter Random Seed').'" />';
 
     if (!$Apache::lonhomework::parsing_a_task) {
 	my $numtoanalyze=$env{'form.numtoanalyze'};
@@ -1056,7 +1056,7 @@
 		'<input type="button" name="submitmode" value="'.&mt('Calculate answers').'" '.
                 'onclick="javascript:setmode(this.form,'."'calcanswers'".')" />'
                ,'<input type="text" name="numtoanalyze" value="'.
-		$numtoanalyze.'" size="5" />').
+		$numtoanalyze.'" size="5" aria-label="'.&mt('Number of answers to calculate').'" />').
 		&Apache::loncommon::help_open_topic("Analyze_Problem",'',undef,undef,300).
 		'</span>';
 						    



From raeburn at source.lon-capa.org  Mon May 11 08:13:55 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 11 May 2026 12:13:55 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonmeta.pm
Message-ID: <cvsraeburn1778501635@cvsserver>

raeburn		Mon May 11 12:13:55 2026 EDT

  Modified files:              
    /loncom/interface	lonmeta.pm 
  Log:
  - WCAG 2 compliance.
    - Include landmark for page's main content to support "Skip to main content".
    - Include labels for form elements.
    - Satisfy minimum spacing between touch targets.
  
  
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.260 loncom/interface/lonmeta.pm:1.261
--- loncom/interface/lonmeta.pm:1.260	Sun Jan  4 19:08:16 2026
+++ loncom/interface/lonmeta.pm	Mon May 11 12:13:55 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.260 2026/01/04 19:08:16 raeburn Exp $
+# $Id: lonmeta.pm,v 1.261 2026/05/11 12:13:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -529,7 +529,7 @@
     # List of courses
     if ($type=~/\_list/) {
         my @Courses = split(/\s*\,\s*/,$value);
-        my $Str='<ul class="LC_fontsize_medium">';
+        my $Str='<ul class="LC_fontsize_medium" style="line-height: 195%;">';
 	my %descriptions;
         foreach my $course (@Courses) {
             my %courseinfo =
@@ -782,6 +782,7 @@
           $output .= &Apache::loncommon::head_subbox(
                          &Apache::loncommon::CSTR_pageheader());
     }
+    $output .= "\n".'<div class="LC_landmark" role="main" id="LC_main_content">'."\n";
     return $output;
 }
 
@@ -888,7 +889,7 @@
                 {'domain' => $resdomain,
                 'only_body' => 1,})
            .'<div class="LC_landmark" role="main" id="LC_main_content">'
-           .'<h1>'.&mt('Metadata').'</h1>'
+           .'<h1 class="LC_heading_1">'.&mt('Metadata').'</h1>'
         );
         if ($env{'form.modal'}) {
             my $width = 500;
@@ -1077,7 +1078,7 @@
         delete($content{$field});
     }
     #
-    $r->print("<h2>$title</h2>"
+    $r->print("<h2 class=\"LC_heading_2\">$title</h2>"
              .'<p>'
              .$disuri.'<br />'
              .$obsoletewarning
@@ -1474,7 +1475,7 @@
             }
         }
         $r->print(<<ENDEDIT);
-<h2>$displayfile</h2>
+<h2 class="LC_heading_2">$displayfile</h2>
 <form method="post" action="" name="defaultmeta">
 ENDEDIT
         my %lt=&fieldnames($file_type);
@@ -1640,7 +1641,8 @@
                     ($field_name eq 'courserestricted'))&&
                     (!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){
                     
-                    $output .= &Apache::lonhtmlcommon::row_title($lt{$field_name})
+                    $output .= &Apache::lonhtmlcommon::row_title('<label for="$field_name">'
+                                                                .$lt{$field_name}.'</label>')
                               .&prettyinput($field_name,
 				   $Apache::lonpublisher::metadatafields{$field_name},
 				                    $readonly,'new_'.$field_name,'defaultmeta',



From raeburn at source.lon-capa.org  Mon May 11 09:42:38 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 11 May 2026 13:42:38 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm
Message-ID: <cvsraeburn1778506958@cvsserver>

raeburn		Mon May 11 13:42:38 2026 EDT

  Modified files:              
    /loncom/publisher	lonpublisher.pm 
  Log:
  - WCAG 2 compliance.
    - Include labels for form elements.
    - Group form elements in fieldset with legend for screenreaders.
    - Replace use of <table> for layout with <div>. 
  
  
-------------- next part --------------
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.314 loncom/publisher/lonpublisher.pm:1.315
--- loncom/publisher/lonpublisher.pm:1.314	Mon Aug  4 19:21:52 2025
+++ loncom/publisher/lonpublisher.pm	Mon May 11 13:42:38 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.314 2025/08/04 19:21:52 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.315 2026/05/11 13:42:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -296,8 +296,8 @@
     $value=~s/\s+/ /gs;
     $title=&mt($title);
     $env{'form.'.$name}=$value;
-    return "\n".&Apache::lonhtmlcommon::row_title($title)
-           .'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />'
+    return "\n".&Apache::lonhtmlcommon::row_title('<label for="'.$name.'">'.$title.'</label>')
+           .'<input type="text" name="'.$name.'" id="'.$name.'" size="80" value="'.$value.'" />'
            .&Apache::lonhtmlcommon::row_closure($noline);
 }
 
@@ -313,8 +313,8 @@
         $disabled = ' disabled="disabled"';
     }
     my $output =
-          "\n".&Apache::lonhtmlcommon::row_title($title)
-          .'<input type="text" name="'.$name.'" size="80" value="'.$value.'"'.$disabled.' />';
+          "\n".&Apache::lonhtmlcommon::row_title('<label for="'.$name.'">'.$title.'</label>')
+          .'<input type="text" name="'.$name.'" id="'.$name.'" size="80" value="'.$value.'"'.$disabled.' />';
     unless ($readonly) {
         $output .=
           '<br />'
@@ -350,8 +350,8 @@
     } else {
 	$env{'form.'.$name}=$idlist[0];
     }
-    my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
-              .'<select name="'.$name.'">';
+    my $selout="\n".&Apache::lonhtmlcommon::row_title('<label for="'.$name.'">'.$title.'</label>')
+              .'<select name="'.$name.'" id="'.$name.'">';
     foreach my $id (@idlist) {
         $selout.='<option value="'.$id.'"';
         if ($id eq $value) {
@@ -367,10 +367,10 @@
 }
 
 sub select_level_form {
-    my ($value,$name)=@_;
+    my ($value,$name,$id)=@_;
     $env{'form.'.$name}=$value;
     if (!defined($value)) { $env{'form.'.$name}=0; }
-    return  &Apache::loncommon::select_level_form($value,$name);
+    return  &Apache::loncommon::select_level_form($value,$name,$id);
 }
 
 sub common_access {
@@ -395,7 +395,17 @@
                                             'closed'  => 'Closed - XML source is closed to everyone',
                                             'open'    => 'Open - XML source is open to people who want to use it',
                                             'sel'     => 'Select',
+                                            'chcd'    => 'Choose copyright/distribution',
+                                            'chsa'    => 'Choose source availability',
+                                            'enpa'    => 'Enter path of rights file or use Select',
+                                            'path'    => 'Path to published rights file',
                                         );
+    my $arialabel;
+    if ($name eq 'dist') {
+        $arialabel = 'aria-label="'.$lt{'chcd'}.'"';
+    } elsif ($name eq 'source') {
+        $arialabel = 'aria-label="'.$lt{'chsa'}.'"';
+    }
     my $output = <<"END";
 <span class="LC_nobreak">
 <label>
@@ -403,7 +413,7 @@
 onclick="showHideAccess(this,'$divid');" />
 $text</label></span>
 <div id="$divid" style="padding:0;clear:both;margin:0;border:0;display:none">
-<select name="$selname" id="$selid" $selonchange>
+<select name="$selname" id="$selid" $selonchange $arialabel>
 <option value="" selected="selected">$lt{'sel'}</option>
 END
     foreach my $val (@{$options}) {
@@ -414,7 +424,7 @@
     if ($name eq 'dist') {
         $output .= <<"END";
 <div id="$customdivid" style="padding:0;clear:both;margin:0;border:0;display:none">
-<input type="text" name="commoncustomrights" size="60" value="" />
+<input type="text" name="commoncustomrights" size="60" value="" placeholder="$lt{'enpa'}" aria-label="$lt{'path'}" />
 <a href="javascript:openbrowser('$formname','commoncustomrights','rights');">
 $lt{'sel'}</a></div>
 END
@@ -1319,6 +1329,7 @@
 # ------------------------------------------------------- Now have all metadata
 
     my %keywords=();
+    my ($hasautogen,$haskeywords);
         
     if (length($content)<500000) {
 	my $textonly=$content;
@@ -1336,10 +1347,9 @@
         foreach ($textonly=~m/[^\s]+/g) {  #match all but whitespaces
             unless ($nokeyref->{$_}) {
                 $keywords{$_}=1;
+                $hasautogen = 1;
             }
         }
-
-
     }
             
     foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) {
@@ -1348,6 +1358,7 @@
 	$addkey=~s/\s$//;
 	if ($addkey=~/\w/) {
 	    $keywords{$addkey}=1;
+            $haskeywords = 1;
 	}
     }
 # --------------------------------------------------- Now we also have keywords
@@ -1396,54 +1407,65 @@
 }
 </script>
 END
+    my $legend;
+    if ($haskeywords) {
+        if ($hasautogen) {
+            $legend = &mt('Existing keywords and auto-generated suggestions');
+        } else {
+            $legend = &mt('Existing keywords');
+        }
+    } elsif ($hasautogen) {
+        $legend = &mt('Auto-generated keyword suggestions');
+    }
+    $env{'form.keywords'} = '';
     $keywordout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Keywords'))
                 .$keywords_help
                 .'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'
                 .'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
-                .'</p><br />'
-                .&Apache::loncommon::start_data_table();
-    my $cols_per_row = 10;
-    my $colcount=0;
-    my $wordcount=0;
-    my $numkeywords = scalar(keys(%keywords));
-
-    foreach my $word (sort(keys(%keywords))) {
-        if ($colcount == 0) {
-            $keywordout .= &Apache::loncommon::start_data_table_row();
-        }
-        $colcount++;
-        $wordcount++;
-        if (($wordcount == $numkeywords) && ($colcount < $cols_per_row)) {
-            my $colspan = 1+$cols_per_row-$colcount;
-            $keywordout .= '<td colspan="'.$colspan.'">';
-        } else {
-            $keywordout .= '<td>';
-        }
-        $keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"';
-        if ($metadatafields{'keywords'}) {
-            if ($metadatafields{'keywords'}=~/\Q$word\E/) {
+                .'</p><br />';
+    if ($haskeywords || $hasautogen) {
+        $keywordout.= '<fieldset class="LC_borderless">'
+                     .'<legend class="LC_visually_hidden">'.$legend.'</legend>'
+                     .'<div class="LC_grid" role="grid" style="margin: 0;">';
+        my $cols_per_row = 10;
+        my $colcount=0;
+        my $wordcount=0;
+        my $numkeywords = scalar(keys(%keywords));
+
+        foreach my $word (sort(keys(%keywords))) {
+            if ($colcount == 0) {
+                $keywordout .= '<div class="LC_grid_row" role="row">';
+            }
+            $colcount++;
+            $wordcount++;
+            $keywordout .= '<div class="LC_grid_cell" role="gridcell">'
+                          .'<label><input type="checkbox" name="keywords" value="'.$word.'"';
+            if ($metadatafields{'keywords'}) {
+                if ($metadatafields{'keywords'}=~/\Q$word\E/) {
+                    $keywordout.=' checked="checked"';
+                    $env{'form.keywords'}.=$word.',';
+                }
+            } elsif (&Apache::loncommon::keyword($word)) {
                 $keywordout.=' checked="checked"';
                 $env{'form.keywords'}.=$word.',';
             }
-        } elsif (&Apache::loncommon::keyword($word)) {
-            $keywordout.=' checked="checked"';
-            $env{'form.keywords'}.=$word.',';
+            $keywordout.=' />'.$word.'</label></div>';
+            if ($colcount == $cols_per_row) {
+                $keywordout.= '</div>';
+                $colcount=0;
+            }
         }
-        $keywordout.=' />'.$word.'</label></td>';
-        if ($colcount == $cols_per_row) {
-            $keywordout.=&Apache::loncommon::end_data_table_row();
-            $colcount=0;
+        if ($colcount > 0) {
+            $keywordout .= '</div>';
         }
-    }
-    if ($colcount > 0) {
-        $keywordout .= &Apache::loncommon::end_data_table_row();
-    }
 
-    $env{'form.keywords'}=~s/\,$//;
+        $env{'form.keywords'}=~s/\,$//;
 
-    $keywordout.=&Apache::loncommon::end_data_table_row()
-                 .&Apache::loncommon::end_data_table()
-                 .&Apache::lonhtmlcommon::row_closure();
+        $keywordout.= '</div></div>';
+    } else {
+        $keywordout.= &mt('No keywords auto-generated from resource content');
+    }
+    $keywordout.= &Apache::lonhtmlcommon::row_closure();
 
     $intr_scrout.=$keywordout;
 
@@ -1451,8 +1473,8 @@
 
     $intr_scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
-    $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Abstract'))
-                 .'<textarea cols="80" rows="5" name="abstract">'
+    $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title('<label for="abstract">'.&mt('Abstract').'</label>')
+                 .'<textarea cols="80" rows="5" name="abstract" id="abstract">'
                  .$metadatafields{'abstract'}
                  .'</textarea>'
                  .&Apache::lonhtmlcommon::row_closure();
@@ -1460,12 +1482,12 @@
     $source=~/\.(\w+)$/;
 
     $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Grade Levels'))
-                 .&mt('Lowest Grade Level:').'&nbsp;'
-                 .&select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel')
+                 .'<label for="lowestgradelevel">'.&mt('Lowest Grade Level:').'</label>&nbsp;'
+                 .&select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel','lowestgradelevel')
 #                .&Apache::lonhtmlcommon::row_closure();
 #   $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Highest Grade Level'))
-                 .' '.&mt('Highest Grade Level:').'&nbsp;'
-                 .&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel')
+                 .' <label for="highestgradelevel">'.&mt('Highest Grade Level:').'</label>&nbsp;'
+                 .&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel','highestgradelevel')
                  .&Apache::lonhtmlcommon::row_closure();
 
     $intr_scrout.=&textfield('Standards','standards',$metadatafields{'standards'});
@@ -1549,8 +1571,8 @@
 #	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
 	my $uctitle=&mt('Obsolete');
         my $obsolete_checked=($metadatafields{'obsolete'})?' checked="checked"':'';
-        $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)
-                     .'<input type="checkbox" name="obsolete"'.$obsolete_checked.' />'
+        $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title('<label for="obsolete">'.$uctitle.'</label>')
+                     .'<input type="checkbox" name="obsolete" id="obsolete"'.$obsolete_checked.' />'
                      .&Apache::lonhtmlcommon::row_closure(1);
         $intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',
 				    'obsoletereplacement',

From raeburn at source.lon-capa.org  Mon May 11 15:45:58 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 11 May 2026 19:45:58 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /publisher lonpubdir.pm
Message-ID: <cvsraeburn1778528758@cvsserver>

raeburn		Mon May 11 19:45:58 2026 EDT

  Modified files:              
    /loncom/publisher	lonpubdir.pm 
  Log:
  - WCAG 2 compliance
    - Include landmark for page's main content to support "Skip to main content".
    - Include labels for form elements.
    - Use <th> tags for column headings and row headings in data table
      with scope="row" attribute for latter.
    - For form elements in data table cells use aria-labelledby to reference 
      appropriate column and row headers.
    - Satisfy minimum spacing between touch targets.
  
  
-------------- next part --------------
Index: loncom/publisher/lonpubdir.pm
diff -u loncom/publisher/lonpubdir.pm:1.184 loncom/publisher/lonpubdir.pm:1.185
--- loncom/publisher/lonpubdir.pm:1.184	Fri Aug  1 16:57:44 2025
+++ loncom/publisher/lonpubdir.pm	Mon May 11 19:45:58 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.184 2025/08/01 16:57:44 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.185 2026/05/11 19:45:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -224,8 +224,10 @@
 
     # Print column headers
     my $output = '';
+    my $colnum = 0;
     foreach my $key (@order) {
         my $idx;
+        $colnum ++;
         # Append an up or down arrow to sorted column
         if ($sortby eq $key) {
             $idx = ($columns{$key}{order} eq 'ascending') ? 0:1;
@@ -233,11 +235,11 @@
             $idx = $idx%2;
         } else { $idx = 2; } # No arrow if column is not sorted
         $output .= (($columns{$key}{order}) ?
-            '<th'.($columns{$key}{colspan} ? ' colspan="'.$columns{$key}{colspan}.'"' : '')
+            '<th id="col'.$colnum.'"'.($columns{$key}{colspan} ? ' colspan="'.$columns{$key}{colspan}.'"' : '')
             .'><a href="'.$linkdir.'/?sortby='.$key.'&amp;sortorder='
             .((($sortby eq $key) && ($sortorder ne 'rev')) ? 'rev' : '').'">'
             .$columns{$key}{text}.$arrows[$idx].'</a></th>' :
-            '<th>'.$columns{$key}{text}.'</th>');
+            '<th id="col'.$colnum.'">'.$columns{$key}{text}.'</th>');
     }
 
 my $result = "<script type=\"text/javascript\">
@@ -344,14 +346,16 @@
 
     # Print the sorted resources
     my %editors = &Apache::loncommon::permitted_editors();
+    my $rownum = 0;
     foreach my $filename (@sorted_files) {
+        $rownum ++;
         if ($filehash->{$filename}->{"cmode"}&$dirptr) {        # Directories
-            &putdirectory($r, $thisdisfn, $linkdir, $filename,
+            &putdirectory($r, $thisdisfn, $linkdir, $filename, $rownum,
                 $filehash->{$filename}->{"cmtime"},
                 $targetdir, \%bombs, \$numdir);
         } else {                                                # Files
-            &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
-                $targetdir, $linkdir, $crsauthor,
+            &putresource($r, $udom, $uname, $filename, $rownum, $thisdisfn,
+                $resdir, $targetdir, $linkdir, $crsauthor,
                 $filehash->{$filename}->{"cmtime"},
                 $filehash->{$filename}->{"size"}, \$numres,
                 $filehash->{$filename}->{"linkfilename"},
@@ -437,7 +441,7 @@
                                                            $disk_quota,'authoring')
                     .'</div>'
                     .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
-
+    $r->print("\n".'<div class="LC_landmark" role="main" id="LC_main_content">'."\n");
     my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $doctitle = 'LON-CAPA '.&mt($title);
     my $newname = &mt('New Name');
@@ -560,10 +564,14 @@
                                        type => 'Type Name Here',
                                        go   => 'Go',
                                        crea => 'Create a new subdirectory or document',
+                                       nmne => 'Name of new subdirectory or document',
                                        qs   => 'Quick name search',
+                                       este => 'Enter search term',
+                                       srte => 'Search term',
                                        cs   => 'Case Sensitive',
                                        re   => 'Regular Expression',
 				       updc => 'Upload a new document',
+                                       namf => 'Name of file to upload',
 				       pick => 'Please select an action to perform using the new filename',
                                        shcu => 'Shortcuts',
                                       );
@@ -580,10 +588,10 @@
     $r->printf(<<END,&Apache::loncommon::help_open_topic('Quicksearch'));
 <div class="LC_columnSection">
     <div>
-      <fieldset style="display:inline">
+      <fieldset style="display: inline; line-height: 185%;">
             <legend>$lt{'qs'}</legend>
                 <script type="text/javascript" src="/adm/quicksearch/quicksearch.js"></script>
-                <input type="text" id="quickfilter" placeholder="Enter search term" onkeyup="applyFilter()"/>
+                <input type="text" id="quickfilter" placeholder="$lt{'este'}" onkeyup="applyFilter()" aria-label="$lt{'srte'}" />
                 <input type="button" value="Clear" onclick="document.getElementById(\'quickfilter\').value=\'\'; applyFilter()" />
                 %s
                 <br />
@@ -617,14 +625,15 @@
                                                    'newtaskfile','newlibraryfile',
                                                    'newdir'));
     }
-    my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions);
+    my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions,
+                                                    '','','','',&mt('Choose new file/directory action'));
     $r->print(<<END);
   <div style="padding-bottom: 2px">
     <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload">
       <fieldset>
         <legend>$lt{'updc'}</legend>
         <input type="hidden" name="filename" value="/priv$thisdisfn/" />
-        <input type="file" name="upfile" class="LC_flUpload" />
+        <input type="file" name="upfile" class="LC_flUpload" aria-label="$lt{'namf'}" />
         <input type="hidden" id="LC_free_space" value="$free_space" />
         <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
       </fieldset>
@@ -647,7 +656,7 @@
                         }
                     }
                   </script>
-		  $selectbox&nbsp;<input type="text" id="newnameid" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
+		  $selectbox&nbsp;<input type="text" id="newnameid" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" aria-label="$lt{'nmne'}" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
 		<br />
                 <span>$lt{'shcu'}:
                  <input type="hidden" name="mode"/>
@@ -761,11 +770,12 @@
 }
 #
 #  Put out a directory table row:
-#    putdirectory(r, base, here, dirname, modtime, targetdir, bombs, numdir)
+#    putdirectory(r, reqfile, here, dirname, rownum, modtime, targetdir, bombs, numdir)
 #      r         - Apache request object.
 #      reqfile   - File in request.
 #      here      - Where we are in directory tree.
 #      dirname   - Name of directory special file.
+#      rownum    - Number or current row in table listing items in current directory.
 #      modtime   - Encoded modification time.
 #      targetdir - Publication target directory.
 #      bombs     - Reference to hash of URLs with runtime error messages.
@@ -773,7 +783,7 @@
 #                  in directory (used in form name for each "actions" dropdown).
 #
 sub putdirectory {
-    my ($r, $reqfile, $here, $dirname, $modtime, $targetdir, $bombs, $numdir) = @_;
+    my ($r, $reqfile, $here, $dirname, $rownum, $modtime, $targetdir, $bombs, $numdir) = @_;
 
 # construct the display filename: the directory name unless ..:
 
@@ -804,7 +814,7 @@
             $actionitem =
                     '<form name="dirselect_'.$$numdir.
                     '" action="/adm/publish">'.
-                    '<select name="diraction" onchange="SetPubDir(this.form,document)">'.
+                    '<select name="diraction" onchange="SetPubDir(this.form,document)" aria-labelledby="col2 row'.$rownum.'">'.
                       '<option selected="selected">'.&mt('Select action').'</option>'.
                       '<option value="open">'.&mt('Open').'</option>'.
                       '<option value="publish">'.&mt('Publish').'</option>'.
@@ -822,8 +832,8 @@
 		  '<td><img src="'.
 		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'.
 		  '<td>'.$actionitem.'</td>'.
-		  '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/">'.
-		  $disfilename.'</a></span></td>'.
+		  '<th scope="row" class="LC_rowheader" id="row'.$rownum.'"><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/">'.
+		  $disfilename.'</a></span></th>'.
 		        '<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
 	if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
 	    $r->print(' <i>'.
@@ -951,7 +961,7 @@
 #   Put a table row for a file resource.
 #
 sub putresource {
-    my ($r, $udom, $uname, $filename, $thisdisfn, $resdir,
+    my ($r, $udom, $uname, $filename, $rownum, $thisdisfn, $resdir,
         $targetdir, $linkdir, $crsauthor, $cmtime, $size,
         $numres, $linkfilename, $title, $status, $pubstatus,
         $editors) = @_;
@@ -986,17 +996,17 @@
     my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
     my $pub_select = '';
     unless (($crsauthor) && ($filename=~ /\.rights$/)) {
-        &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+        &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres,$rownum);
     }
     $r->print(&Apache::loncommon::start_data_table_row().
 	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
 		      '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
               '<td>'.$pub_select.'</td>'.
-	      '<td><span class="LC_filename">'.
+	      '<th scope="row" class="LC_rowheader" id="row'.$rownum.'" style="line-height: 185%;"><span class="LC_filename">'.
 	      '<a href="'.$linkdir.'/'.$filename.'">'.
                $filename.'</a></span>'.$editlink2.$editlink.
-	      '</td>'.
-	      '<td>'.$title.'</td>'.
+	      '</th>'.
+	      '<td style="line-height: 185%;">'.$title.'</td>'.
               '<td class="LC_browser_file_'.$pubstatus.'">&nbsp;&nbsp;</td>'. # Display publication status
               '<td>'.$status.'</td>'.
 	      '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
@@ -1007,10 +1017,10 @@
 }
 
 sub create_pubselect {
-    my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;
+    my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres,$rownum) = @_;
     $$pub_select = '
 <form name="resselect_'.$$numres.'" action="">
-<select name="reschoice"  onchange="SetResChoice(this.form)">
+<select name="reschoice" onchange="SetResChoice(this.form)" aria-labelledby="col2 row'.$rownum.'">
 <option>'.&mt('Select action').'</option>'.
 '<option value="copy">'.&mt('Copy').'</option>';
     if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
@@ -1273,20 +1283,21 @@
     $str = getTitleString($fullname);
         $fullname - Fully qualified filename to check.
 
-=item putdirectory($r, $base, $here, $dirname, $modtime, $targetdir, $bombs,
-                   $numdir)
+=item putdirectory($r, $reqfile, $here, $dirname, $rownum, $modtime, $targetdir,
+                   $bombs, $numdir)
 
     Put out a directory table row:
 
-        $r        - Apache request object.
-        $reqfile  - File in request.
-        $here     - Where we are in directory tree.
-        $dirname  - Name of directory special file.
-        $modtime  - Encoded modification time.
-        targetdir - Publication target directory.
-        bombs     - Reference to hash of URLs with runtime error messages.
-        numdir    - Reference to scalar used to track number of sub-directories
-                    in directory (used in form name for each "actions" dropdown).
+        $r         - Apache request object.
+        $reqfile   - File in request.
+        $here      - Where we are in directory tree.
+        $dirname   - Name of directory special file.
+        $rownum    - Number or current row in table listing items in current directory.
+        $modtime   - Encoded modification time.
+        $targetdir - Publication target directory.
+        $bombs     - Reference to hash of URLs with runtime error messages.
+        $numdir    - Reference to scalar used to track number of sub-directories
+                     in directory (used in form name for each "actions" dropdown).
 
 =back
 

From raeburn at source.lon-capa.org  Mon May 11 19:31:31 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 11 May 2026 23:31:31 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm
Message-ID: <cvsraeburn1778542291@cvsserver>

raeburn		Mon May 11 23:31:31 2026 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - WCAG 2 compliance: enclose radio buttons used to set sorting order of 
    printout in fieldset.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.720 loncom/interface/lonprintout.pm:1.721
--- loncom/interface/lonprintout.pm:1.720	Sun Apr 19 03:47:18 2026
+++ loncom/interface/lonprintout.pm	Mon May 11 23:31:31 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.720 2026/04/19 03:47:18 raeburn Exp $
+# $Id: lonprintout.pm,v 1.721 2026/05/11 23:31:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -282,14 +282,17 @@
 	$next_state) = @_;
     my $result = <<CHOOSE_STUDENTS;
   <state name="$this_state" title="Select Students and Resources">
-      <message><b>Select sorting order of printout</b> </message>
+    <message>
+      <fieldset class="LC_printout"> 
+        <legend>Select sorting order of printout</legend>
+    </message>
 
     <choices variable="$sort_choice">
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
 
-      <message><br /><hr /><br /> </message>
+      <message></fieldset><br /><hr /><br /> </message>
       <student multichoice='1'
                variable="$variable" 
                nextstate="$next_state" 
@@ -4737,12 +4740,16 @@
 	push(@{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]','<b>','</b>','<b>','</b>','<b>','</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS']);
 my $suffixXml = <<ALL_PROBLEMS;
   <state name="STUDENTS1" title="Select People">
-      <message><b>Select sorting order of printout</b> </message>
+    <message>
+      <fieldset class="LC_printout">
+        <legend>Select sorting order of printout</legend>
+    </message>
+
     <choices variable='student_sort'>
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
-      <message><br /><hr /><br /> </message>
+      <message></fieldset><br /><hr /><br /> </message>
       <student multichoice='1' variable="STUDENTS" nextstate="PRINT_FORMATTING" coursepersonnel="1"/>
   </state>
 ALL_PROBLEMS



From raeburn at source.lon-capa.org  Mon May 11 21:13:59 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Tue, 12 May 2026 01:13:59 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm
Message-ID: <cvsraeburn1778548439@cvsserver>

raeburn		Tue May 12 01:13:59 2026 EDT

  Modified files:              
    /loncom/publisher	lonpublisher.pm 
  Log:
  - If there are no existing keywords, and no possible keywords could be 
    extracted from the text in the resource, don't display "check" and 
    "uncheck all" buttons.
  
  
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.315 loncom/publisher/lonpublisher.pm:1.316
--- loncom/publisher/lonpublisher.pm:1.315	Mon May 11 13:42:38 2026
+++ loncom/publisher/lonpublisher.pm	Tue May 12 01:13:58 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.315 2026/05/11 13:42:38 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.316 2026/05/12 01:13:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1418,15 +1418,14 @@
         $legend = &mt('Auto-generated keyword suggestions');
     }
     $env{'form.keywords'} = '';
-    $keywordout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Keywords'))
-                .$keywords_help
-                .'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'
-                .'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
-                .'</p><br />';
+    $keywordout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Keywords').$keywords_help);
     if ($haskeywords || $hasautogen) {
-        $keywordout.= '<fieldset class="LC_borderless">'
-                     .'<legend class="LC_visually_hidden">'.$legend.'</legend>'
-                     .'<div class="LC_grid" role="grid" style="margin: 0;">';
+        $keywordout .= '<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'
+                      .'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
+                      .'<br />'
+                      .'<fieldset class="LC_borderless">'
+                      .'<legend class="LC_visually_hidden">'.$legend.'</legend>'
+                      .'<div class="LC_grid" role="grid" style="margin: 10px 0 0 0;">';
         my $cols_per_row = 10;
         my $colcount=0;
         my $wordcount=0;
@@ -1438,7 +1437,7 @@
             }
             $colcount++;
             $wordcount++;
-            $keywordout .= '<div class="LC_grid_cell" role="gridcell">'
+            $keywordout .= '<div class="LC_grid_cell LC_nobreak" role="gridcell">'
                           .'<label><input type="checkbox" name="keywords" value="'.$word.'"';
             if ($metadatafields{'keywords'}) {
                 if ($metadatafields{'keywords'}=~/\Q$word\E/) {



From raeburn at source.lon-capa.org  Mon May 11 22:00:33 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Tue, 12 May 2026 02:00:33 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /publisher lonpubdisplay.pm
Message-ID: <cvsraeburn1778551233@cvsserver>

raeburn		Tue May 12 02:00:33 2026 EDT

  Modified files:              
    /loncom/publisher	lonpubdisplay.pm 
  Log:
  - WCAG 2 compliance: include landmark for page's main content.
  
  
Index: loncom/publisher/lonpubdisplay.pm
diff -u loncom/publisher/lonpubdisplay.pm:1.5 loncom/publisher/lonpubdisplay.pm:1.6
--- loncom/publisher/lonpubdisplay.pm:1.5	Mon Aug  4 18:42:04 2025
+++ loncom/publisher/lonpubdisplay.pm	Tue May 12 02:00:33 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpubdisplay.pm,v 1.5 2025/08/04 18:42:04 raeburn Exp $
+# $Id: lonpubdisplay.pm,v 1.6 2026/05/12 02:00:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,7 +161,9 @@
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print(&Apache::loncommon::start_page('Metadata Publication'));
+    $r->print(&Apache::loncommon::start_page('Metadata Publication')
+             .'<div class="LC_landmark" role="main" id="LC_main_content">'."\n"
+             .'<h1 class="LC_heading_3">'.&mt('Metadata publication for directory').'</h1>');
 
 # ---------------------------------------------------------------- Write Source
     my $copyfile=$target;
@@ -188,7 +190,7 @@
         $r->print('<span class="LC_error">'.
                   &mt('Failed to copy source').", $!, ".&mt('FAIL').
 		  '</span>');
-        $r->print(&Apache::loncommon::end_page());
+        $r->print('</div>'.&Apache::loncommon::end_page());
         return OK;
     }
 
@@ -203,7 +205,7 @@
 # ------------------------------------------------------------------- Link back
     $r->print('<a href="'.&Apache::loncommon::cfile_url($fn).'">'.
               &mt('Back to Metadata').'</a>');
-    $r->print(&Apache::loncommon::end_page());
+    $r->print('</div>'.&Apache::loncommon::end_page());
     return OK;
 }
 
@@ -364,6 +366,7 @@
              .&Apache::lonhtmlcommon::breadcrumbs()
              .&Apache::loncommon::head_subbox(
                   &Apache::loncommon::CSTR_pageheader($docroot.$fn))
+             .'<div class="LC_landmark" role="main" id="LC_main_content">'."\n"
     );
 
     my $thisdisfn=&HTML::Entities::encode($fn,'<>&"');
@@ -470,7 +473,7 @@
             }
         }
     }
-    $r->print(&Apache::loncommon::end_page());
+    $r->print('</div>'.&Apache::loncommon::end_page());
     &reset_globals();
     return OK;
 }



From raeburn at source.lon-capa.org  Tue May 12 00:04:38 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Tue, 12 May 2026 04:04:38 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonpickuser.pm
Message-ID: <cvsraeburn1778558678@cvsserver>

raeburn		Tue May 12 04:04:38 2026 EDT

  Modified files:              
    /loncom/interface	lonpickuser.pm 
  Log:
  - WCAG 2 compliance
    Include landmark for page's main content to support "Skip to main content".
    Sequential headings. 
  
  
Index: loncom/interface/lonpickuser.pm
diff -u loncom/interface/lonpickuser.pm:1.6 loncom/interface/lonpickuser.pm:1.7
--- loncom/interface/lonpickuser.pm:1.6	Mon Sep  5 01:46:08 2016
+++ loncom/interface/lonpickuser.pm	Tue May 12 04:04:37 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Search for a user
 #
-# $Id: lonpickuser.pm,v 1.6 2016/09/05 01:46:08 raeburn Exp $
+# $Id: lonpickuser.pm,v 1.7 2026/05/12 04:04:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -175,10 +175,11 @@
         $startargs->{'add_entries'} = { onload => 'javascript:setUserSearch();' };
     }
     $r->print(&Apache::loncommon::start_page('Selecting course personnel',
-                                             $js,$startargs));
+                                             $js,$startargs)
+             ."\n".'<div class="LC_landmark" role="main" id="LC_main_content">'."\n");
     if ($env{'form.caller'} eq 'checkusername') {
         $r->print(&check_user_form().
-                  &Apache::loncommon::end_page());
+                  '</div>'.&Apache::loncommon::end_page());
         return OK;
     }
     my %toset = (
@@ -231,7 +232,7 @@
         if ($cansearch) {
             
             $r->print(<<"ENDBLOCK");
-<h3>$headertext</h3>
+<h1 class="LC_heading_2">$headertext</h1>
 <form action="/adm/pickuser" method="post" name="userpicker">
 $opener_elems
 <input type="hidden" name="phase" value="get_user_info" />
@@ -322,7 +323,7 @@
                   &mt('Save').'" onclick="javascript:setphase('.
                   "'store_newuser'".');" /></form></div>');
     }
-    $r->print(&Apache::loncommon::end_page());
+    $r->print('</div>'.&Apache::loncommon::end_page());
     return OK;
 }
 



From raeburn at source.lon-capa.org  Tue May 12 00:24:57 2026
From: raeburn at source.lon-capa.org (raeburn)
Date: Tue, 12 May 2026 04:24:57 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonhelper.pm
Message-ID: <cvsraeburn1778559897@cvsserver>

raeburn		Tue May 12 04:24:57 2026 EDT

  Modified files:              
    /loncom/interface	lonhelper.pm 
  Log:
  - Remove trailing white space.  No code changes.
  
  
-------------- next part --------------
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.209 loncom/interface/lonhelper.pm:1.210
--- loncom/interface/lonhelper.pm:1.209	Thu Apr 23 16:56:43 2026
+++ loncom/interface/lonhelper.pm	Tue May 12 04:24:57 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.209 2026/04/23 16:56:43 raeburn Exp $
+# $Id: lonhelper.pm,v 1.210 2026/05/12 04:24:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -208,7 +208,7 @@
 }
 
 BEGIN {
-    Apache::lonxml::register('Apache::lonhelper', 
+    Apache::lonxml::register('Apache::lonhelper',
                              ('helper'));
       register('Apache::lonhelper', ('state'));
 }
@@ -223,7 +223,7 @@
 # To collect parameters, the contents of the subtags are collected
 # into this paramHash, then passed to the element object when the 
 # end of the element tag is located.
-my $paramHash; 
+my $paramHash;
 
 # Note from Jeremy 5-8-2003: It is *vital* that the real handler be called
 # as a subroutine from the handler, or very mysterious things might happen.
@@ -324,7 +324,7 @@
 
 sub end_helper {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    
+
     if ($target ne 'helper') {
         return '';
     }
@@ -508,7 +508,7 @@
 sub allowedCheck {
     my $self = shift;
 
-    if (!defined($self->{REQUIRED_PRIV})) { 
+    if (!defined($self->{REQUIRED_PRIV})) {
         return 1;
     }
     my ($priv,$modifier) = split(/\&/,$self->{REQUIRED_PRIV});
@@ -543,7 +543,7 @@
 	my $prevState = $self->{STATES}{$self->{STATE}};
         $prevState->postprocess();
     }
-    
+
     # Note, to handle errors in a state's input that a user must correct,
     # do not transition in the postprocess, and force the user to correct
     # the error.
@@ -551,7 +551,7 @@
     # Phase 2: Preprocess current state
     my $startState = $self->{STATE};
     my $state = $self->{STATES}->{$startState};
-    
+
     # For debugging, print something here to determine if you're going
     # to an undefined state.
     if (!defined($state)) {
@@ -561,7 +561,7 @@
 
     # Phase 3: While the current state is different from the previous state,
     # keep processing.
-    while ( $startState ne $self->{STATE} && 
+    while ( $startState ne $self->{STATE} &&
             defined($self->{STATES}->{$self->{STATE}}) )
     {
 	$startState = $self->{STATE};
@@ -570,7 +570,7 @@
     }
 
     return;
-} 
+}
 
 # 1: Do the post processing for the previous state.
 # 2: Do the preprocessing for the current state.
@@ -592,7 +592,7 @@
     # Phase 4: Display.
     my $stateTitle=&mt($state->title());
     my $stateHelp=     $state->help();
-    my $browser_searcher_js = 
+    my $browser_searcher_js =
 	'<script type="text/javascript">'."\n".
 	&Apache::loncommon::browser_and_searcher_javascript().
 	"\n".'</script>';
@@ -770,7 +770,7 @@
 sub addElement {
     my $self = shift;
     my $element = shift;
-    
+
     push @{$self->{ELEMENTS}}, $element;
 }
 
@@ -860,12 +860,12 @@
     $self->{PARAMS} = $paramHash;
     $self->{STATE} = $state;
     $state->addElement($self);
-    
+
     # Ensure param hash is not reused
     $paramHash = {};
 
     return $self;
-}   
+}
 
 sub start_nextstate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -873,7 +873,7 @@
     if ($target ne 'helper') {
         return '';
     }
-    
+ 
     $paramHash->{NEXTSTATE} = &Apache::lonxml::get_all_text('/nextstate',
                                                              $parser);
     return '';
@@ -887,7 +887,7 @@
     if ($target ne 'helper') {
         return '';
     }
-    
+ 
     $paramHash->{FINAL_CODE} = &Apache::lonxml::get_all_text('/finalcode',
                                                              $parser);
     return '';
@@ -901,7 +901,7 @@
     if ($target ne 'helper') {
         return '';
     }
-    
+ 
     $paramHash->{DEFAULT_VALUE} = &Apache::lonxml::get_all_text('/defaultvalue',
                                                              $parser);
     $paramHash->{DEFAULT_VALUE} = 'sub { my $helper = shift; my $state = shift;' .
@@ -918,7 +918,7 @@
     if ($target ne 'helper') {
         return '';
     }
-    
+ 
     $paramHash->{VALIDATOR} = &Apache::lonxml::get_all_text('/validator',
                                                              $parser);
     $paramHash->{VALIDATOR} = 'sub { my $helper = shift; my $state = shift; my $element = shift; my $val = shift;' .
@@ -1035,13 +1035,13 @@
 
 sub render {
     my $self = shift;
-    
+
     if ($self->{TYPE} =~ /^\s*warning\s*$/i) {
-	 $self->{MESSAGE_TEXT} = 
+	 $self->{MESSAGE_TEXT} =
 	     '<span class="LC_warning">'. $self->{MESSAGE_TEXT}.'</span>';
     }
     if ($self->{TYPE} =~ /^\s*error\s*$/i) {
-	 $self->{MESSAGE_TEXT} = 
+	 $self->{MESSAGE_TEXT} =
 	     '<span class="LC_error">'. $self->{MESSAGE_TEXT}.'</span>';
     }
     return $self->{MESSAGE_TEXT};
@@ -1382,7 +1382,7 @@
     my $evalFlag   = $token->[2]{'eval'};
     my $relatedVar = $token->[2]{'relatedvalue'}; 
     my $relatedDefault = $token->[2]{'relateddefault'};
-    push @{$paramHash->{CHOICES}}, [&mtn($human), $computer, $nextstate, 
+    push @{$paramHash->{CHOICES}}, [&mtn($human), $computer, $nextstate,
                                     $evalFlag, $relatedVar, $relatedDefault];
     return '';
 }
@@ -1392,7 +1392,7 @@
 }
 
 {
-    # used to generate unique id attributes for <input> tags. 
+    # used to generate unique id attributes for <input> tags.
     # internal use only.
     my $id = 0;
     sub new_id { return $id++; }
@@ -1450,7 +1450,7 @@
 
     if (defined($self->{DEFAULT_VALUE})) {
         $checkedChoicesFunc = eval ($self->{DEFAULT_VALUE});
-        die 'Error in default value code for variable ' . 
+        die 'Error in default value code for variable ' .
             $self->{'variable'} . ', Perl said: ' . $@ if $@;
     } else {
         $checkedChoicesFunc = sub { return ''; };
@@ -1464,9 +1464,9 @@
     } else {
         # single choice
         my $selectedChoice = &$checkedChoicesFunc($helper, $self);
-        
+
         my $foundChoice = 0;
-        
+
         # check that the choice is in the list of choices.
         for my $choice (@{$self->{CHOICES}}) {
             if ($choice->[1] eq $selectedChoice) {
@@ -1474,8 +1474,8 @@
                 $foundChoice = 1;
             }
         }
-        
-        # If we couldn't find the choice, pick the first one 
+
+        # If we couldn't find the choice, pick the first one
         if (!$foundChoice) {
             $checkedChoices{$self->{CHOICES}->[0]->[1]} = 1;
         }
@@ -1488,7 +1488,7 @@
         $result .= "<div role=\"row\" class=\"LC_grid_row\" style=\"line-height: 160%;\">\n"
                   ."<div role=\"gridcell\" class=\"LC_grid_cell\">&nbsp;</div>\n"
                   ."<div role=\"gridcell\" class=\"LC_grid_cell\"><input type='$type' name='${var}_forminput'"
-                  ." value='".HTML::Entities::encode($choice->[1],"<>&\"'") 
+                  ." value='".HTML::Entities::encode($choice->[1],"<>&\"'")
                   ."'";
         if ($checkedChoices{$choice->[1]}) {
             $result .= " checked='checked'";
@@ -1530,7 +1530,7 @@
 
 
     if (!defined($chosenValue) && !$self->{'allowempty'}) {
-        $self->{ERROR_MSG} = 
+        $self->{ERROR_MSG} =
 	    &mt("You must choose one or more choices to continue.");
         return 0;
     }
@@ -1544,7 +1544,7 @@
     if (defined($self->{NEXTSTATE})) {
         $helper->changeState($self->{NEXTSTATE});
     }
-    
+ 
     foreach my $choice (@{$self->{CHOICES}}) {
         if ($choice->[1] eq $chosenValue) {
             if (defined($choice->[2])) {
@@ -1643,7 +1643,7 @@
 
     if (defined($self->{DEFAULT_VALUE})) {
         $checkedChoicesFunc = eval ($self->{DEFAULT_VALUE});
-        die 'Error in default value code for variable ' . 
+        die 'Error in default value code for variable ' .
             $self->{'variable'} . ', Perl said: ' . $@ if $@;
     } else {
         $checkedChoicesFunc = sub { return ''; };
@@ -1651,9 +1651,9 @@
 
     # single choice
     my $selectedChoice = &$checkedChoicesFunc($helper, $self);
-    
+ 
     my $foundChoice = 0;
-    
+ 
     # check that the choice is in the list of choices.
     for my $choice (@{$self->{CHOICES}}) {
 	if ($choice->[1] eq $selectedChoice) {
@@ -1661,8 +1661,8 @@
 	    $foundChoice = 1;
 	}
     }
-    
-    # If we couldn't find the choice, pick the first one 
+ 
+    # If we couldn't find the choice, pick the first one
     if (!$foundChoice) {
 	$checkedChoices{$self->{CHOICES}->[0]->[1]} = 1;
     }
@@ -1672,8 +1672,8 @@
 
     $result .= "<select name='${var}_forminput'$id>\n";
     foreach my $choice (@{$self->{CHOICES}}) {
-        $result .= "<option value='" . 
-            HTML::Entities::encode($choice->[1],"<>&\"'") 
+        $result .= "<option value='" .
+            HTML::Entities::encode($choice->[1],"<>&\"'")
             . "'";
         if ($checkedChoices{$choice->[1]}) {
             $result .= " selected='selected' ";
@@ -1707,7 +1707,7 @@
     if (defined($self->{NEXTSTATE})) {
         $helper->changeState($self->{NEXTSTATE});
     }
-    
+ 
     foreach my $choice (@{$self->{CHOICES}}) {
         if ($choice->[1] eq $chosenValue) {
             if (defined($choice->[2])) {
@@ -1813,10 +1813,10 @@
 
     if (defined($helper->{VARS}{$var})
 	&&  $helper->{VARS}{$var} > 0) {
-        $date = &get_date_object($helper->{VARS}{$var}); 
+        $date = &get_date_object($helper->{VARS}{$var});
     } elsif (defined($self->{DEFAULT_VALUE})) {
         my $valueFunc = eval($self->{DEFAULT_VALUE});
-        die('Error in default value code for variable ' . 
+        die('Error in default value code for variable ' .
             $self->{'variable'} . ', Perl said: ' . $@) if $@;
         $time = &$valueFunc($helper, $self);
 	if (lc($time) eq 'anytime') {
@@ -1958,7 +1958,7 @@
         if (($var eq 'startreserve') || ($var eq 'endreserve')) {
             $anytimetext = &mt('Any time before slot starts');
         } elsif (($var eq 'startunique') || ($var eq 'endunique')) {
-            $anytimetext = &mt('No restriction on uniqueness');     
+            $anytimetext = &mt('No restriction on uniqueness');
         }
 	$result.="name='${var}anytime'/>".$anytimetext.'</label>'
     }
@@ -1974,9 +1974,9 @@
     } else {
 	my $month = $env{'form.' . $var . 'month'};
         $month ++;
-	my $day = $env{'form.' . $var . 'day'}; 
-	my $year = $env{'form.' . $var . 'year'}; 
-	my $min = 0; 
+	my $day = $env{'form.' . $var . 'day'};
+	my $year = $env{'form.' . $var . 'year'};
+	my $min = 0;
 	my $hour = 0;
 	if ($self->{'hoursminutes'}) {
 	    $min = $env{'form.' . $var . 'minute'};
@@ -3347,7 +3347,7 @@
     foreach my $group_name (sort(keys(%curr_groups))) {
 	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
     }
-}    
+}
 
 sub end_section {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;