--- loncom/interface/lonindexer.pm	2007/08/01 21:12:12	1.174
+++ loncom/interface/lonindexer.pm	2009/03/17 20:07:45	1.190
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.174 2007/08/01 21:12:12 banghart Exp $
+# $Id: lonindexer.pm,v 1.190 2009/03/17 20:07:45 schulted Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,9 +104,9 @@ 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);
+    my (@attrchk,@openpath,$typeselect);
     my $uri=$r->uri;
 
 # -------------------------------------- see if called from an interactive mode
@@ -177,7 +177,8 @@ ENDSUBM
 
 # --------------------- define extra fields and buttons in case of special mode
 	if ($env{'form.catalogmode'} eq 'interactive') {
-	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+#SB	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+            $extrafield='<td class="LC_bottom">'.
 		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
 		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
@@ -187,7 +188,8 @@ ENDSUBM
 END
         }
 	elsif ($env{'form.catalogmode'} eq 'import') {
-	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+#SB	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+            $extrafield='<td class="LC_bottom">'.
 		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
 		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
@@ -359,7 +361,10 @@ END
         
 	my $js = <<"ENDHEADER";
 <script type="text/javascript">
-$catalogmodefunctions
+$catalogmodefunctions;
+function update_only(field) {
+    alert(field.name);
+}
 function checkAll() {
     var numForms = document.forms.length;
     for (i=0;i<numForms;i++) {
@@ -404,11 +409,18 @@ function gothere(val) {
 ENDHEADER
 
         my ($headerdom)=($uri=~m{^/res/($match_domain)/});
-	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,
+	$r->print(&Apache::loncommon::start_page('Content Library',$js,
 						 {'domain' => $headerdom,}));
+# ---------------------------------- get state of file types to be showing
+	if ($env{'form.only'}) {
+	    $typeselect = $env{'form.only'};
+	} else {
+	    $typeselect = '';
+	}
+
 # ---------------------------------- get state of file attributes to be showing
 	if ($env{'form.attrs'}) {
-	    for (my $i=0; $i<=11; $i++) {
+	    for (my $i=0; $i<=14; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($env{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
@@ -416,7 +428,7 @@ ENDHEADER
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=11; $i++) {
+	    for (my $i=0; $i<=14; $i++) {
 		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
@@ -432,6 +444,9 @@ ENDHEADER
 					   'st' => 'Statistics',
 					   'au' => 'Author',
 					   'kw' => 'Keywords',
+					   'sb' => 'Subject',
+					   'nt' => 'Notes',
+					   'ab' => 'Abstract',
 					   'ln' => 'Language',
 					   'sa' => 'Source Available',
 					   'sr' => 'Show resource',
@@ -440,9 +455,12 @@ ENDHEADER
 					   'ud' => 'Update Display',
 					   'pr' => 'Problems',
 					   'gr' => 'Graphics',
-					   'at' => 'All types'
+					   'at' => 'All types',
+					   'hd' => 'Display Options'
 					   );
 	$r->print(<<END);
+<fieldset>
+<legend>$lt{'hd'}</legend>
 <form method="post" name="fileattr" action="$uri"
  enctype="application/x-www-form-urlencoded">
 <label><input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}</label>
@@ -452,32 +470,50 @@ ENDHEADER
 <td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onClick="this.form.submit();" /> $lt{'au'}</label></td>
 <td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onClick="this.form.submit();" /> $lt{'kw'}</label></td>
 <td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onClick="this.form.submit();" /> $lt{'ln'}</label></td>
+<td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onClick="this.form.submit();" /> $lt{'nt'}</label></td>
 </tr>
 <tr>
 <td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</label></td>
 <td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onClick="this.form.submit();" /> $lt{'la'}</label></td>
 <td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onClick="this.form.submit();" /> $lt{'lm'}</label></td>
 <td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onClick="this.form.submit();" /> $lt{'sa'}</label></td>
+<td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onClick="this.form.submit();" /> $lt{'ab'}</label></td>
 </tr>
 <tr>
 <td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</label></td>
 <td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onClick="this.form.submit();" /> $lt{'li'}</label></td>
 <td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onClick="this.form.submit();" /> $lt{'sr'}</label></td>
+<td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onClick="this.form.submit();" /> $lt{'sb'}</label></td>
 <td>&nbsp;</td>
 </tr>
 </table>
 <input type="hidden" name="attrs" value="1" />
-<input type="hidden" name="only" value="" />
-<label><input type="checkbox" name="problem" value="problem" onClick="this.form.only.value += 'problem';this.form.submit();" />$lt{'pr'}</label>
-<label><input type="checkbox" name="graphic" value="gif,jpg,jpeg" onClick="this.form.only.value += ',gif,jpg,jpg';this.form.submit();" />$lt{'gr'}</label>
-<label><input type="checkbox" name="all" value="" onClick="this.form.only.value = '';this.form.submit();" />$lt{'at'}</label>
-
+END
+        my @file_categories = &Apache::loncommon::filecategories();
+        my %select_file_categories;
+        my @select_form_order = ('');
+        $select_file_categories{''} = &mt('All file types');
+        foreach my $cat (@file_categories) {
+	    my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
+	    $select_file_categories{$types} = $cat;
+	    push(@select_form_order,$types);
+	}
+        $select_file_categories{'select_form_order'} = \@select_form_order;
+        my $type_element=
+	    &Apache::loncommon::select_form($typeselect,'only',
+					    %select_file_categories);
+        $type_element = '<label>'.&mt('File Type Displayed: [_1]',
+				      $type_element).'</label>';
+        $r->print($type_element
+                 .'</fieldset>');
+        $r->print(<<END);
 <br />
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
 END
         $r->print(&Apache::loncommon::inhibit_menu_check('input'));
+   
 # -------------- Filter out sequence containment in crumbs and "recent folders"
 	my $storeuri=$uri;
 	$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
@@ -491,13 +527,13 @@ END
 # -------------------------------------------------------- Resource Home Button
 	my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
 	if ($reshome) {
-	    $r->print("<font size='+2'><a href='");
+	    $r->print("<span class=\"LC_fontsize_small\"><a href='");
 	    if ($env{'form.catalogmode'} eq 'import') {
 		$r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
 	    } else {
 		$r->print($reshome);
 	    }
-	    $r->print("'>".&mt('Home').'</a></font>');
+	    $r->print("'>".&mt('Home').'</a></span>');
 	}
 	$r->print('</form>');
 # ------------------------------------------------------ Remember where we were
@@ -509,37 +545,46 @@ END
 	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');
 	}
 # ----------------- 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('<table width="100%" border="0"><tr><td bgcolor="#777777">'."\n");
-	$r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");
-	$r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
-	$r->print("<td><b>".&mt('Title')."</b></td>\n") 
+        $r->print('<br /><br />');
+        $r->print(&Apache::loncommon::start_data_table("LC_tableOfContent")
+                 .&Apache::loncommon::start_data_table_header_row());
+	$r->print("<th $colspan>".&mt('Name')."</th>\n");
+	$r->print("<th>".&mt('Title')."</th>\n") 
 	    if ($hash{'display_attrs_0'} == 1);
-	$r->print("<td align=right><b>".&mt("Size")." (".&mt("bytes").") ".
-		  "</b></td>\n") if ($hash{'display_attrs_1'} == 1);
-	$r->print("<td><b>".&mt("Last accessed")."</b></td>\n") 
+	$r->print('<th class="LC_right">'.&mt("Size")." (".&mt("bytes").") ".
+		  "</th>\n") if ($hash{'display_attrs_1'} == 1);
+	$r->print("<th>".&mt("Last accessed")."</th>\n") 
 	    if ($hash{'display_attrs_2'} == 1);
-	$r->print("<td><b>".&mt("Last modified")."</b></td>\n")
+	$r->print("<th>".&mt("Last modified")."</th>\n")
 	    if ($hash{'display_attrs_3'} == 1);
-	$r->print("<td><b>".&mt("Author(s)")."</b></td>\n")
+	$r->print("<th>".&mt("Author(s)")."</th>\n")
 	    if ($hash{'display_attrs_4'} == 1);
-	$r->print("<td><b>".&mt("Keywords")."</b></td>\n")
+	$r->print("<th>".&mt("Keywords")."</th>\n")
 	    if ($hash{'display_attrs_5'} == 1);
-	$r->print("<td><b>".&mt("Language")."</b></td>\n")
+	$r->print("<th>".&mt("Language")."</th>\n")
 	    if ($hash{'display_attrs_6'} == 1);
-	$r->print("<td><b>".&mt("Usage Statistics")." <br />(".
-		  &mt("Courses/Network Hits").")</b> ".&mt('updated periodically')."</td>\n")
+	$r->print("<th>".&mt("Usage Statistics")." <br />(".
+		  &mt("Courses/Network Hits").") ".&mt('updated periodically')."</th>\n")
 	    if ($hash{'display_attrs_8'} == 1);
-	$r->print("<td><b>".&mt("Source Available")."</b></td>\n")
+	$r->print("<th>".&mt("Source Available")."</th>\n")
 	    if ($hash{'display_attrs_10'} == 1);
-	$r->print("<td><b>".&mt("Linked/Related Resources")."</b></td>\n")
+	$r->print("<th>".&mt("Linked/Related Resources")."</th>\n")
 	    if ($hash{'display_attrs_11'} == 1);
-	$r->print("<td><b>".&mt("Resource")."</b></td>\n")
+	$r->print("<th>".&mt("Resource")."</th>\n")
 	    if ($hash{'display_attrs_7'} == 1);
-	$r->print('</tr>');
+	$r->print("<th>".&mt("Subject")."</th>\n")
+	    if ($hash{'display_attrs_12'} == 1);
+	$r->print("<th>".&mt("Notes")."</th>\n")
+	    if ($hash{'display_attrs_13'} == 1);
+	$r->print("<th>".&mt("Abstract")."</th>\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) {
@@ -589,15 +634,13 @@ END
 
 # -------- recursively go through all the directories and output as appropriate
 	&scanDir ($r,$toplevel,$indent,\%hash);
-	
 
 # -------------------------------------------------------------- end the tables
-	$r->print('</table>');
+        $r->print(&Apache::loncommon::end_data_table());
+
 # ---------------------------- embed hidden information useful for group import
 	$r->print("<form name='fnum' action=''>");
 	$r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
-# -------------------------------------------------------------- end the tables
-	$r->print('</td></tr></table>');
 
 # --------------------------------------------------- end the output and return
 	$r->print(&Apache::loncommon::end_page()."\n");
@@ -633,7 +676,7 @@ sub scanDir {
 	next if($strip =~ /.*\.meta$/ | $obs eq '1');
 	my (@fileparts) = split(/\./,$strip);
 	if ($hash{'display_attrs_9'} != 1) {
-# if not all versions to be shown
+            # if not all versions to be shown
 	    if (scalar(@fileparts) >= 3) {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
@@ -794,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);
@@ -803,10 +846,11 @@ sub display_line {
     my $fnptr = $filecom[3]&$dirptr;
     my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');
     $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';
+    my $nowOpen = ($diropen eq 'opened' ? 1 : 0);
 
     my $tabtag='</td>';
     my $i=0;
-    while ($i<=11) {
+    while ($i<=14) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if ($i != 9 &&
 		$hash{'display_attrs_'.$i} == 1);
@@ -821,7 +865,9 @@ sub display_line {
 	$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
 	$updir=~s/\/+/\//g;
 
-	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+        $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?
+        $r->print($extrafield);
 	$r->print("<td>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
 		   '/" '.
@@ -832,11 +878,12 @@ sub display_line {
 	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
 	$r->print ('<input type=hidden name=openuri value="'.
 		   $startdir.'" />'."\n");
-	$r->print ('<input type="hidden" name="acts" value="" />'."\n");
-	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
-	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+        $r->print ('<input type="hidden" name="acts" value="" />'."\n");
+	$r->print ('<a href="#" onClick="document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
+	$r->print (' name="'.$msg.'" type="image" class="LC_icon" />'.
 		   "\n");
-	$r->print(&mt("Up")."</form>$tabtag</tr>\n");
+	$r->print(&mt("Up")."</a></form>$tabtag");
+        $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
     }
 # Do we have permission to look at this?
@@ -844,33 +891,35 @@ 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 ('<input type="hidden" name="dirPointer" value="on" />'."\n")
  	    if ($env{'form.dirPointer'} eq "on");
-	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+	$r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
+        $r->print($extrafield);
 	$r->print("<td>");
 	&begin_form ($r,$filecom[0]);
 	my $anchor = $filecom[0];
 	$anchor =~ s/\W//g;
 	$r->print ('<a name="'.$anchor.'"></a>');
-	$r->print ('<input type="hidden" name="acts" value="" />');
-	$r->print ('<input src="'.$iconpath.'folder_pointer_'.
-		   $diropen.'.gif"'); 
-	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+$r->print ('<input type="hidden" name="acts" value="" />');
+	$r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"'); 
+	$r->print (' name="'.$msg.'" type="image" class="LC_icon" /></a>'.
 		   "\n");
 	my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
 		   '\')"><img alt="" src="'.$iconpath.'server.gif"');
-	$r->print (' class="LC_icon" /></a>'."\n");
-	$r->print (&mt("Domain")." - $listname ");
+	$r->print (' class="LC_icon" />'."\n");
+	$r->print (&mt("Domain")." - $listname </a>");
 	if (&Apache::lonnet::domain($listname,'description')) {
 	    $r->print("(".&Apache::lonnet::domain($listname,'description').
 		      ")");
 	}
-	$r->print ("</form>$tabtag</tr>\n");
+	$r->print("</form>$tabtag");
+         $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
 
 # display user directory
@@ -880,47 +929,54 @@ sub display_line {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\W//g;
-	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+#SB	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+        $r->print(&Apache::loncommon::start_data_table_row()
+                 .$extrafield.'<td class="LC_'.$valign.'">');
 	&begin_form ($r,$curdir);
 	$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
-		   'whitespace1.gif" class="LC_icon" />'."\n");
+		   'whitespace_21.gif" class="LC_icon" />'."\n");
 	$r->print ('<input type="hidden" name="acts" value="" />');
-	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
-		   '.gif"'); 
-	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+	$r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');
+        $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
+		   '.gif" class="LC_icon"'); 
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" /></a>'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
 		   .'\')"><img alt="'.$msg.'" src="'.
-		   $iconpath.'quill.gif" class="LC_indexer_icon" /></a>');
+		   $iconpath.'quill.gif" class="LC_indexer_icon" />');
 	my $domain=(split(m|/|,$startdir))[2];
 	my $plainname=&Apache::loncommon::plainname($listname,$domain);
-	$r->print ($listname);
-	if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
-	$r->print ('</form>'.$tabtag.'</tr>'."\n");
-	return OK;
+        $r->print ($listname.'</a>');
+
+        if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
+        $r->print('</form>'.$tabtag);
+        $r->print(&Apache::loncommon::end_data_table_row());
+        return OK;
     }
 
 # display file
-    if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
-        my $title;
-	my $filelink = $pathprefix.$filecom[0];
-	if ($hash{'display_attrs_0'} == 1) {
-	    $title = &Apache::lonnet::gettitle($filelink);
-	}
-	my @file_ext = split (/\./,$listname);
-	my $curfext = $file_ext[-1];
-        if (@Omit) {
-            foreach (@Omit) { return OK if ($curfext eq $_); }
-        }
-        if (@Only) {
-            my $skip = 1;
-            foreach (@Only) { $skip = 0 if ($curfext eq $_); }
-            return OK if ($skip > 0);
-        }
-	# Set the icon for the file
-	my $iconname = &Apache::loncommon::icon($listname);
-	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\"><td nowrap='nowrap' valign='top'>");
+        if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
+            my $title;
+            my $filelink = $pathprefix.$filecom[0];
+            if ($hash{'display_attrs_0'} == 1) {
+                $title = &Apache::lonnet::gettitle($filelink);
+            }
+            my @file_ext = split (/\./,$listname);
+            my $curfext = $file_ext[-1];
+            if (@Omit) {
+                foreach (@Omit) { return OK if (lc($curfext) eq $_); }
+            }
+            if (@Only) {
+                my $skip = 1;
+                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);
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);
+        $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
+        $r->print('<td class="LC_middle LC_nobreak">');
 	
         if ($env{'form.catalogmode'} eq 'interactive') {
 	    my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
@@ -928,7 +984,7 @@ sub display_line {
                       $quotable_filelink,"')\">");
 	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
 		      "\n");
-	    $r->print("</td><td nowrap='nowrap' valign='top'>");
+	    $r->print('</td><td class="LC_middle"><span class="LC_nobreak">');
 	} elsif ($env{'form.catalogmode'} eq 'import') {
 	    $r->print("<form name='form$fnum' action=''>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
@@ -938,7 +994,7 @@ sub display_line {
 		$r->print("checked");
 	    }
 	    $r->print(" />\n");
-	    $r->print("</form></td><td nowrap='nowrap' valign='top'>");
+	    $r->print('</form></td><td class="LC_middle"><span class="LC_nobreak">');
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$title;
 	    if (!$hash{"pre_${fnum}_title"}) {
@@ -953,21 +1009,12 @@ sub display_line {
 	    $indent--;
 	}
 # General indentation
-	if ($indent > 0 and $indent < 11) {
-	    $r->print("<img alt=\"\" src='",$iconpath,"whitespace",$indent,
-		      ".gif' class='LC_icon' />\n");
-	} elsif ($indent >0) {
-	    my $ten = int($indent/10.);
-	    my $rem = $indent%10.0;
 	    my $count = 0;
-	    while ($count < $ten) {
+	    while ($count < $indent) {
 		$r->print("<img alt=\"\" src=".$iconpath.
-			  "whitespace10.gif class='LC_icon' />\n");
-	    $count++;
+			  "whitespace_21.gif class='LC_icon' />\n");
+	        $count++;
 	    }
-	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
-		      ".gif class='LC_icon' />\n") if $rem > 0;
-	}
 # Sequence open/close icon
 	if ($filelink=~/\.(page|sequence)$/) {
 	    my $curdir = $startdir.$filecom[0].'/';
@@ -975,8 +1022,8 @@ sub display_line {
 	    $anchor =~ s/\W//g;
 	    $r->print ('<input type="hidden" name="acts" value="" />');
 	    $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
-		       'folder_pointer_'.$diropen.'.gif"');
-	    $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+		       'arrow'.($nowOpen ? "open" : "closed" ).'.gif"');
+	    $r->print (' name="'.$msg.'" type="image" class="LC_icon" />'.
 		       "\n");
 	}
 # Filetype icons
@@ -990,24 +1037,24 @@ sub display_line {
 	&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
 	$r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
 		   "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".
-		   " target=\"_self\">metadata</a>) ");
+		   " target=\"_self\">".&mt('metadata')."</a>) ");
 # Close form to open/close sequence
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
-	$r->print("</td>\n");
+	$r->print("</span></td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
-	$r->print('<td align=right> ',
+	$r->print('<td class="LC_right"> ',
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print('<td> '.
-		  (localtime($filecom[9]))." </td>\n") 
+	$r->print('<td class="LC_nobreak"> '.
+                  (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
 	    if $hash{'display_attrs_2'} == 1;
-	$r->print('<td> '.
-		  (localtime($filecom[10]))." </td>\n") 
+	$r->print('<td class="LC_nobreak"> '.
+                  (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
 	    if $hash{'display_attrs_3'} == 1;
 
 	if ($hash{'display_attrs_4'} == 1) {
@@ -1021,7 +1068,6 @@ sub display_line {
 	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
 		      " </td>\n");
 	}
-#'
 
 	if ($hash{'display_attrs_6'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language');
@@ -1056,7 +1102,7 @@ sub display_line {
 		$r->print('<td>'."<a href=\"javascript:openWindow('"
 			  .$quotable_sourcelink.
 			  "', 'previewsource', '700', '700', 'no', 'yes','yes');\"".
-			  " target=\"_self\">Yes</a> "."</td>\n");
+			  " target=\"_self\">".&mt('Source Code')."</a> "."</td>\n");
 	    } else { #A cuddled else. :P
 		$r->print("<td>&nbsp;</td>\n");
 	    }
@@ -1073,50 +1119,72 @@ sub display_line {
            &dynmetaprint($r,$filelink,'course_list');
 	   $r->print('</td>');
         }
-        if ($hash{'display_attrs_7'} == 1) {
+        
+   
+	
+	if ($hash{'display_attrs_7'} == 1) {
 # Show resource
 	   my $output=&showpreview($filelink);
            $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
-        }
-	$r->print("</tr>\n");
     }
+    
+    if ($hash{'display_attrs_12'} == 1) {
+	    my $subject = &Apache::lonnet::metadata($filelink,'subject');
+	    $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_13'} == 1) {
+	    my $notes = &Apache::lonnet::metadata($filelink,'notes');
+	    $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_14'} == 1) {
+	    my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
+	    $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).
+		      " </td>\n");
+	}
+	
+	$r->print(&Apache::loncommon::end_data_table_row());
+}
+    
+    
 
 # -- display directory
     if ($fnptr == $dirptr) {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\W//g;
-	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+#SB	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+        $r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
+#	$r->print('<tr class="LC_info_row">');
+        $r->print($extrafield.'<td class="LC_middle LC_nobreak">');
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
-	if ($indentm1 < 11 and $indentm1 > 0) {
-	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
-		      ".gif class='LC_icon' />\n");
-	} else {
-	    my $ten = int($indentm1/10.);
-	    my $rem = $indentm1%10.0;
-	    my $count = 0;
-	    while ($count < $ten) {
-		$r->print ("<img alt=\"\" src=",$iconpath
-			   ,"whitespace10.gif class='LC_icon' />\n");
-		$count++;
-	    }
-	    $r->print ("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
-		       ".gif class='LC_icon' />\n") if $rem > 0;
+	my $count = 0;
+	while ($count < $indentm1) {
+	    $r->print ("<img alt=\"\" src=",$iconpath
+	               ,"whitespace_21.gif class='LC_icon' />\n");
+            $count++;
 	}
 	$r->print ('<input type="hidden" name="acts" value="" />');
-	$r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
-		   'folder_pointer_'.$diropen.'.gif"');
-	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+	$r->print ('<a name="'.$anchor.'"></a>');
+        $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.
+		   'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
+	$r->print (' name="'.$msg.'" class="LC_icon" /></a>'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
-	$r->print ('<a href="javascript:gothere(\''
-		   .$quotable_curdir.'\')">'
-		   .'<img alt="'.&mt('Open Folder').'"src="'.
-		   $iconpath.'folder_'.$diropen.'.gif" class="LC_icon" /></a>'.
-		   "\n");
-	$r->print ("$listname</form></td>\n");
+        
+        my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+	my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
+        $r->print ('<a href="javascript:gothere(\''
+		   .$quotable_curdir.'\')"">'
+		   .'<img alt="'.&mt('Open Folder').'" src="'.
+                   $location."/".$icon.'" />'.
+                   "\n");
+	$r->print ("$listname</a></form></td>\n");
 # Attributes
 	my $filelink = $startdir.$filecom[0].'/default';
 
@@ -1125,14 +1193,14 @@ sub display_line {
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
-	$r->print('<td align=right> ',
+	$r->print('<td class="LC_right"> ',
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print('<td> '.
-		  (localtime($filecom[9]))." </td>\n") 
+	$r->print('<td class="LC_break"> '.
+                  (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
 	    if $hash{'display_attrs_2'} == 1;
-	$r->print('<td> '.
-		  (localtime($filecom[10]))." </td>\n") 
+	$r->print('<td class="LC_break"> '.
+                  (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
 	    if $hash{'display_attrs_3'} == 1;
 
 	if ($hash{'display_attrs_4'} == 1) {
@@ -1152,19 +1220,37 @@ sub display_line {
 	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
 		      " </td>\n");
 	}
+	
 	if ($hash{'display_attrs_8'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
 	}
  	if ($hash{'display_attrs_10'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
 	}
-	if ($hash{'display_attrs_11'} == 1) {
-	   $r->print('<td>&nbsp;</td>');
-	}
 	if ($hash{'display_attrs_7'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
-        }
-	$r->print('</tr>');
+    }     
+    if ($hash{'display_attrs_11'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+	}
+	if ($hash{'display_attrs_12'} == 1) {
+	    my $subject = &Apache::lonnet::metadata($filelink,'subject');
+	    $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+		      " </td>\n");
+	}
+	if ($hash{'display_attrs_13'} == 1) {
+	    my $notes = &Apache::lonnet::metadata($filelink,'notes');
+	    $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_14'} == 1) {
+	    my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
+	    $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).
+		      " </td>\n");
+	}
+	
+	$r->print(&Apache::loncommon::end_data_table_row());
     }
 
 }
@@ -1213,7 +1299,7 @@ sub showpreview {
              close(FH);
           }
        }
-       $output='<font size="-2">'.$output.'</font>';
+       $output='<span class="LC_fontsize_medium">'.$output.'</span>';
     } elsif ($embstyle eq 'img') {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {