--- loncom/interface/lonindexer.pm 2009/07/17 15:42:07 1.199 +++ loncom/interface/lonindexer.pm 2009/12/01 18:07:50 1.202 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.199 2009/07/17 15:42:07 droeschl Exp $ +# $Id: lonindexer.pm,v 1.202 2009/12/01 18:07:50 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -541,11 +541,21 @@ END $storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; $storeuri=~s/\/+/\//g; # ---------------------------------------------------------------- Bread crumbs - $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','', - (($env{'form.catalogmode'} eq 'import')? - 'document.forms.fileattr':'')). - &Apache::lonhtmlcommon::select_recent('residx','resrecent', -'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();')); + $r->print( + '

' + .&Apache::lonhtmlcommon::crumbs( + $storeuri, + '', + '', + (($env{'form.catalogmode'} eq 'import')? + 'document.forms.fileattr':'')) + .'
' + .&Apache::lonhtmlcommon::select_recent( + 'residx', + 'resrecent', + 'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();') + .'

' + ); # -------------------------------------------------------- Resource Home Button my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'}; if ($reshome) { @@ -563,14 +573,13 @@ END &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); # -------------------------------------------------- Check All and Uncheck all if ($env{'form.catalogmode'} eq 'import') { - $r->print('
'); - $r->print(''); + $r->print('

'); + $r->print('

'); } # ----------------- output starting row to the indexed file/directory hierarchy #$r->print(&initdebug()); #$r->print(&writedebug("Omit:@Omit")) if (@Omit); #$r->print(&writedebug("Only:@Only")) if (@Only); - $r->print('

'); $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes") .&Apache::loncommon::start_data_table_header_row()); $r->print("".&mt('Name')."\n"); @@ -913,8 +922,7 @@ sub display_line { return OK; } # Do we have permission to look at this? - - if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); } + if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); } # make absolute links appear on different background #SB if ($absolute) { $fileclr='#ccdd99'; } @@ -1147,7 +1155,7 @@ $r->print (''.($output eq '' ? ' ':$output). + $r->print(''.($output eq '' ? ' ':$output). " \n"); }