--- loncom/interface/lonsearchcat.pm 2009/07/31 16:01:48 1.313 +++ loncom/interface/lonsearchcat.pm 2009/10/23 16:55:15 1.318 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.313 2009/07/31 16:01:48 bisitz Exp $ +# $Id: lonsearchcat.pm,v 1.318 2009/10/23 16:55:15 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -268,23 +268,23 @@ sub handler { if ($env{'form.catalogmode'} eq 'interactive') { $closebutton=" +onclick='javascript:select_group()' /> END } else { $closebutton = ''; @@ -770,14 +770,26 @@ sub setup_basic_search { portfolio => 'Portfolio Search', ); my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout); - $userelatedwords = ''; - $onlysearchdomain = ''; + + $userelatedwords = ''; + + $onlysearchdomain = ''; + $adv_search_link = ' $closebutton +
END my $srchtype = 'Catalog'; my $jscript; @@ -878,20 +892,28 @@ function additional_metadata() { } my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search", $jscript); - $scrout .= <<"ENDHEADER"; -$bread_crumb -'; + $scrout .= &Apache::loncommon::end_page(); $r->print($scrout); return; @@ -3864,21 +3896,30 @@ sub output_blank_field_error { my ($r,$closebutton,$parms,$hidden_fields)=@_; my $errormsg = &mt('You did not fill in enough information for the search to be started. You need to fill in relevant fields on the search page in order for a query to be processed.'); my $revise = &mt('Revise Search Request'); - my $heading = &mt('Unactionable Search Queary'); + my $heading = &mt('Unactionable Search Query'); my $start_page = &Apache::loncommon::start_page('Search'); my $end_page = &Apache::loncommon::end_page(); + if ($closebutton) { + $closebutton = ''.$closebutton.'
$errormsg
$end_page ENDPAGE