--- loncom/interface/lonindexer.pm 2007/08/17 22:27:00 1.178
+++ loncom/interface/lonindexer.pm 2008/09/19 09:08:53 1.183
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.178 2007/08/17 22:27:00 albertel Exp $
+# $Id: lonindexer.pm,v 1.183 2008/09/19 09:08:53 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -104,7 +104,7 @@ sub handler {
my $lonhost = $r->dir_config('lonHostID');
my $tabdir = $r->dir_config('lonTabDir');
- my $fileclr='#ffffe6';
+#SB my $fileclr='#ffffe6';
my $line;
my (@attrchk,@openpath,$typeselect);
my $uri=$r->uri;
@@ -177,7 +177,8 @@ ENDSUBM
# --------------------- define extra fields and buttons in case of special mode
if ($env{'form.catalogmode'} eq 'interactive') {
- $extrafield='
+
$tabtag");
+ $r->print(&Apache::loncommon::end_data_table_row());
return OK;
}
# Do we have permission to look at this?
@@ -868,13 +875,15 @@ sub display_line {
if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }
# make absolute links appear on different background
- if ($absolute) { $fileclr='#ccdd99'; }
+#SB if ($absolute) { $fileclr='#ccdd99'; }
# display domain
if ($filecom[1] eq 'domain') {
$r->print (''."\n")
if ($env{'form.dirPointer'} eq "on");
- $r->print("$extrafield");
+#SB $r->print("
$extrafield");
+ $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
+ $r->print($extrafield);
$r->print("");
&begin_form ($r,$filecom[0]);
my $anchor = $filecom[0];
@@ -894,7 +903,8 @@ sub display_line {
$r->print("(".&Apache::lonnet::domain($listname,'description').
")");
}
- $r->print ("$tabtag |
\n");
+ $r->print("$tabtag");
+ $r->print(&Apache::loncommon::end_data_table_row());
return OK;
# display user directory
@@ -904,7 +914,9 @@ sub display_line {
my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;
$anchor =~ s/\W//g;
- $r->print("$extrafield");
+#SB $r->print(" |
$extrafield");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .$extrafield.' | ');
&begin_form ($r,$curdir);
$r->print (''."\n");
@@ -921,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;
}
@@ -935,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("");
+#SB $r->print(" |
");
+ $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
+ $r->print(' | ');
if ($env{'form.catalogmode'} eq 'interactive') {
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
@@ -1014,7 +1029,7 @@ sub display_line {
&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
$r->print (" (metadata) ");
+ " target=\"_self\">".&mt('metadata').") ");
# Close form to open/close sequence
if ($filelink=~/\.(page|sequence)$/) {
$r->print('');
@@ -1028,10 +1043,10 @@ sub display_line {
$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) {
@@ -1080,7 +1095,7 @@ sub display_line {
$r->print(''."Yes "." | \n");
+ " target=\"_self\">".&mt('Source Code')." "."\n");
} else { #A cuddled else. :P
$r->print(" | \n");
}
@@ -1103,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
@@ -1111,7 +1126,10 @@ sub display_line {
my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;
$anchor =~ s/\W//g;
- $r->print("$extrafield");
+#SB $r->print(" |
$extrafield");
+ $r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
+# $r->print(' |
');
+ $r->print($extrafield.'');
&begin_form ($r,$curdir);
my $indentm1 = $indent-1;
if ($indentm1 < 11 and $indentm1 > 0) {
@@ -1149,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) {
@@ -1188,7 +1206,7 @@ sub display_line {
if ($hash{'display_attrs_7'} == 1) {
$r->print(' | ');
}
- $r->print('
');
+ $r->print(&Apache::loncommon::end_data_table_row());
}
}