--- loncom/interface/lonindexer.pm 2009/03/19 15:01:24 1.195
+++ loncom/interface/lonindexer.pm 2009/07/03 09:59:06 1.198
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.195 2009/03/19 15:01:24 jms Exp $
+# $Id: lonindexer.pm,v 1.198 2009/07/03 09:59:06 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -409,8 +409,25 @@ function gothere(val) {
ENDHEADER
my ($headerdom)=($uri=~m{^/res/($match_domain)/});
- $r->print(&Apache::loncommon::start_page('Content Library',$js,
- {'domain' => $headerdom,}));
+
+ if ($env{'form.catalogmode'}) {
+ # "Popup mode"
+ $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+ {'only_body' => 1,
+ 'domain' => $headerdom,}));
+ } else {
+ # Only display page header and breadcrumbs in non-popup mode
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Browse published resources',
+ 'href' => '/res/fhwfdev/?launch=1',
+ });
+ $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+ {'domain' => $headerdom,})
+ .&Apache::lonhtmlcommon::breadcrumbs()
+ );
+ }
+
# ---------------------------------- get state of file types to be showing
if ($env{'form.only'}) {
$typeselect = $env{'form.only'};
@@ -885,7 +902,7 @@ sub display_line {
'enctype="application/x-www-form-urlencoded"'.
'>'."\n");
$r->print(&Apache::loncommon::inhibit_menu_check('input'));
- $r->print (''."\n");
$r->print (''."\n");
$r->print ('
print ('");
- &dynmetaprint($r,$filelink,'count');
- &dynmetaprint($r,$filelink,'course');
- &dynmetaprint($r,$filelink,'stdno');
- &dynmetaprint($r,$filelink,'avetries');
- &dynmetaprint($r,$filelink,'difficulty');
- &dynmetaprint($r,$filelink,'disc');
- &dynmetaprint($r,$filelink,'clear');
- &dynmetaprint($r,$filelink,'technical');
- &dynmetaprint($r,$filelink,'correct');
- &dynmetaprint($r,$filelink,'helpful');
- &dynmetaprint($r,$filelink,'depth');
+
+ for (qw(count course stdno avetries difficulty disc clear technical
+ correct helpful depth)) {
+
+ dynmetaprint($r,$filelink,$_);
+ }
+
$r->print(" \n");
}
@@ -1123,11 +1136,9 @@ $r->print ('