--- loncom/interface/lonsearchcat.pm 2007/06/15 23:29:17 1.287
+++ loncom/interface/lonsearchcat.pm 2007/07/11 20:32:15 1.288
@@ -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.288 2007/07/11 20:32:15 albertel 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,6 +259,9 @@ 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
##
@@ -308,15 +312,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'},
@@ -759,8 +765,9 @@ sub setup_basic_search {
'';
}
$adv_search_link = '
function queue(checkbox_num,val) {
@@ -3254,7 +3262,7 @@ SCRIPT
}
function select_group() {
parent.window.location=
- "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import&acts="+
+ "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
parent.statusframe.document.forms.statusform.elements.acts.value;
}
@@ -3377,7 +3385,7 @@ sub detailed_citation_view {
$jumpurl=~s|^/ext/|http://|;
$result .= ''.$prefix.
''.' '.
- ''.$values{'title'}."\n";
$result .= " \n";
$result .= ''.$values{'author'}.','.
@@ -3513,7 +3521,7 @@ sub summary_view {
my $link = &display_url($jumpurl,[2,0,1]);
$result.=<
$link
$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}
@@ -3562,7 +3570,7 @@ sub compact_view {
}
$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');
$result.=' '.
- ''.
+ ''.
&HTML::Entities::encode($values{'title'},'<>&"').' '.
$link.' '.$values{'author'}.' ('.$values{'domain'}.')
';
return $result;
@@ -3607,7 +3615,7 @@ sub fielded_format_view {
$prefix