--- loncom/interface/lonsearchcat.pm 2007/06/15 23:29:17 1.287 +++ loncom/interface/lonsearchcat.pm 2008/08/04 15:28:21 1.297 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.287 2007/06/15 23:29:17 albertel Exp $ +# $Id: lonsearchcat.pm,v 1.297 2008/08/04 15:28:21 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -138,7 +138,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['catalogmode','launch','acts','mode','form','element','pause', 'phase','persistent_db_id','table','start','show', - 'cleargroupsort','titleelement','area']); + 'cleargroupsort','titleelement','area','inhibitmenu']); ## ## The following is a trick - we wait a few seconds if asked to so ## the daemon running the search can get ahead of the daemon @@ -190,7 +190,8 @@ sub handler { } &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/searchcat?'. - 'catalogmode='.$env{'form.catalogmode'}. + &Apache::loncommon::inhibit_menu_check(). + '&catalogmode='.$env{'form.catalogmode'}. '&launch='.$env{'form.launch'}. '&mode='.$env{'form.mode'}, text=>"$crumb_text", @@ -258,11 +259,14 @@ sub handler { if (exists($env{'form.area'})) { $hidden_fields .= &hidden_field('area'); } + if (exists($env{'form.inhibitmenu'})) { + $hidden_fields .= &hidden_field('inhibitmenu'); + } ## ## Configure dynamic components of interface ## if ($env{'form.catalogmode'} eq 'interactive') { - $closebutton=" END } else { @@ -308,15 +313,17 @@ END $srchtype = 'Portfolio'; } &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/searchcat?phase=disp_adv&'. - 'catalogmode='.$env{'form.catalogmode'}. + ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check(). + '&phase=disp_adv'. + '&catalogmode='.$env{'form.catalogmode'}. '&launch='.$env{'form.launch'}. '&mode='.$env{'form.mode'}, text=>"Advanced $srchtype Search", bug=>'Searching',}); } elsif ($env{'form.searchmode'} eq 'course search') { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/searchcat?phase=disp_adv&'. + ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check(). + '&phase=disp_adv'. 'catalogmode='.$env{'form.catalogmode'}. '&launch='.$env{'form.launch'}. '&mode='.$env{'form.mode'}, @@ -753,14 +760,10 @@ sub setup_basic_search { $r->dir_config('lonDefDomain')), $r->dir_config('lonDefDomain')). ''; - if ($area eq 'res') { - $inclext= ''; - } $adv_search_link = ''; my %fields=&Apache::lonmeta::fieldnames(); # - $scrout .= '
'. (' 'x2).&searchhelp()." | ';
}
@@ -919,11 +922,6 @@ ENDHEADER
&Apache::loncommon::domain_select('domains',
$env{'form.domains'},1).
' ' - } $scrout .= ' | '.$/;
#
# Misc metadata
@@ -1037,6 +1035,7 @@ ENDHEADER
# Creation/Modification date limits
$scrout .= '
".&mt('Month[_1]Day[_2]Year',' 'x14,' 'x6)." | |
Created between | '. - '[_1] |
and | '. - '[_2] |
'.&mt('Created between').' | ' + .''.$cafter.' |
'.&mt('and').' | ' + .''.$cbefore.' |
Last modified between | '. - '[_1] |
and | '. - '[_2] |
'.&mt('Last modified between').' | ' + .''.$lafter.' |
'.&mt('and').' | ' + .''.$lbefore.' |
-Search: $pretty_query_string -
- -END + $result.='' + .&mt('There are [_1] matches to your query.',$total_results) + .' '.$revise.'
' + .''.&mt('Search: ').$pretty_query_string + .'
'; $r->print($result.&Apache::loncommon::end_page()); return; } @@ -2444,13 +2444,14 @@ Returns: html string for a 'revise searc ###################################################################### ###################################################################### sub revise_button { + my $revisetext = &mt('Revise search'); my $revise_phase = 'disp_basic'; $revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced'); my $newloc = '/adm/searchcat'. '?persistent_db_id='.$env{'form.persistent_db_id'}. '&cleargroupsort=1'. '&phase='.$revise_phase; - my $result = qq{ }; return $result; } @@ -2555,9 +2556,12 @@ END my $server; my $status; my $revise = &revise_button(); + my $txt_total = &mt('Total Matches'); + my $txt_remain = &mt('Time Remaining'); + my $txt_status = &mt('Status'); $r->print(<\n";
$result .= ''.$values{'author'}.','.
@@ -3513,7 +3516,7 @@ sub summary_view {
my $link = &display_url($jumpurl,[2,0,1]);
$result.=<
$link
$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}
@@ -3562,7 +3565,7 @@ sub compact_view {
}
$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');
$result.=' '.
- ''.
+ ''.
&HTML::Entities::encode($values{'title'},'<>&"').' '.
$link.' '.$values{'author'}.' ('.$values{'domain'}.')
';
return $result;
@@ -3607,7 +3610,7 @@ sub fielded_format_view {
$prefix