--- loncom/interface/lonsearchcat.pm	2016/11/09 19:37:39	1.331.4.13
+++ loncom/interface/lonsearchcat.pm	2025/03/19 15:44:44	1.364
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.331.4.13 2016/11/09 19:37:39 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.364 2025/03/19 15:44:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -170,22 +170,46 @@ sub handler {
     ##
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
-    my @allowed_searches = ('portfolio');
+    my $crumb_text;
+    my @allowed_searches;
+    if ($env{'form.catalogmode'} eq 'import') {
+        $env{'form.area'} = 'res';
+        $crumb_text = 'Content Library Search';
+    } else {
+        push(@allowed_searches,'portfolio');
+    }
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
         push(@allowed_searches,'res');
-    } 
-    my $crumb_text = 'Portfolio Search';
+    } else {
+        unless ($env{'form.catalogmode'} eq 'import') {
+            $env{'form.area'} = 'portfolio';
+            $crumb_text = 'Portfolio Search';
+        }
+    }
     if (@allowed_searches ==2) {
-       $crumb_text = 'Portfolio and Catalog Search'; 
+       unless (($env{'form.area'} eq 'portfolio') || ($env{'form.area'} eq 'res')) {
+           delete($env{'form.area'});
+       }
+       $crumb_text = 'Portfolio and Content Library Search'; 
+    }
+    my $target = '_top';
+    if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+        (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
+        if ($env{'form.phase'} =~ /^(sort|run_search)$/) {
+            $target = '_parent';
+        } else {
+            $target = '_self';
+        }
     }
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
 	       &Apache::loncommon::inhibit_menu_check().
                '&catalogmode='.$env{'form.catalogmode'}.
                '&launch='.$env{'form.launch'}.
-               '&mode='.$env{'form.mode'},
+               '&mode='.$env{'form.mode'}.
+               '&area='.$env{'form.area'},
               text=>"$crumb_text",
-              target=>'_top',
+              target=>$target,
               bug=>'Searching',});
     #
     if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) {
@@ -299,7 +323,7 @@ END
     }
     #
     if ($env{'form.searchmode'} eq 'advanced') {
-        my $srchtype = 'Catalog';
+        my $srchtype = 'Content Library';
         if ($env{'form.area'} eq 'portfolio') {
             $srchtype = 'Portfolio';
         }
@@ -308,10 +332,23 @@ END
                   '&phase=disp_adv'.
                   '&catalogmode='.$env{'form.catalogmode'}.
                   '&launch='.$env{'form.launch'}.
-                  '&mode='.$env{'form.mode'},
+                  '&mode='.$env{'form.mode'}.
+                  '&area='.$env{'form.area'},
                   text=>"Advanced $srchtype Search",
                   bug=>'Searching',});
-    } 
+    } elsif (($env{'form.phase'} eq 'results') ||
+             ($env{'form.phase'} =~ /^(sort|run_search)$/)) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+              '&phase=disp_adv'.
+              '&catalogmode='.$env{'form.catalogmode'}.
+              '&launch='.$env{'form.launch'}.
+              '&mode='.$env{'form.mode'}.
+              '&area='.$env{'form.area'}.
+              '&searchmode='.$env{'form.searchmode'},
+              text=>"Search Results",
+              bug=>'Searching',});
+    }
     ##
     ## Switch on the phase
     ##
@@ -328,10 +365,10 @@ END
                  ['query','customquery','customshow',
                   'libraries','pretty_string','domains']);
         if ($env{'form.phase'} eq 'sort') {
-            &print_sort_form($r,$pretty_string);
+            &print_sort_form($r,$pretty_string,$target);
         } elsif ($env{'form.phase'} eq 'run_search') {
             &run_search($r,$query,$customquery,$customshow,
-                        $libraries,$pretty_string,$env{'form.area'},$domainsref);
+                        $libraries,$pretty_string,$env{'form.area'},$domainsref,$target);
         }
     } elsif(($env{'form.phase'} eq 'basic_search') ||
             ($env{'form.phase'} eq 'adv_search')) {
@@ -390,7 +427,7 @@ END
         }
     }
     return OK;
-} 
+}
 
 #
 # The mechanism used to store values away and retrieve them does not
@@ -428,12 +465,48 @@ sub hidden_field {
     return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'.$/;
 }
 
+sub start_search_tabs {
+    my $area;
+    my %lt = &Apache::lonlocal::texthash (
+                              res => 'Content Library Search',
+                              portfolio => 'Portfolio Search',
+    );
+    my $output = '<ul class="LC_TabContentBigger" id="main">';
+    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
+        unless ($env{'form.area'} eq 'portfolio') {
+            $area = 'res';
+        }
+        $output .= "\n".'<li'.($area eq 'res'?' class="active"':'').
+                   '><a href="/adm/searchcat?area=res&amp;catalogmode='.$env{'form.catalogmode'}.'">'.
+                   '<b>&nbsp;&nbsp;&nbsp;&nbsp;'.$lt{'res'}.
+                   '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>';
+        unless ($env{'form.catalogmode'}) {
+            $output .= '<li'.($area ne 'res'?' class="active"':'').
+                       '><a href="/adm/searchcat?area=portfolio"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.$lt{'portfolio'}.
+                       '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li></ul>';
+        }
+    } else {
+        $area = 'portfolio';
+        $output .= "\n".'<li class="active">'.
+                   '<a href="/adm/searchcat?area=portfolio"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.$lt{'portfolio'}.
+                   '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li></ul>';
+    }
+    $output .= '<div class="LC_Box" style="clear:both;margin:0;">'.
+               '<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'.
+               '<div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">';
+    return $output;
+}
+
+sub end_search_tabs {
+    return '</div></div></div>';
+}
+
 ######################################################################
 
 =pod
 
 =over 4
-
+ 
 =item &print_basic_search_form() 
 
 Prints the form for the basic search.  Sorry the name is so cryptic.
@@ -444,19 +517,31 @@ Prints the form for the basic search.  S
 ######################################################################
 sub print_basic_search_form {
     my ($r,$closebutton,$hidden_fields) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                              res => 'Content Library Search',
+                              portfolio => 'Portfolio Search',
+    );
     my $result = ($env{'form.catalogmode'} ne 'import');
+    my $area;
     my $bread_crumb =
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
 					    $env{'form.catalogmode'} ne 'import');
-    my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
-# Search form for resource space 
+    my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb.
+                 '<div class="LC_landmark" role="main">'."\n".
+                 &start_search_tabs();
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
-        $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
-        $scrout .= '<hr /><br />';
-    }
+        if ($env{'form.area'} eq 'portfolio') {
 # Search form for accessible portfolio files
-    $scrout.= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
-    $scrout .= &Apache::loncommon::end_page();
+            $scrout .= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
+        } else {
+# Search form for resource space
+            $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
+        }
+    } else {
+# Search form for accessible portfolio files
+        $scrout .= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
+    }
+    $scrout .= &end_search_tabs().&Apache::loncommon::end_page();
     $r->print($scrout);
     return;
 }
@@ -465,7 +550,7 @@ sub setup_basic_search {
     my ($r,$area,$hidden_fields,$closebutton) = @_;
     # Define interface components
     my %lt = &Apache::lonlocal::texthash (
-                              res => 'LON-CAPA Catalog Search',
+                              res => 'Content Library Search',
                               portfolio => 'Portfolio Search',
     );
     my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
@@ -495,7 +580,7 @@ sub setup_basic_search {
     } else {
        $singledom = $env{'user.domain'};
        $disabled = ' disabled="disabled"';
-       $checked = 1;
+       $checked = 1; 
     }
     $onlysearchdomain = '<label>'
                        .&Apache::lonhtmlcommon::checkbox(
@@ -526,29 +611,20 @@ sub setup_basic_search {
                  $scrout .= '<input type="hidden" name="area" value="'.$area.'" />';
              }
     #
-    $scrout .= '<div align="center">'.$/;
-#    if ($env{'request.course.id'}) {
-        $scrout .= '<h1>'.$lt{$area}.'</h1>';
-#    } else {
-        # No need to tell them they are searching
-#        $scrout.= ('<br />'x2);
-#    }
-    $scrout.='<table>'.
-             '<tr><td align="center" valign="top">'.
-             &Apache::lonhtmlcommon::textbox('basicexp',
-                                             $env{'form.basicexp'},50).
-             '<br />'.
-            '<span class="LC_fontsize_small">'.&searchhelp().'</span>'.'</td>'.
-            '<td>'.
-            '<span class="LC_nobreak">'.('&nbsp;'x3).$adv_search_link.'</span>'.'<br />'.
-            '<span class="LC_nobreak">'.('&nbsp;'x1).$userelatedwords.'</span>'.'<br />'.
-            '<span class="LC_nobreak">'.('&nbsp;'x1).$onlysearchdomain.'</span>'.'<br />'.
-            '<span class="LC_nobreak">'.('&nbsp;'x1).$inclext.'</span>'.'<br />'.
-             '</td>'.
-            '</tr>'.
-            '</table>'.$/;
+    $scrout .= '<div class="LC_floatleft">'.
+               '<label>'.
+               &Apache::lonhtmlcommon::textbox('basicexp',
+                                               $env{'form.basicexp'},50).
+               '<br />'.
+               '<span class="LC_fontsize_medium">'.&searchhelp().'</span></label></div>'.
+               '<div class="LC_floatleft" style="text-align: left;">'.
+               '<span class="LC_nobreak">'.('&nbsp;'x3).$adv_search_link.'</span>'.'<br />'.
+               '<span class="LC_nobreak">'.('&nbsp;'x1).$userelatedwords.'</span>'.'<br />'.
+               '<span class="LC_nobreak">'.('&nbsp;'x1).$onlysearchdomain.'</span>'.'<br />'.
+               '<span class="LC_nobreak">'.('&nbsp;'x1).$inclext.'</span>'.'<br />'.
+               '</div><br clear="both" />'.$/;
     #
-    $scrout .= '<p>'
+    $scrout .= '<div><p>'
               .&viewoptions()
               .'</p>'
               .'<p>'
@@ -556,9 +632,9 @@ sub setup_basic_search {
               .'value="'.&mt('Search').'" />'
               .' '
               .$closebutton
-              .'</p>';
+              .'</p></div>';
     #
-    $scrout .= '</div>'.'</form>';
+    $scrout .= '</form>';
     return $scrout;
 } 
 
@@ -590,7 +666,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';
@@ -608,7 +684,8 @@ 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".
+               &start_search_tabs();
 
     $scrout .= '<form method="post" action="/adm/searchcat" name="advsearch">'
               .$hidden_fields 
@@ -627,7 +704,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 = 
@@ -647,59 +724,68 @@ 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},
+                                          $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},
+                                          $env{'form.'.$field},'',
                                           $field,
                                           'advsearch',
                                           0)
                   .&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;
     if ($env{'form.area'} ne 'portfolio') {
         unless (&Apache::lonnet::allowed('bre','/res/')) {
-            $anydomain = 0;
+            $anydomain = 0; 
         }
     }
 
-    $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);
+                   $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'},
+                                             $env{'form.copyright'},'',
+                                             'copyright',
                                 \&Apache::loncommon::copyrightdescription,
                                        ( undef,
                                         &Apache::loncommon::copyrightids)
@@ -707,9 +793,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)
                                     )
@@ -722,26 +809,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()" />'
@@ -752,65 +845,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();
 
@@ -869,7 +987,7 @@ function additional_metadata() {
     $scrout .= $advanced_buttons
               .'</form>';
 
-    $scrout .= &Apache::loncommon::end_page();
+    $scrout .= &end_search_tabs().'</div>'.&Apache::loncommon::end_page();
     $r->print($scrout);
     return;
 }
@@ -942,20 +1060,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;
 }
 
@@ -1251,8 +1369,10 @@ sub parse_advanced_search {
     }
     if (! $fillflag) {
 	&output_blank_field_error($r,$closebutton,
-                                  'phase=disp_adv',$hidden_fields);
-	return ;
+                                  'phase=disp_adv&amp;area='.$env{'form.area'}.
+                                  '&amp;catalogmode='.$env{'form.catalogmode'},
+                                  $hidden_fields);
+	return;
     }
     # Turn the form input into a SQL-based query
     my $query='';
@@ -1265,7 +1385,9 @@ sub parse_advanced_search {
             &process_phrase_input($env{'form.'.$field},
                                   $env{'form.'.$field.'_related'},$field);
         if (defined($error)) {
-            &output_unparsed_phrase_error($r,$closebutton,'phase=disp_adv',
+            &output_unparsed_phrase_error($r,$closebutton,
+                                         'phase=disp_adv&amp;area='.$env{'form.area'}.
+                                         '&amp;catalogmode='.$env{'form.catalogmode'}.
                                          $hidden_fields,$field);
             return;
         } else {
@@ -1549,7 +1671,9 @@ sub parse_basic_search {
     # Check to see if enough of a query is filled in
     my $search_string = $env{'form.basicexp'};
     if (! &filled($search_string)) {
-	&output_blank_field_error($r,$closebutton,'phase=disp_basic');
+	&output_blank_field_error($r,$closebutton,'phase=disp_basic'.
+                                  '&amp;area='.$env{'form.area'}.
+                                  '&amp;catalogmode='.$env{'form.catalogmode'});
 	return OK;
     }
     my $pretty_search_string=$search_string;
@@ -1565,7 +1689,9 @@ sub parse_basic_search {
                                                     $env{'form.related'},
                                                     $searchfield);
     if ($error) {
-        &output_unparsed_phrase_error($r,$closebutton,'phase=disp_basic',
+        &output_unparsed_phrase_error($r,$closebutton,'phase=disp_basic'.
+                                      '&amp;area='.$env{'form.area'}.
+                                      '&amp;catalogmode='.$env{'form.catalogmode'},
                                       '','basicexp');
         return;
     }
@@ -1881,6 +2007,8 @@ sub build_date_queries {
             my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore);
             # Correct for year being relative to 1900
             $cayear+=1900; $cbyear+=1900;
+            # Correct month; localtime gives month 0..11 but MySQL expects 1..12
+            $camon++; $cbmon++;
             my $cquery=
                 '(creationdate BETWEEN '.
                 "'".$cayear.'-'.$camon.'-'.$caday."'".
@@ -1899,6 +2027,8 @@ sub build_date_queries {
             my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore);
             # Correct for year being relative to 1900
             $mayear+=1900; $mbyear+=1900;
+            # Correct month; localtime gives month 0..11 but MySQL expects 1..12
+            $mamon++; $mbmon++;
             my $mquery=
                 '(lastrevisiondate BETWEEN '.
                 "'".$mayear.'-'.$mamon.'-'.$maday."'".
@@ -2048,7 +2178,7 @@ a link to change the search query.
 ######################################################################
 ######################################################################
 sub print_sort_form {
-    my ($r,$pretty_query_string) = @_;
+    my ($r,$pretty_query_string,$target) = @_;
 
     ##
     my %SortableFields=&Apache::lonlocal::texthash( 
@@ -2081,29 +2211,20 @@ sub print_sort_form {
         &Apache::lonnet::logthis(&Apache::lonmysql::get_error());
         return;
     }
-    my $js =<<END;
-<script type="text/javascript">
-// <![CDATA[
-    function change_sort() {
-        var newloc = "/adm/searchcat?phase=results";
-        newloc += "&persistent_db_id=$env{'form.persistent_db_id'}";
-        newloc += "&sortby=";
-        newloc += document.forms.statusform.elements.sortby.value;
-        parent.resultsframe.location= newloc;
+    my $args;
+    if ($target eq '_parent') {
+        $args = {'links_target' => $target};
     }
-// ]]>
-</script>
-END
-
-    my $start_page = &Apache::loncommon::start_page('Results');
+    my $start_page = &Apache::loncommon::start_page('Results',undef,$args);
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-					    $env{'form.catalogmode'} ne 'import');
-
+					    $env{'form.catalogmode'} ne 'import',
+                                            '','','','','','',$target);
     my $result = <<END;
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="post" target="_top">
+<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="" />
 END
@@ -2125,7 +2246,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;
 }
 
@@ -2262,7 +2383,8 @@ SCRIPT
 sub reload_result_frame {
     my ($r) = @_;
     my $newloc = '/adm/searchcat?phase=results&persistent_db_id='.
-        $env{'form.persistent_db_id'};
+        $env{'form.persistent_db_id'}.'&area='.$env{'form.area'}.
+        '&catalogmode='.$env{'form.catalogmode'};
     $r->print(<<SCRIPT);
 <script type="text/javascript">
     parent.update_results("$newloc");
@@ -2332,7 +2454,9 @@ sub revise_button {
     my $newloc = '/adm/searchcat'.
         '?persistent_db_id='.$env{'form.persistent_db_id'}.
             '&amp;cleargroupsort=1'.
-            '&amp;phase='.$revise_phase;
+            '&amp;phase='.$revise_phase.
+            '&amp;area='.$env{'form.area'}.
+            '&amp;catalogmode='.$env{'form.catalogmode'};
     my $result = qq{<input type="button" value="$revisetext" name="revise"} .
         qq{ onclick="parent.location='$newloc';" /> };
     return $result;
@@ -2354,7 +2478,7 @@ results into MySQL.
 ######################################################################
 sub run_search {
     my ($r,$query,$customquery,$customshow,$serverlist,
-        $pretty_string,$area,$domainsref) = @_;
+        $pretty_string,$area,$domainsref,$target) = @_;
     my $tabletype = 'metadata';
     if ($area eq 'portfolio') {
         $tabletype = 'portfolio_search';
@@ -2363,13 +2487,19 @@ sub run_search {
     #
     # Print run_search header
     #
-    my $start_page = &Apache::loncommon::start_page('Search Status',undef);
+    my $args;
+    if ($target eq '_parent') {
+        $args = {'links_target' => $target};
+    }
+    my $start_page = &Apache::loncommon::start_page('Search Status',undef,$args);
     my $breadcrumbs =
 	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-					    $env{'form.catalogmode'} ne 'import');
+					    $env{'form.catalogmode'} ne 'import',
+                                            '','','','','','',$target);
     $r->print(<<END);
 $start_page
 $breadcrumbs
+<div class="LC_landmark" role="main">
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -2414,8 +2544,6 @@ END
         %all_library_servers = (%library_servers,%older_library_servers);
         @Servers_to_contact = sort(keys(%all_library_servers));
         foreach my $server (@Servers_to_contact) {
-            my %possdoms;
-            map { $possdoms{$_}=1;  } &Apache::lonnet::machine_domains($all_library_servers{$server});
             $domains_by_server{$server} =
                 join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server})));
         }
@@ -2455,6 +2583,7 @@ END
     ## Prepare for the big loop.
     my $hitcountsum;
     my $oldhitcountsum;
+    my $displaycount;
     my %matches;
     my $server; 
     my $status;
@@ -2501,7 +2630,7 @@ END
                 &update_status($r,
                        &mt('waiting on [_1]',join(' ',keys(%Server_status))));
             }
-            sleep(0.1); 
+            sleep(0.1);
         }
         #
         # Loop through the servers we have contacted but do not
@@ -2554,8 +2683,8 @@ END
 
                     if ($area eq 'portfolio') {
                         next if (defined($matches{$Fields{'url'}}));
-                        # Skip if inaccessible
-                        next if (!&Apache::lonnet::portfolio_access($Fields{'url'}));
+                        # Skip unless access control set to public or passphrase-protected
+                        next unless (($Fields{'scope'} eq 'public') || ($Fields{'scope'} eq 'guest'));
                         $matches{$Fields{'url'}} = 1; 
                     }
                     #
@@ -2579,8 +2708,10 @@ END
             last if ($connection->aborted());
             if ($oldhitcountsum < $hitcountsum) {
                 &update_count_status($r,$hitcountsum);
-                if ($hitcountsum <= $env{'form.show'}) {
+                if (($hitcountsum <= $env{'form.show'}) ||
+                    (!$displaycount && $hitcountsum)) {
                     reload_result_frame($r);
+                    $displaycount = $hitcountsum;
                 }
                 $oldhitcountsum = $hitcountsum;
             }
@@ -2596,11 +2727,11 @@ 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>
-window.location='/adm/searchcat?phase=sort&persistent_db_id=$env{'form.persistent_db_id'}';
+window.location='/adm/searchcat?phase=sort&area=$env{"form.area"}&catalogmode=$env{"form.catalogmode"}&persistent_db_id=$env{"form.persistent_db_id"}';
 </script>
 SCRIPT
 #    }
@@ -2660,7 +2791,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;
     }
@@ -2671,7 +2803,8 @@ sub display_results {
     ##
     ## Get the catalog controls setup
     ##
-    my $action = "/adm/searchcat?phase=results";
+    my $action = '/adm/searchcat?phase=results&amp;area='.$env{'form.area'}.
+                 '&amp;catalogmode='.$env{'form.catalogmode'};
     ##
     ## Deal with import by opening the import db file.
     if ($env{'form.catalogmode'} eq 'import') {
@@ -2682,15 +2815,15 @@ 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;
-        }
+        } 
         # untie %groupsearch_db if the connection gets aborted before the end
         $r->register_cleanup(sub {
             untie %groupsearch_db if (tied(%groupsearch_db));
-        }); 
+        });
     }
     ##
     ## Prepare the table for querying
@@ -2703,7 +2836,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);
@@ -2808,17 +2941,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
@@ -2832,15 +2966,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
@@ -2870,7 +3004,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();
@@ -2908,7 +3049,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;
@@ -3219,6 +3360,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
@@ -3227,6 +3369,8 @@ END
 
 sub results_link {
     my $basic_link   = "/adm/searchcat?"."&amp;table=".$env{'form.table'}.
+        "&amp;area=".$env{'form.area'}.
+        "&amp;catalogmode=".$env{'form.catalogmode'}.
         "&amp;persistent_db_id=".$env{'form.persistent_db_id'};
     my $results_link = $basic_link."&amp;phase=results".
         "&amp;pause=1"."&amp;start=1";
@@ -3237,7 +3381,9 @@ sub results_link {
 ######################################################################
 sub print_frames_interface {
     my $r = shift;
-    my $basic_link = "/adm/searchcat?"."&amp;table=".$env{'form.table'}.
+    my $basic_link = "/adm/searchcat?table=".$env{'form.table'}.
+        "&amp;area=".$env{'form.area'}.
+        "&amp;catalogmode=".$env{'form.catalogmode'}.
         "&amp;persistent_db_id=".$env{'form.persistent_db_id'};
     my $run_search_link = $basic_link."&amp;phase=run_search";
     my $results_link = &results_link();
@@ -3577,18 +3723,13 @@ sub display_url {
         # (because the search opens in a new window, it gets
         # confusing when the links open a tab in the
         # parent window; ideally we should not force windows)
-        my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\"";
+        my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\""; 
         $link=&Apache::lonhtmlcommon::crumbs(
                   $url,
                   'preview',
                   '',
-                  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),
+                  '',
                   $skiplast,$onclick).' ';
-        # replace the links to open in a new window
-        # (because the search opens in a new window, it gets
-        # confusing when the links open a tab in the
-        # parent window; ideally we should not force windows)
-        $link =~ s/(href="[^"]*")/\1 onclick="window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;"/g;
     }
     return $link;
 }