--- loncom/interface/lonindexer.pm 2009/07/03 09:59:06 1.198 +++ loncom/interface/lonindexer.pm 2009/10/30 05:12:01 1.201 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.198 2009/07/03 09:59:06 bisitz Exp $ +# $Id: lonindexer.pm,v 1.201 2009/10/30 05:12:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -184,7 +184,7 @@ ENDSUBM $colspan=" colspan='2' "; my $cl=&mt('Close'); $closebutton=< + END } elsif ($env{'form.catalogmode'} eq 'import') { @@ -196,11 +196,11 @@ END my $cl=&mt('Close'); my $gi=&mt('Import'); $closebutton=< + END $groupimportbutton=< +onclick="javascript:select_group()" /> END } # Additions made by Matthew to make the browser a little easier to deal @@ -361,6 +361,7 @@ END my $js = <<"ENDHEADER"; ENDHEADER @@ -446,7 +448,7 @@ ENDHEADER } } else { for (my $i=0; $i<=16; $i++) { - $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; + $attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1; } } @@ -478,34 +480,33 @@ ENDHEADER 'hd' => 'Display Options' ); $r->print(<
$lt{'hd'} -
- + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + +
 
 
@@ -529,7 +530,6 @@ END $r->print($type_element .'
'); $r->print(< $closebutton $groupimportbutton @@ -563,8 +563,8 @@ 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()); @@ -897,7 +897,7 @@ sub display_line { $r->print("\n"); $r->print (''."\n"); @@ -905,16 +905,15 @@ sub display_line { $r->print (''."\n"); $r->print (''."\n"); - $r->print ('print (' name="'.$msg.'" type="image" class="LC_fileicon" />'. + $r->print ('print (' alt="'.$msg.'" class="LC_fileicon" />'. "\n"); $r->print(&mt("Up")."$tabtag"); $r->print(&Apache::loncommon::end_data_table_row()); 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'; } @@ -932,8 +931,8 @@ sub display_line { $anchor =~ s/\W//g; $r->print (''); $r->print (''); - $r->print ('print (' name="'.$msg.'" type="image" class="LC_fileicon" />'. + $r->print ('print (' alt="'.$msg.'" class="LC_fileicon" />'. "\n"); my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]); $r->print (''."\n"); $r->print (''); - $r->print (''); + $r->print (''); $r->print ('print (' name="'.$msg.'"/>'. + $r->print (' alt="'.$msg.'"/>'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print ('"); $r->print("\"\"". "\n"); - $r->print(''); + $r->print(''); } elsif ($env{'form.catalogmode'} eq 'import') { $r->print("
\n"); $r->print("print("checked"); } $r->print(" />\n"); - $r->print('
'); + $r->print(''); $hash{"pre_${fnum}_link"}=$filelink; $hash{"pre_${fnum}_title"}=$title; if (!$hash{"pre_${fnum}_title"}) { @@ -1037,8 +1036,8 @@ $r->print ('\n"); + $r->print(''); $count++; } # Sequence open/close icon @@ -1048,10 +1047,10 @@ $r->print (''); $r->print (''); - $r->print (''); + $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_fileicon" />'. + $r->print (' alt="'.$msg.'" />'. "\n"); } # Filetype icons @@ -1070,7 +1069,7 @@ $r->print ('\n"); + $r->print("\n"); if ($hash{'display_attrs_0'} == 1) { $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); @@ -1147,7 +1146,7 @@ $r->print (''.($output eq '' ? ' ':$output). " \n"); } @@ -1199,15 +1198,15 @@ $r->print ('\n"); + $r->print (''); $count++; } $r->print (''); $r->print (''); - $r->print ('print (' name="'.$msg.'" class="LC_fileicon" />'. + $r->print (' alt="'.$msg.'" class="LC_fileicon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); @@ -1346,7 +1345,6 @@ sub showpreview { close(FH); } } - $output=''.$output.''; } elsif ($embstyle eq 'img') { $output=''.&mt('Preview').''; } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) { @@ -1377,7 +1375,7 @@ sub begin_form { $uri=&Apache::loncommon::escape_single($uri); $r->print ('
'."\n"); $r->print (''.