--- loncom/interface/lonindexer.pm	2008/12/17 18:49:13	1.181.2.2
+++ loncom/interface/lonindexer.pm	2009/12/02 18:33:27	1.203
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.181.2.2 2008/12/17 18:49:13 raeburn Exp $
+# $Id: lonindexer.pm,v 1.203 2009/12/02 18:33:27 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,28 +177,30 @@ 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' ";
             my $cl=&mt('Close');
             $closebutton=<<END;
-<input type="button" name="close" value='$cl' onClick="self.close()" />
+<input type="button" name="close" value='$cl' onclick="self.close()" />
 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' ";
 	    my $cl=&mt('Close');
             my $gi=&mt('Import');
             $closebutton=<<END;
-<input type="button" name="close" value='$cl' onClick="self.close()" />
+<input type="button" name="close" value='$cl' onclick="self.close()" />
 END
             $groupimportbutton=<<END;
 <input type="button" name="groupimport" value='$gi'
-onClick="javascript:select_group()" />
+onclick="javascript:select_group()" />
 END
         }
 	# Additions made by Matthew to make the browser a little easier to deal
@@ -359,6 +361,7 @@ END
         
 	my $js = <<"ENDHEADER";
 <script type="text/javascript">
+// <![CDATA[
 $catalogmodefunctions;
 function update_only(field) {
     alert(field.name);
@@ -403,12 +406,30 @@ function openWindow(url, wdwName, w, h,
 function gothere(val) {
     window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }
+// ]]>
 </script>
 ENDHEADER
 
         my ($headerdom)=($uri=~m{^/res/($match_domain)/});
-	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,
-						 {'domain' => $headerdom,}));
+
+        if ($env{'form.catalogmode'}) {
+            # "Popup mode"
+            $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+                                                     {'only_body' => 1,
+                                                      'domain' => $headerdom,}));
+        } else {
+            # Only display page header and breadcrumbs in non-popup mode
+            &Apache::lonhtmlcommon::clear_breadcrumbs();
+            &Apache::lonhtmlcommon::add_breadcrumb({
+                'text'  => 'Browse published resources',
+                'href'  => '/res/fhwfdev/?launch=1',
+            });
+            $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+                                                     {'domain' => $headerdom,})
+                     .&Apache::lonhtmlcommon::breadcrumbs()
+            );
+        }
+
 # ---------------------------------- get state of file types to be showing
 	if ($env{'form.only'}) {
 	    $typeselect = $env{'form.only'};
@@ -418,7 +439,7 @@ ENDHEADER
 
 # ---------------------------------- get state of file attributes to be showing
 	if ($env{'form.attrs'}) {
-	    for (my $i=0; $i<=11; $i++) {
+	    for (my $i=0; $i<=16; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($env{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
@@ -426,8 +447,8 @@ ENDHEADER
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=11; $i++) {
-		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
+	    for (my $i=0; $i<=16; $i++) {
+		$attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
 
@@ -442,7 +463,12 @@ ENDHEADER
 					   'st' => 'Statistics',
 					   'au' => 'Author',
 					   'kw' => 'Keywords',
+					   'sb' => 'Subject',
+					   'nt' => 'Notes',
+					   'ab' => 'Abstract',
 					   'ln' => 'Language',
+					   'gl' => 'Grade Level',
+					   'sd' => 'Standards',
 					   'sa' => 'Source Available',
 					   'sr' => 'Show resource',
 					   'li' => 'Linked/Related Resources',
@@ -450,29 +476,37 @@ ENDHEADER
 					   'ud' => 'Update Display',
 					   'pr' => 'Problems',
 					   'gr' => 'Graphics',
-					   'at' => 'All types'
+					   'at' => 'All types',
+					   'hd' => 'Display Options'
 					   );
 	$r->print(<<END);
-<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>
+<form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">
+<fieldset>
+<legend>$lt{'hd'}</legend>
+<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>
 <table border="0">
 <tr>
-<td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onClick="this.form.submit();" /> $lt{'ti'}</label></td>
-<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="attr0" value="1" $attrchk[0] onclick="this.form.submit();" /> $lt{'ti'}</label></td>
+<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>
+<td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onclick="this.form.submit();" /> $lt{'sd'}</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="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>
+<td>&nbsp;</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="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><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onclick="this.form.submit();" /> $lt{'gl'}</label></td>
 <td>&nbsp;</td>
 </tr>
 </table>
@@ -484,18 +518,20 @@ END
         $select_file_categories{''} = &mt('All file types');
         foreach my $cat (@file_categories) {
 	    my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
-	    $select_file_categories{$types} = $cat;
+	    $select_file_categories{$types} = &mt($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);
+            &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);
-$type_element
-<br />
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
@@ -507,21 +543,31 @@ END
 	$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
 	$storeuri=~s/\/+/\//g;
 # ---------------------------------------------------------------- Bread crumbs
-        $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
-				(($env{'form.catalogmode'} eq 'import')?
-				 'document.forms.fileattr':'')).
-		  &Apache::lonhtmlcommon::select_recent('residx','resrecent',
-'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
+        $r->print(
+            '<p>'
+           .&Apache::lonhtmlcommon::crumbs(
+                $storeuri,
+                '',
+                '',
+                (($env{'form.catalogmode'} eq 'import')?
+                                 'document.forms.fileattr':''))
+           .'<br />'
+           .&Apache::lonhtmlcommon::select_recent(
+                'residx',
+                'resrecent',
+                'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();')
+           .'</p>'
+        );
 # -------------------------------------------------------- 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_large\"><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
@@ -529,41 +575,53 @@ END
 	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # -------------------------------------------------- Check All and Uncheck all
 	if ($env{'form.catalogmode'} eq 'import') {
-	    $r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onClick="javascript:checkAll()" />');
-	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');
+	    $r->print('<p><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onclick="javascript:checkAll()" />');
+	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onclick="javascript:uncheckAll()" /></p>');
 	}
 # ----------------- 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(&Apache::loncommon::start_data_table("LC_tableBrowseRes")
+                 .&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("<th>".&mt("Grade Level")."</th>\n")
+	    if ($hash{'display_attrs_15'} == 1);
+	$r->print("<th>".&mt("Standards")."</th>\n")
+	    if ($hash{'display_attrs_16'} == 1);
+	    
+    $r->print(&Apache::loncommon::end_data_table_header_row());
+    
+    	
 
 # ----------------- read in what directories have previously been set to "open"
 	foreach (keys %hash) {
@@ -613,15 +671,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");
@@ -818,7 +874,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);
@@ -827,10 +883,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<=16) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if ($i != 9 &&
 		$hash{'display_attrs_'.$i} == 1);
@@ -845,56 +902,60 @@ 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.
 		   '/" '.
-		   'onSubmit="return rep_dirpath(\'UP\','.
+		   'onsubmit="return rep_dirpath(\'UP\','.
 		   'document.forms.fileattr.acts.value)" '.
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
 	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
-	$r->print ('<input type=hidden name=openuri value="'.
+	$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 (' alt="'.$msg.'" class="LC_fileicon" />'.
 		   "\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?
-
-    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
-    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 (' alt="'.$msg.'" class="LC_fileicon" /></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_fileicon" />'."\n");
+	$r->print (&mt("Domain")." - $listname </a>");
 	if (&Apache::lonnet::domain($listname,'description')) {
-	    $r->print("(".&Apache::lonnet::domain($listname,'description').
+	    $r->print("<br />(".&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
@@ -904,48 +965,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_fileicon"'); 
+	$r->print (' alt="'.$msg.'"/></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_fileicon" />');
 	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 (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);
-	$r->print('<tr valign="'.$valign.'" bgcolor="'.$fileclr.'">'.
-                  '<td valign="top"><span class="LC_nobreak">');
+        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);
@@ -953,17 +1020,17 @@ sub display_line {
                       $quotable_filelink,"')\">");
 	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
 		      "\n");
-	    $r->print('</span></td><td valign="top"><span class="LC_nobreak">');
+	    $r->print('</td><td class="LC_middle">');
 	} elsif ($env{'form.catalogmode'} eq 'import') {
 	    $r->print("<form name='form$fnum' action=''>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
-		      "value='$filelink' onClick='".
+		      "value='$filelink' onclick='".
 		      "javascript:queue(\"form$fnum\")' ");
 	    if ($hash{'store_'.$filelink}) {
 		$r->print("checked");
 	    }
 	    $r->print(" />\n");
-	    $r->print('</form></span></td><td valign="top"><span class="LC_nobreak">');
+	    $r->print('</form></td><td class="LC_middle">');
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$title;
 	    if (!$hash{"pre_${fnum}_title"}) {
@@ -978,34 +1045,27 @@ 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) {
-		$r->print("<img alt=\"\" src=".$iconpath.
-			  "whitespace10.gif class='LC_icon' />\n");
-	    $count++;
+	    while ($count < $indent) {
+            $r->print('<img alt="" src="'.$iconpath.'whitespace_21.gif" 
+                class="LC_icon" />');
+	        $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].'/';
 	    my $anchor = $curdir;
 	    $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" />'.
+	    $r->print ('<a name="'.$anchor.'"></a>');
+            $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()">');
+            $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
+                       '.gif" class="LC_fileicon"');
+	    $r->print (' alt="'.$msg.'" /></a>'.
 		       "\n");
 	}
 # Filetype icons
-	$r->print("<img alt=\"\" src='$iconname' class='LC_icon' />\n");
+	$r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");
 	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
 
 	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
@@ -1020,24 +1080,24 @@ sub display_line {
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
-	$r->print("</span></td>\n");
+	$r->print("</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> '.
+	$r->print('<td class="LC_nobreak"> '.
                   (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
 	    if $hash{'display_attrs_2'} == 1;
-	$r->print('<td> '.
+	$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) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author');
-	    $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
+	    $r->print('<td class="LC_nobreak"> '.($author eq '' ? '&nbsp;' : $author).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
@@ -1046,7 +1106,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');
@@ -1058,17 +1117,13 @@ sub display_line {
 # statistics
 	    &dynmetaread($filelink);
 	    $r->print("<td>");
-	    &dynmetaprint($r,$filelink,'count');
-	    &dynmetaprint($r,$filelink,'course');
-	    &dynmetaprint($r,$filelink,'stdno');
-	    &dynmetaprint($r,$filelink,'avetries');
-	    &dynmetaprint($r,$filelink,'difficulty');
-	    &dynmetaprint($r,$filelink,'disc');
-	    &dynmetaprint($r,$filelink,'clear');
-	    &dynmetaprint($r,$filelink,'technical');
-	    &dynmetaprint($r,$filelink,'correct');
-	    &dynmetaprint($r,$filelink,'helpful');
-	    &dynmetaprint($r,$filelink,'depth');
+
+        for (qw(count course stdno avetries difficulty disc clear technical
+            correct helpful depth)) {
+
+            dynmetaprint($r,$filelink,$_);
+        }
+
 	    $r->print("&nbsp;</td>\n");
 
 	}
@@ -1091,57 +1146,89 @@ sub display_line {
 	   &dynmetaread($filelink);
 	   $r->print('<td>');
 	   &coursecontext($r,$filelink);
-	   &dynmetaprint($r,$filelink,'goto_list');
-	   &dynmetaprint($r,$filelink,'comefrom_list');
-	   &dynmetaprint($r,$filelink,'sequsage_list');
-	   &dynmetaprint($r,$filelink,'dependencies');
-           &dynmetaprint($r,$filelink,'course_list');
+       for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) {
+             dynmetaprint($r,$filelink,$_);
+       }
 	   $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).
+           $r->print('<td class="LC_fontsize_medium">'.($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");
+	}
+	
+	if ($hash{'display_attrs_15'} == 1) {
+	    my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+	    $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_16'} == 1) {
+	    my $standards = &Apache::lonnet::metadata($filelink,'standards');
+	    $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
+		      " </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" />');
+            $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 (' alt="'.$msg.'" class="LC_fileicon" /></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 class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'.
+                   $location."/".$icon.'" />'.
+                   "\n");
+	$r->print ("$listname</a></form></td>\n");
 # Attributes
 	my $filelink = $startdir.$filecom[0].'/default';
 
@@ -1150,13 +1237,13 @@ 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> '.
+	$r->print('<td class="LC_break"> '.
                   (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
 	    if $hash{'display_attrs_2'} == 1;
-	$r->print('<td> '.
+	$r->print('<td class="LC_break"> '.
                   (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
 	    if $hash{'display_attrs_3'} == 1;
 
@@ -1177,19 +1264,50 @@ 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");
+	}
+	
+	if ($hash{'display_attrs_15'} == 1) {
+	    my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+	    $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_16'} == 1) {
+	    my $standards = &Apache::lonnet::metadata($filelink,'standards');
+	    $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
+		      " </td>\n");
+	}
+	
+	
+	$r->print(&Apache::loncommon::end_data_table_row());
     }
 
 }
@@ -1238,7 +1356,6 @@ sub showpreview {
              close(FH);
           }
        }
-       $output='<font size="-2">'.$output.'</font>';
     } elsif ($embstyle eq 'img') {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
@@ -1269,7 +1386,7 @@ sub begin_form {
     $uri=&Apache::loncommon::escape_single($uri);
     $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
 	       '#'.$anchor.
-	       '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
+	       '" onsubmit="return rep_dirpath(\''.$dnum.'\''.
 	       ',document.forms.fileattr.acts.value)" '.
 	       'enctype="application/x-www-form-urlencoded">'."\n");
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.