$extrafield");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .$extrafield.' | ');
&begin_form ($r,$curdir);
$r->print (''."\n");
@@ -914,7 +933,8 @@ sub display_line {
my $plainname=&Apache::loncommon::plainname($listname,$domain);
$r->print ($listname);
if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
- $r->print (''.$tabtag.' |
'."\n");
+ $r->print(''.$tabtag);
+ $r->print(&Apache::loncommon::end_data_table_row());
return OK;
}
@@ -928,16 +948,18 @@ sub display_line {
my @file_ext = split (/\./,$listname);
my $curfext = $file_ext[-1];
if (@Omit) {
- foreach (@Omit) { return OK if ($curfext eq $_); }
+ foreach (@Omit) { return OK if (lc($curfext) eq $_); }
}
if (@Only) {
my $skip = 1;
- foreach (@Only) { $skip = 0 if ($curfext eq $_); }
+ foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
return OK if ($skip > 0);
}
# Set the icon for the file
my $iconname = &Apache::loncommon::icon($listname);
- $r->print(");
+ $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
+ $r->print('');
if ($env{'form.catalogmode'} eq 'interactive') {
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
@@ -945,7 +967,7 @@ sub display_line {
$quotable_filelink,"')\">");
$r->print("".
"\n");
- $r->print(" | ");
+ $r->print(' | ');
} elsif ($env{'form.catalogmode'} eq 'import') {
$r->print(" | ");
+ $r->print(' | ');
$hash{"pre_${fnum}_link"}=$filelink;
$hash{"pre_${fnum}_title"}=$title;
if (!$hash{"pre_${fnum}_title"}) {
@@ -1000,31 +1022,31 @@ sub display_line {
$r->print("\n");
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
-
$r->print (" $listname ");
-
+ $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
+ &Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
$r->print (" (metadata) ");
+ "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".
+ " target=\"_self\">".&mt('metadata').") ");
# Close form to open/close sequence
if ($filelink=~/\.(page|sequence)$/) {
$r->print('');
}
- $r->print(" | \n");
+ $r->print("\n");
if ($hash{'display_attrs_0'} == 1) {
$r->print(' '.($title eq '' ? ' ' : $title).
' | '."\n");
}
- $r->print(' ',
+ $r->print(' | ',
$filecom[8]," | \n")
if $hash{'display_attrs_1'} == 1;
$r->print(' '.
- (localtime($filecom[9]))." | \n")
+ (&Apache::lonlocal::locallocaltime($filecom[9]))." \n")
if $hash{'display_attrs_2'} == 1;
$r->print(' '.
- (localtime($filecom[10]))." | \n")
+ (&Apache::lonlocal::locallocaltime($filecom[10]))." \n")
if $hash{'display_attrs_3'} == 1;
if ($hash{'display_attrs_4'} == 1) {
@@ -1069,10 +1091,11 @@ sub display_line {
if($source eq 'open') {
my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
+ &Apache::loncommon::inhibit_menu_check(\$quotable_sourcelink);
$r->print(''."Yes "." | \n");
+ " target=\"_self\">".&mt('Source Code')." "."\n");
} else { #A cuddled else. :P
$r->print(" | \n");
}
@@ -1095,7 +1118,7 @@ sub display_line {
$r->print(' '.($output eq '' ? ' ':$output).
" | \n");
}
- $r->print("
\n");
+ $r->print(&Apache::loncommon::end_data_table_row());
}
# -- display directory
@@ -1103,7 +1126,10 @@ sub display_line {
my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;
$anchor =~ s/\W//g;
- $r->print("');
+ $r->print($extrafield.'');
&begin_form ($r,$curdir);
my $indentm1 = $indent-1;
if ($indentm1 < 11 and $indentm1 > 0) {
@@ -1141,14 +1167,14 @@ sub display_line {
$r->print(' | '.($title eq '' ? ' ' : $title).
' | '."\n");
}
- $r->print(' ',
+ $r->print(' | ',
$filecom[8]," | \n")
if $hash{'display_attrs_1'} == 1;
$r->print(' '.
- (localtime($filecom[9]))." | \n")
+ (&Apache::lonlocal::locallocaltime($filecom[9]))." \n")
if $hash{'display_attrs_2'} == 1;
$r->print(' '.
- (localtime($filecom[10]))." | \n")
+ (&Apache::lonlocal::locallocaltime($filecom[10]))." \n")
if $hash{'display_attrs_3'} == 1;
if ($hash{'display_attrs_4'} == 1) {
@@ -1180,7 +1206,7 @@ sub display_line {
if ($hash{'display_attrs_7'} == 1) {
$r->print(' | ');
}
- $r->print('
');
+ $r->print(&Apache::loncommon::end_data_table_row());
}
}
@@ -1266,6 +1292,7 @@ sub begin_form {
$r->print ('