--- loncom/interface/lonsearchcat.pm	2023/12/30 03:45:44	1.359
+++ loncom/interface/lonsearchcat.pm	2025/03/19 15:18:59	1.362
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.359 2023/12/30 03:45:44 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.362 2025/03/19 15:18:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -308,7 +308,7 @@ END
     }
     #
     if ($env{'form.searchmode'} eq 'advanced') {
-        my $srchtype = 'Catalog';
+        my $srchtype = 'Content Library';
         if ($env{'form.area'} eq 'portfolio') {
             $srchtype = 'Portfolio';
         }
@@ -399,7 +399,7 @@ END
         }
     }
     return OK;
-} 
+}
 
 #
 # The mechanism used to store values away and retrieve them does not
@@ -547,7 +547,7 @@ sub setup_basic_search {
              &Apache::lonhtmlcommon::textbox('basicexp',
                                              $env{'form.basicexp'},50).
              '<br />'.
-            '<span class="LC_fontsize_small">'.&searchhelp().'</span>'.'</td>'.
+            '<span class="LC_fontsize_medium">'.&searchhelp().'</span>'.'</td>'.
             '<td>'.
             '<span class="LC_nobreak">'.('&nbsp;'x3).$adv_search_link.'</span>'.'<br />'.
             '<span class="LC_nobreak">'.('&nbsp;'x1).$userelatedwords.'</span>'.'<br />'.
@@ -599,7 +599,7 @@ sub print_advanced_search_form{
 $closebutton
 </p>
 END
-    my $srchtype = 'Catalog';
+    my $srchtype = 'Content Library';
     my $jscript;
     if ($env{'form.area'} eq 'portfolio') {
         $srchtype = 'Portfolio';
@@ -617,7 +617,7 @@ function additional_metadata() {
     }
     my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
                                                $jscript);
-    $scrout .= $bread_crumb;
+    $scrout .= $bread_crumb.'<div class="LC_landmark" role="main">'."\n";
 
     $scrout .= '<form method="post" action="/adm/searchcat" name="advsearch">'
               .$hidden_fields 
@@ -636,7 +636,7 @@ function additional_metadata() {
 
     # Standard Metadata
     $scrout .= &Apache::lonhtmlcommon::row_headline()
-              .'<h3>'.&mt("Standard $srchtype Metadata").'</h3>'
+              .'<h2 class="LC_heading_2">'.&mt("Standard $srchtype Metadata").'</h2>'
               .&searchhelp()
               .&Apache::lonhtmlcommon::row_closure();
     my %related_word_search = 
@@ -656,24 +656,26 @@ function additional_metadata() {
     foreach my $field ('title','author','subject','owner','authorspace',
                        'modifyinguser','keywords','notes','abstract',
                        'standards','mime') {
-        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
+        $scrout .= &Apache::lonhtmlcommon::row_title('<label for="'.$field.'">'.
+                                                     &titlefield($fields{$field}).'</label>')
                   .&Apache::lonmeta::prettyinput($field,
                                           $env{'form.'.$field},'',
                                           $field,
                                           'advsearch',
                                           $related_word_search{$field},
-                                          '',
+                                          '&nbsp;&nbsp;',
                                           $env{'form.'.$field.'_related'},
                                           50);
         if ($related_word_search{$field}) {
-            $scrout .= &mt('related words');
+            $scrout .= '<label for="'.$field.'_related">'.&mt('related words').'</label>';
         } else {
             $scrout .= '';
         }
         $scrout .= &Apache::lonhtmlcommon::row_closure();
     }
     foreach my $field ('lowestgradelevel','highestgradelevel') {
-        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
+        $scrout .= &Apache::lonhtmlcommon::row_title('<label for="'.$field.'">'.
+                                                     &titlefield($fields{$field}).'</label>')
                   .&Apache::lonmeta::prettyinput($field,
                                           $env{'form.'.$field},'',
                                           $field,
@@ -682,9 +684,10 @@ function additional_metadata() {
                   .&Apache::lonhtmlcommon::row_closure();
     }
 
-    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('MIME Type Category')))
+    $scrout .= &Apache::lonhtmlcommon::row_title('<label for="category">'.
+                                                 &titlefield(&mt('MIME Type Category')).'</label>')
               .&Apache::loncommon::filecategoryselect('category',
-                   $env{'form.category'})
+                   $env{'form.category'},'category')
               .&Apache::lonhtmlcommon::row_closure();
 
     my $anydomain = 1;
@@ -694,23 +697,27 @@ function additional_metadata() {
         }
     }
 
-    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')));
+    $scrout .= &Apache::lonhtmlcommon::row_title('<label for="domains">'.
+                                                 &titlefield(&mt('Domains')).'</label>');
     if ($anydomain) {
         my $defdom = &Apache::lonnet::default_login_domain();
         my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('shared',$defdom);
         $scrout .= &Apache::loncommon::domain_select('domains',
-                   $env{'form.domains'},1,$trusted,$untrusted);
+                   $env{'form.domains'},1,$trusted,$untrusted,'domains');
     } else {
         $scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'},
-                                                       'domains','','','',[$env{'user.domain'}],'',1);
+                                                       'domains','','','',
+                                                       [$env{'user.domain'}],'',1,'domains');
     }
     $scrout .= &Apache::lonhtmlcommon::row_closure();
 
     # Misc metadata
     if ($env{'form.area'} ne 'portfolio') {
-        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Copyright/Distribution')))
+        $scrout .= &Apache::lonhtmlcommon::row_title('<label for="copyright">'.
+                                                     &titlefield(&mt('Copyright/Distribution')).'</label>')
                   .&Apache::lonmeta::selectbox('copyright',
                                              $env{'form.copyright'},'',
+                                             'copyright',
                                 \&Apache::loncommon::copyrightdescription,
                                        ( undef,
                                         &Apache::loncommon::copyrightids)
@@ -718,9 +725,10 @@ function additional_metadata() {
                   .&Apache::lonhtmlcommon::row_closure();
     }
 
-    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Language')))
+    $scrout .= &Apache::lonhtmlcommon::row_title('<label for="language">'.
+                                                 &titlefield(&mt('Language')).'</label>')
               .&Apache::lonmeta::selectbox('language',
-                                    $env{'form.language'},'',
+                                    $env{'form.language'},'','language',
                                     \&Apache::loncommon::languagedescription,
                                     ('any',&Apache::loncommon::languageids)
                                     )
@@ -733,26 +741,32 @@ function additional_metadata() {
         if ($curnumadd eq '') {
             $curnumadd = 1;
         }
+        my $customlabel = &mt('Text box description');
         $scrout .= &Apache::lonhtmlcommon::row_headline()
                   .'<h3>'.&mt('Custom Metadata fields').'</h3>'
                   .&Apache::lonhtmlcommon::row_closure()
-                  .&Apache::lonhtmlcommon::row_title('')
+                  .&Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$customlabel.'</span>',
+                                                     '','','',1)
                   .&mt('Field Name').' | '.&mt('Field Value(s)')
                   .&Apache::lonhtmlcommon::row_closure();
 
         for (my $j=0; $j<$curnumadd; $j++) {
             my $num = $j+1;
+            my $namelabel = &mt('name of custom metadata field [_1]',$num);
+            my $valuelabel = &mt('value of custom metadata field [_1]',$num);
             $scrout .= &Apache::lonhtmlcommon::row_title(&mt('Custom metadata [_1]',$num))
-                      .'<input type="text"'
+                      .'<input type="text" id="addedfield_'.$j.'"'
                       .' name="addedfield_'.$j.'" size="10"'
-                      .' value="'.$env{'form.addedfield_'.$j}.'" />'
+                      .' value="'.$env{'form.addedfield_'.$j}.'" aria-label="'.$namelabel.'" />'
                       .' '
                       .'<input type="text" '
                       .'name="addedvalues_'.$j.'" size="15"'
-                      .' value="'.$env{'form.addedvalues_'.$j}.'" />'
+                      .' value="'.$env{'form.addedvalues_'.$j}.'" aria-label="'.$valuelabel.'" />'
                       .&Apache::lonhtmlcommon::row_closure();
         }
-        $scrout .= &Apache::lonhtmlcommon::row_title('')
+        my $addcustomlabel = &mt('Add metadata field option');
+        $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$addcustomlabel.'</span>',
+                                                     '','','',1)
                   .'<label>'
                   .'<input type="checkbox" name="newfield"'
                   .' value="1" onclick="javascript:additional_metadata()" />'
@@ -763,65 +777,90 @@ function additional_metadata() {
 } else {
         #
         # Dynamic metadata
+        my $statslabel = &mt('Text box description');
         $scrout .= &Apache::lonhtmlcommon::row_headline()
                   .'<h3>'.&mt('Problem Statistics').'</h3>'
                   .&Apache::lonhtmlcommon::row_closure();
-        $scrout .= &Apache::lonhtmlcommon::row_title('')
+        $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$statslabel.'</span>',
+                                                     '','','',1)
                   .&mt('Minimum').' | '.&mt('Maximum')
                   .&Apache::lonhtmlcommon::row_closure();
         foreach my $statistic 
             ({ name=>'count',
-               description=>'Network-wide number of accesses (hits)',},
+               description=>'Network-wide number of accesses (hits)',
+               minlabel => 'minimum hit count',
+               maxlabel => 'maximum hit count'},
              { name=>'stdno',
                description=>
-               'Statistics calculated for number of students',},
+               'Statistics calculated for number of students',
+               minlabel => 'minimum number of students in calculation',
+               maxlabel => 'maximum number of students in calculation'},
              { name => 'avetries',
-               description=>'Average number of tries till solved',},
+               description=>'Average number of tries till solved',
+               minlabel => 'minimum average tries till solved',
+               maxlabel => 'maximum average tries till solved'},
              { name => 'difficulty',
-               description=>'Degree of difficulty',},
+               description=>'Degree of difficulty',
+               minlabel => 'minimum degree of difficulty',
+               maxlabel => 'maximum degree of difficulty'},
              { name => 'disc',
-               description=>'Degree of discrimination'}) {
+               description=>'Degree of discrimination',
+               minlabel => 'minimum degree of discrimination',
+               maxlabel => 'maximum degree of discrimination'}) {
               $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($statistic->{'description'})))
                         .'<input type="text" name="'.$statistic->{'name'}
-                        .'_min" value="" size="6" />'
+                        .'_min" value="" size="6" aria-label="'.&mt($statistic->{'minlabel'}).'" />'
                         .' '
                         .'<input type="text" name="'.$statistic->{'name'}
-                        .'_max" value="" size="6" />'
+                        .'_max" value="" size="6" aria-label="'.&mt($statistic->{'maxlabel'}).'" />'
                         .&Apache::lonhtmlcommon::row_closure();
         }
-
+        my $evallabel = &mt('Text box description');
         $scrout .= &Apache::lonhtmlcommon::row_headline()
                   .'<h3>'.&mt('Evaluation Data').'</h3>'
                   .&Apache::lonhtmlcommon::row_closure();
-        $scrout .= &Apache::lonhtmlcommon::row_title('')
+        $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$evallabel.'</span>',
+                                                     '','','',1)
                   .&mt('Minimum').' | '.&mt('Maximum')
                   .&Apache::lonhtmlcommon::row_closure();
         foreach my $evaluation
             ( { name => 'clear',
-                description => 'Material presented in clear way'},
+                description => 'Material presented in clear way',
+                minlabel => 'minimum score: clarity',
+                maxlabel => 'maximum score: clarity'},
               { name =>'depth',
-                description => 'Material covered with sufficient depth'},
+                description => 'Material covered with sufficient depth',
+                minlabel => 'minimum score: coverage depth',
+                maxlabel => 'maximum score: coverage depth'},
               { name => 'helpful',
-                description => 'Material is helpful'},
+                description => 'Material is helpful',
+                minlabel => 'minimum score: content helpful',
+                maxlabel => 'maximum score: content helpful'},
               { name => 'correct',
-                description => 'Material appears to be correct'},
+                description => 'Material appears to be correct',
+                minlabel => 'minimum score: correctness',
+                maxlabel => 'maximum score: correctness'},
               { name => 'technical',
-                description => 'Resource is technically correct'}){
+                description => 'Resource is technically correct',
+                minlabel => 'minimum score: technical correctness',
+                maxlabel => 'maximum score: technical correctness'}) {
             $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($evaluation->{'description'})))
                       .'<input type="text" name="'
-                      .$evaluation->{'name'}.'_min" value="" size="6" />'
+                      .$evaluation->{'name'}.'_min" value="" size="6" aria-label="'.&mt($evaluation->{'minlabel'}).'" />'
                       .' '
                       .'<input type="text" name="'
-                      .$evaluation->{'name'}.'_max" value="" size="6" />'
+                      .$evaluation->{'name'}.'_max" value="" size="6" aria-label="'.&mt($evaluation->{'maxlabel'}).'" />'
                       .&Apache::lonhtmlcommon::row_closure();
         }
     }
     #
     # Creation/Modification date limits
+    my $dateslabel = &mt('Text box description');
     $scrout .= &Apache::lonhtmlcommon::row_headline()
               .'<h3>'.&mt('Creation and Modification dates').'</h3>'
               .&Apache::lonhtmlcommon::row_closure();
-    $scrout .= &Apache::lonhtmlcommon::row_title('')
+    $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$dateslabel.'</span>',
+                                                 '','','',1)
               .&mt('Month[_1]Day[_2]Year','&nbsp;'x14,'&nbsp;'x6)
               .&Apache::lonhtmlcommon::row_closure();
 
@@ -880,7 +919,7 @@ function additional_metadata() {
     $scrout .= $advanced_buttons
               .'</form>';
 
-    $scrout .= &Apache::loncommon::end_page();
+    $scrout .= '</div>'.&Apache::loncommon::end_page();
     $r->print($scrout);
     return;
 }
@@ -953,20 +992,20 @@ sub viewoptions {
     if (! defined($env{'form.viewselect'})) { 
         $env{'form.viewselect'}='detailed'; 
     }
-    $scrout .= '<span class="LC_nobreak">'
+    $scrout .= '<span class="LC_nobreak"><label>'
               .&mt('Type:').' '
               .&Apache::lonmeta::selectbox('viewselect',
-                   $env{'form.viewselect'},'',
+                   $env{'form.viewselect'},'','',
                    \&viewoptiontext,
                    sort(keys(%Views)))
-              .'</span>';
+              .'</label></span>';
     my $countselect = &Apache::lonmeta::selectbox('show',
-                                                  $env{'form.show'},'',
+                                                  $env{'form.show'},'','',
                                                   undef,
                                                   (10,20,50,100,1000,10000));
-    $scrout .= ' <span class="LC_nobreak">'
+    $scrout .= ' <span class="LC_nobreak"><label>'
               .&mt('Records per Page:').' '.$countselect
-              .'</span>'.$/;
+              .'</label></span>'.$/;
     return $scrout;
 }
 
@@ -1263,7 +1302,7 @@ sub parse_advanced_search {
     if (! $fillflag) {
 	&output_blank_field_error($r,$closebutton,
                                   'phase=disp_adv',$hidden_fields);
-	return ;
+	return;
     }
     # Turn the form input into a SQL-based query
     my $query='';
@@ -2105,10 +2144,10 @@ sub print_sort_form {
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import',
                                             '','','','','','',$target);
-
     my $result = <<END;
 $start_page
 $breadcrumbs
+<div class="LC_landmark" role="main">
 <form name="statusform" action="" method="post" target="$target">
 <input type="hidden" name="catalogmode" value="import" />
 <input type="hidden" name="acts" value="" />
@@ -2131,7 +2170,7 @@ END
             .' '.$revise.'</p>'
             .'<p>'.&mt('Search: ').$pretty_query_string
             .'</p></form>';
-    $r->print($result.&Apache::loncommon::end_page());
+    $r->print($result.'</div>'.&Apache::loncommon::end_page());
     return;
 }
 
@@ -2381,6 +2420,7 @@ sub run_search {
     $r->print(<<END);
 $start_page
 $breadcrumbs
+<div class="LC_landmark" role="main">
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -2608,7 +2648,7 @@ END
     # We have run out of time or run out of servers to talk to and
     # results to get, so let the client know the top frame needs to be
     # loaded from /adm/searchcat
-    $r->print(&Apache::loncommon::end_page());
+    $r->print('</div>'.&Apache::loncommon::end_page());
 #    if ($env{'form.catalogmode'} ne 'import') {
          $r->print(<<SCRIPT);
 <script>
@@ -2672,7 +2712,8 @@ sub display_results {
     if (!defined($viewfunction)) {
         $r->print('<p class="LC_error">'
                  .&mt('Internal Error - Bad view selected.')
-                 .'</p>'."\n");
+                 .'</p>'."\n"
+                 .'</form></div>'.&Apache::loncommon::end_page());
         $r->rflush();
         return;
     }
@@ -2694,7 +2735,7 @@ sub display_results {
             $r->print('<p class="LC_error">'.
               &mt('Unable to save import results.').
               '</p>'.
-              '</form>'.
+              '</form></div>'.
 		      &Apache::loncommon::end_page());
             $r->rflush();
             return;
@@ -2715,7 +2756,7 @@ sub display_results {
         $r->print('<p class="LC_error">'.
           &mt('A MySQL error has occurred.').
           '</p>'.
-          '</form>'.
+          '</form></div>'.
 		  &Apache::loncommon::end_page());
         &Apache::lonnet::logthis("lonmysql was unable to determine the number".
                                  " of rows in table ".$table);
@@ -2820,17 +2861,18 @@ sub display_results {
 	    $env{'form.sortorder'}='asc';
 	}
     }
-    my $sortform = '<span class="LC_nobreak">'
-                  .&mt('Sort by:').' '
+    my $sortform = '<span class="LC_nobreak"><span id="LC_sortby">'
+                  .&mt('Sort by:').'</span> '
                   .&Apache::loncommon::select_form($env{'form.sortfield'},
-                                                      'sortfield',
-                                                      \%sort_fields)
+                                                   'sortfield',
+                                                   \%sort_fields,'','','',
+                                                   'LC_sortby')
                   .' '
                   .&Apache::loncommon::select_form($env{'form.sortorder'},
-                                                      'sortorder',
-                                                      {asc =>&mt('Ascending'),
-                                                       desc=>&mt('Descending')
-                                                       })
+                                                   'sortorder',
+                                                   {asc =>&mt('Ascending'),
+                                                    desc=>&mt('Descending')
+                                                   },'','','','LC_sortby')
                   .'</span>';
     ##
     ## Display links for 'prev' and 'next' pages (if necessary) and Display Options
@@ -2844,15 +2886,15 @@ sub display_results {
     );
 
     if ($total_results == 0) {
-        $r->print('<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
-                  "</form>".
+        $r->print('<h1 class="LC_search_results">'.&mt('There are currently no results.').'</h1>'.
+                  '</form></div>'.
 		  &Apache::loncommon::end_page());
         return;
     } else {
-        $r->print('<div>'.
+        $r->print('<h1 class="LC_search_results">'.
                   mt('Results [_1] to [_2] out of [_3]',
                      $min,$max,$total_results).
-                  "</div>\n");
+                  "</h1>\n");
     }
     ##
     ## Get results from MySQL table
@@ -2882,7 +2924,14 @@ sub display_results {
     if ($area eq 'portfolio') {
         $tabletype = 'portfolio_search';
     }
-    $r->print(&Apache::loncommon::start_data_table());
+    $r->print(&Apache::loncommon::start_data_table().
+              &Apache::loncommon::start_data_table_header_row().
+              '<th>'.&mt('Data').'</th>');
+    if (($env{'form.viewselect'} eq 'detailedpreview') ||
+        ($env{'form.viewselect'} eq 'summarypreview')) {
+        $r->print('<th>'.&mt('Preview').'</th>');
+    }
+    $r->print(&Apache::loncommon::end_data_table_header_row());
     foreach my $row (@Results) {
         if ($connection->aborted()) {
             &cleanup();
@@ -2920,7 +2969,7 @@ sub display_results {
                                 $env{'form.persistent_db_id'})
         );
     }
-    $r->print("</form>".&Apache::loncommon::end_page());
+    $r->print('</form></div>'.&Apache::loncommon::end_page());
     $r->rflush();
     untie %groupsearch_db if (tied(%groupsearch_db));
     return;
@@ -3231,6 +3280,7 @@ SCRIPT
                                                       'add_modal' =>1});
     my $result=<<END;
 $start_page
+<div class="LC_landmark" role="main">
 <form name="results" method="post" action="/adm/searchcat">
 $importbutton
 END
@@ -3255,6 +3305,7 @@ sub print_frames_interface {
     my $results_link = &results_link();
     my $js = <<JS;
 <script type="text/javascript">
+// <![CDATA[
 var targetwin = opener;
 var queue = '';
 
@@ -3277,6 +3328,7 @@ function done_loading_results() {
         update_results(new_location);
     }
 }
+// ]]>
 </script>
 JS