@@ -548,47 +545,46 @@ END
$r->print('');
}
# ----------------- output starting row to the indexed file/directory hierarchy
- my $titleclr="#ddffff";
#$r->print(&initdebug());
#$r->print(&writedebug("Omit:@Omit")) if (@Omit);
#$r->print(&writedebug("Only:@Only")) if (@Only);
- $r->print('
\n")
if ($hash{'display_attrs_8'} == 1);
- $r->print("
".&mt("Source Available")."
\n")
+ $r->print("
".&mt("Source Available")."
\n")
if ($hash{'display_attrs_10'} == 1);
- $r->print("
".&mt("Linked/Related Resources")."
\n")
+ $r->print("
".&mt("Linked/Related Resources")."
\n")
if ($hash{'display_attrs_11'} == 1);
- $r->print("
".&mt("Resource")."
\n")
+ $r->print("
".&mt("Resource")."
\n")
if ($hash{'display_attrs_7'} == 1);
- $r->print("
".&mt("Subject")."
\n")
- if ($hash{'display_attrs_12'} == 1);
- $r->print("
".&mt("Notes")."
\n")
- if ($hash{'display_attrs_13'} == 1);
- $r->print("
".&mt("Abstract")."
\n")
- if ($hash{'display_attrs_14'} == 1);
- $r->print("
".&mt("Grade Level")."
\n")
- if ($hash{'display_attrs_15'} == 1);
- $r->print("
".&mt("Standards")."
\n")
- if ($hash{'display_attrs_16'} == 1);
- $r->print('
');
+ $r->print("
".&mt("Subject")."
\n")
+ if ($hash{'display_attrs_12'} == 1);
+ $r->print("
".&mt("Notes")."
\n")
+ if ($hash{'display_attrs_13'} == 1);
+ $r->print("
".&mt("Abstract")."
\n")
+ if ($hash{'display_attrs_14'} == 1);
+
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+
+
# ----------------- read in what directories have previously been set to "open"
foreach (keys %hash) {
@@ -638,15 +634,13 @@ END
# -------- recursively go through all the directories and output as appropriate
&scanDir ($r,$toplevel,$indent,\%hash);
-
# -------------------------------------------------------------- end the tables
- $r->print('
');
+ $r->print(&Apache::loncommon::end_data_table());
+
# ---------------------------- embed hidden information useful for group import
$r->print("");
-# -------------------------------------------------------------- end the tables
- $r->print('
');
# --------------------------------------------------- end the output and return
$r->print(&Apache::loncommon::end_page()."\n");
@@ -843,7 +837,7 @@ sub display_line {
$pathprefix=$startdir;
}
my $dirptr=16384;
- my $fileclr="#ffffe6";
+#SB my $fileclr="#ffffe6";
my $iconpath= $r->dir_config('lonIconsURL') . '/';
my @filecom = split (/\&/,$line);
@@ -855,7 +849,7 @@ sub display_line {
my $tabtag='';
my $i=0;
- while ($i<=16) {
+ while ($i<=14) {
$tabtag=join('',$tabtag,"
")
if ($i != 9 &&
$hash{'display_attrs_'.$i} == 1);
@@ -870,7 +864,9 @@ sub display_line {
$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
$updir=~s/\/+/\//g;
- $r->print("
\n");
+ $r->print(&mt("Up")."$tabtag");
+ $r->print(&Apache::loncommon::end_data_table_row());
return OK;
}
# Do we have permission to look at this?
@@ -893,13 +890,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("
');
&begin_form ($r,$curdir);
$r->print (''."\n");
@@ -946,7 +948,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;
}
@@ -969,8 +972,9 @@ sub display_line {
}
# Set the icon for the file
my $iconname = &Apache::loncommon::icon($listname);
- $r->print('