--- loncom/interface/lonindexer.pm	2007/07/11 23:51:19	1.172
+++ loncom/interface/lonindexer.pm	2018/08/07 17:41:40	1.228
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.172 2007/07/11 23:51:19 albertel Exp $
+# $Id: lonindexer.pm,v 1.228 2018/08/07 17:41:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,9 +34,8 @@
 ## 1. Description of functions                                               ##
 ## 2. Modules used by this module                                            ##
 ## 3. Choices for different output views (detailed, summary, xml, etc)       ##
-## 4. BEGIN block (to be run once after compilation)                         ##
-## 5. Handling routine called via Apache and mod_perl                        ##
-## 6. Other subroutines                                                      ##
+## 4. Handling routine called via Apache and mod_perl                        ##
+## 5. Other subroutines                                                      ##
 ##                                                                           ##
 ###############################################################################
 
@@ -60,7 +59,6 @@ use LONCAPA qw(:match);
 # ---------------------------------------- variables used throughout the module
 my %hash; # global user-specific gdbm file
 my %dirs; # keys are directories, values are the open/close status
-my %language; # has the reference information present in language.tab
 my %dynhash; # hash of hashes for dynamic metadata
 my %dynread; # hash of directories already read for dynamic metadata
 my %fieldnames; # Metadata fieldnames
@@ -94,19 +92,13 @@ sub handler {
     undef (@Omit);
     %fieldnames=&Apache::lonmeta::fieldnames();
 
-# ------------------------------------- read in machine configuration variables
+# --------------------------------------------------------------- get icon path
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    my $domain  = $r->dir_config('lonDefDomain');
-    my $role    = $r->dir_config('lonRole');
-    my $loadlim = $r->dir_config('lonLoadLim');
-    my $servadm = $r->dir_config('lonAdmEMail');
-    my $sysadm  = $r->dir_config('lonSysEMail');
-    my $lonhost = $r->dir_config('lonHostID');
-    my $tabdir  = $r->dir_config('lonTabDir');
+    my $defdom = &Apache::lonnet::default_login_domain();
 
-    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
@@ -120,8 +112,8 @@ sub handler {
     my $colspan=''; 
     
     $extrafield='';
-    my $diropendb = 
-	"/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
+    my $diropendb = LONCAPA::tempdir() .
+	"$env{'user.domain'}_$env{'user.name'}_sel_res.db";
     %hash = ();
     {
 	my %dbfile;
@@ -135,6 +127,11 @@ sub handler {
 	    untie(%dbfile);
 	}
     }
+# - Evaluate actions from previous page (both cumulatively and chronologically)
+        if ($env{'form.catalogmode'} eq 'import' || $hash{'form.catalogmode'} eq 'import') {
+	    &Apache::groupsort::update_actions_hash(\%hash);
+	}
+    
     {
   #Hijack lonindexer to verify a title and be close down.
    if ($env{'form.launch'} eq '2') {
@@ -160,6 +157,8 @@ sub handler {
 ENDSUBM
        $r->print(&Apache::loncommon::start_page(undef,$js,
 						{'only_body'   =>1,
+                                                 'add_modal' => 1,
+                                                 'add_wishlist' => 1,
 						 'add_entries' =>
 						     {'onload' => "load();"},}
 						).
@@ -172,28 +171,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
@@ -269,6 +270,9 @@ END
 function select_data(url) {
    var location = "/res/?launch=2&form=$form&element=$element&titleelement=$titleelement&acts=" + url;
    window.location=location;
+   if (window.opener.document.forms["$form"].elements["$element"].value != url) {
+       window.opener.unClean();
+   }
 }
 function select_group() {
     window.location="$location"+document.forms.fileattr.acts.value;
@@ -311,10 +315,8 @@ function select_group() {
 
 function changeURL(val) {
     if (window.opener.document) {
-        var elementname  = "$element"+"_value";
-        var checkboxname = "$element"+"_setparmval";
+        var elementname  = "$element";
 	window.opener.document.forms["$form"].elements[elementname].value=val;
-        window.opener.document.forms["$form"].elements[checkboxname].checked=true;
     } else {
 	    alert("The file you selected is: "+val);
     }
@@ -351,7 +353,11 @@ END
         
 	my $js = <<"ENDHEADER";
 <script type="text/javascript">
-$catalogmodefunctions
+// <![CDATA[
+$catalogmodefunctions;
+function update_only(field) {
+    alert(field.name);
+}
 function checkAll() {
     var numForms = document.forms.length;
     for (i=0;i<numForms;i++) {
@@ -378,6 +384,7 @@ function uncheckAll() {
         }
     }
 }
+
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
     var xpos = (screen.width-w)/2;
     xpos = (xpos < 0) ? '0' : xpos;
@@ -389,23 +396,44 @@ function openWindow(url, wdwName, w, h,
     var newWin = window.open(url, wdwName, options);
     newWin.focus();
 }
+
 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,}));
-# - Evaluate actions from previous page (both cumulatively and chronologically)
-        if ($env{'form.catalogmode'} eq 'import') {
-	    &Apache::groupsort::update_actions_hash(\%hash);
+
+        if ($env{'form.catalogmode'}) {
+            # "Popup mode"
+            $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+                                                     {'only_body' => 1, 'add_wishlist'=>1, 'add_modal' =>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/'.$headerdom.'/?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'};
+	} 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<=16; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($env{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
@@ -413,79 +441,132 @@ 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;
 	    }
 	}
 
+        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} = &mt($cat);
+            push(@select_form_order,$types);
+        }
+        $select_file_categories{'select_form_order'} = \@select_form_order;
+        my $onchange = 'this.form.submit();';
+        my $type_element=
+            &Apache::loncommon::select_form(
+                $typeselect,
+                'only',
+                \%select_file_categories,$onchange);
+        my $type_selector = '<label>'.&mt('File Type Displayed: [_1]',
+                                          $type_element).'</label>';
+
 # ------------------------------- output state of file attributes to be showing
 #                                 All versions has to the last item
 #                                 since it does not take an extra col
 	my %lt=&Apache::lonlocal::texthash(
-					   'ti' => 'Title',
-					   'si' => 'Size',
-					   'la' => 'Last access',
-					   'lm' => 'Last modified',
-					   'st' => 'Statistics',
-					   'au' => 'Author',
-					   'kw' => 'Keywords',
-					   'ln' => 'Language',
-					   'sa' => 'Source Available',
-					   'sr' => 'Show resource',
-					   'li' => 'Linked/Related Resources',
 					   'av' => 'All versions',
-					   'ud' => 'Update Display'
+					   'ud' => 'Update Display',
+					   'pr' => 'Problems',
+					   'gr' => 'Graphics',
+					   '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>
-<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>
-</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>
-</tr>
+        my @disp_order = ('0','4','5','6','13','1','2','3','10','14','8','11','7','12','15','16');
+        my %disp_options = &Apache::lonlocal::texthash (
+                              0  => 'Title',
+                              4  => 'Author',
+                              5  => 'Keywords',
+                              6  => 'Language',
+                              13 => 'Notes',
+                              1  => 'Size',
+                              2  => 'Last access',
+                              3  => 'Last modified',
+                              10 => 'Source Available',
+                              14 => 'Abstract',
+                              8  => 'Statistics',
+                              11 => 'Linked/Related Resources',
+                              7  => 'Show resource',
+                              12 => 'Subject',
+                              15 => 'Grade Level',
+                              16 => 'Standards',
+                           );
+        my $cell = 0;
+        my $numinrow = 4;
+	$r->print('
+<form method="post" name="fileattr" action="'.$uri.'" enctype="application/x-www-form-urlencoded">
+<fieldset>
+<legend>'.$lt{'hd'}.'</legend>
+<table style=" border-collapse: collapse; border-style: none;">'."\n");
+        foreach my $item (@disp_order) {
+            my $style = 'padding-left: 12px; padding-right: 8px;';
+            if ($cell%$numinrow == 0) {
+                $r->print('<tr>');
+            }
+            $cell ++;
+            if ($cell > 3 * $numinrow) {
+                $style .= ' padding-bottom: 6px;'; 
+            }
+            if (defined($disp_options{$item})) {
+                $r->print('<td style="'.$style.'"><span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="attr'.$item.'" value="1" '.
+                          $attrchk[$item].' onclick="this.form.submit();" /> '.$disp_options{$item}.
+                          '</label></span></td>'."\n");
+            }
+            if ($cell > 1 && $cell%$numinrow == 0) {
+                $r->print('</tr>');
+            }
+        }
+        $r->print(<<END);
 <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>&nbsp;</td>
+<td style="font-style: italic; border-top: 1px solid black; padding-top: 6px"> 
+<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>
+</td>
+<td colspan="3" style="padding-left:8px; padding-top: 4px; font-style: italic; border-top: 1px solid black; padding-top: 8px">$type_selector</td>
 </tr>
 </table>
 <input type="hidden" name="attrs" value="1" />
+</fieldset>
 <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];
 	$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 directory').'</a></span>');
 	}
 	$r->print('</form>');
 # ------------------------------------------------------ Remember where we were
@@ -493,44 +574,57 @@ 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></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) {
+	foreach (keys(%hash)) {
 	    if ($_ =~ /^diropen_status_/) {
 		my $key = $_;
 		$key =~ s/^diropen_status_//;
@@ -571,21 +665,19 @@ END
 	    pop @uri_com;
 	    my $upone = join('/',@uri_com);
 	    my @list = qw (0);
-	    &display_line ($r,'opened',$upone.'&viewOneUp',0,$upone,@list);
+	    &display_line ($r,$defdom,'opened',$upone.'&viewOneUp',0,$upone,@list);
 	    $indent = 1;
 	}
 
 # -------- recursively go through all the directories and output as appropriate
-	&scanDir ($r,$toplevel,$indent,\%hash);
-	
+	&scanDir ($r,$toplevel,$indent,\%hash,$defdom);
 
 # -------------------------------------------------------------- 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");
@@ -606,7 +698,7 @@ END
 
 # ----------------------------------------------- recursive scan of a directory
 sub scanDir {
-    my ($r,$startdir,$indent,$hashref)=@_;
+    my ($r,$startdir,$indent,$hashref,$defdom)=@_;
     my $c = $r->connection();
     my ($compuri,$curdir);
     my $dirptr=16384;
@@ -618,10 +710,23 @@ sub scanDir {
         return if ($c->aborted());
 	#This is a kludge, sorry aboot this
 	my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
-	next if($strip =~ /.*\.meta$/ | $obs eq '1');
+	next if (($strip =~ /\.meta$/) || ($obs));
+        if ($dom ne 'domain') {
+            my ($udom,$uname);
+            if ($dom eq 'user') {
+                ($udom) = ($startdir =~ m{^/res/($match_domain)});
+                $uname = $strip;
+            } else {
+                ($udom,$uname) = ($startdir =~ m{^/res/($match_domain)/($match_courseid)});
+            }
+            if ($udom ne '' && $uname ne '') {
+                # Don't display "course author" directory.
+                next if (&Apache::lonnet::is_course($udom.'_'.$uname));
+            }
+        }
 	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;
@@ -649,8 +754,8 @@ sub scanDir {
 		}
 	    }
 	}
-	&display_line($r,$diropen,$line,$indent,$curdir,$hashref,@list);
-	&scanDir ($r,$compuri,$indent) if $diropen eq 'opened';
+	&display_line($r,$defdom,$diropen,$line,$indent,$curdir,$hashref,@list);
+	&scanDir ($r,$compuri,$indent,undef,$defdom) if $diropen eq 'opened';
     }
     $indent--;
 }
@@ -659,9 +764,11 @@ sub scanDir {
 sub get_list {
     my ($r,$uri)=@_;
     my @list=();
+    my $listerror;
+    
     (my $luri = $uri) =~ s/\//_/g;
     if ($env{'form.updatedisplay'}) {
-	foreach (keys %hash) {
+	foreach (keys(%hash)) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);
 	}
@@ -682,10 +789,20 @@ sub get_list {
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {
 # is really a directory
-	@list = &Apache::lonnet::dirlist($uri);
+	(my $listref,$listerror) = &Apache::lonnet::dirlist($uri);
+        if (ref($listref) eq 'ARRAY') {
+            @list = @{$listref};
+        }
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
 	$hash{'dirlist_timestamp_files_'.$luri} = time;
     }
+#Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)
+    if (($listerror eq 'no_such_dir') || ($listerror eq 'no_such_host') || ($listerror eq 'no_host')) { 
+        $r->print("<p class='LC_info'>" . &mt("Directory does not exist."). "</p>");
+    } elsif ($listerror eq 'con_lost') {
+        $r->print("<p class='LC_info'>" . &mt("Directory temporarily not accessible."). "</p>");
+    }
+
     return @list=&match_ext($r,@list);    
 }
 
@@ -768,7 +885,7 @@ sub match_ext {
 
 # ------------------------------- displays one line in appropriate table format
 sub display_line {
-    my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
+    my ($r,$defdom,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
     my (@pathfn, $fndir);
 # there could be relative paths (files actually belonging into this directory)
 # or absolute paths (for example, from sequences)
@@ -782,7 +899,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);
@@ -791,10 +908,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);
@@ -809,106 +927,144 @@ 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></td><td>$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])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); }
 
-    if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }
+    if (($filecom[1] eq 'domain') && ($defdom ne $listname)) {
+        unless (&Apache::lonnet::will_trust('shared',$listname,$defdom)) {
+            return OK;   
+        }
+        unless (&Apache::lonnet::will_trust('content',$defdom,$listname)) {
+            return OK;
+        }
+    }
 
 # 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></td><td>$tabtag");
+         $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
 
 # display user directory
     }
+
     if ($filecom[1] eq 'user') {
+        my $domain=(split(m|/|,$startdir))[2];
+        if ($defdom ne $domain) {
+            unless (&Apache::lonnet::will_trust('shared',$domain,$defdom)) {
+                return OK;
+            }
+            unless (&Apache::lonnet::will_trust('content',$defdom,$domain)) {
+                return OK;
+            }
+        }
 	# $r->print("<tr valign=$valign bgcolor=\"$fileclr\">$extrafield");
 	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);
+        my $quotable_startdir = &Apache::loncommon::escape_single($startdir);
+        my $quotable_listname = &Apache::loncommon::escape_single($listname);
+
 	$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) "); }
+# Wishlistlink
+        $r->print('</form></td><td><a href="javascript:;" '.
+                  'title="'.&mt('Save a link for this folder in your personal Stored Links repository').'" '.
+                  'onclick="set_wishlistlink('."'$plainname','$quotable_startdir$quotable_listname"."/'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a>'.$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);
@@ -916,17 +1072,17 @@ 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">');
 	} 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></td><td nowrap='nowrap' valign='top'>");
+	    $r->print('</form></td><td class="LC_middle">');
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$title;
 	    if (!$hash{"pre_${fnum}_title"}) {
@@ -941,66 +1097,63 @@ 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);
+        my $quotable_startdir = Apache::loncommon::escape_single($startdir);
+        my $quotable_listname = &Apache::loncommon::escape_single($listname);
 
-	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
-		   "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"".
-		   " target=\"_self\">$listname</a> ");
+	$r->print (" <a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">$listname</a> ");
 	$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
 	&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>) ");
+	$r->print (" (<a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">".&mt('metadata')."</a>) ");
 # Close form to open/close sequence
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
 	$r->print("</td>\n");
+# Wishlistlink
+        $r->print('<td><a href="javascript:;" title="'.&mt('Save a link for this resource in your personal Stored Links repository').'" '.
+                  'onclick="set_wishlistlink('."'".&Apache::lonnet::gettitle($filelink).
+                  "','$quotable_startdir$quotable_listname'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
 	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) {
 	    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) {
@@ -1009,7 +1162,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');
@@ -1021,17 +1173,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");
 
 	}
@@ -1044,7 +1192,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");
 	    }
@@ -1054,57 +1202,97 @@ 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 $quotable_startdir = &Apache::loncommon::escape_single($startdir);
+        my $quotable_listname = &Apache::loncommon::escape_single($listname);
+
+        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>");
+# Wishlistlink
+        $r->print('</td><td><a href="javascript:;" '.
+                  'title="'.&mt('Save a link for this folder in Stored Links').'" '.
+                  'onclick="set_wishlistlink('."'$listname','$quotable_startdir$quotable_listname"."/'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
 # Attributes
 	my $filelink = $startdir.$filecom[0].'/default';
 
@@ -1113,14 +1301,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) {
@@ -1140,19 +1328,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());
     }
 
 }
@@ -1162,15 +1381,18 @@ sub coursecontext {
     my $filesymb=&Apache::lonnet::symbread($filelink);
     if ($filesymb) {
 	my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);
-	$r->print(&mt('Already in this course:<br />[_1] in folder/map [_2].<br />',
-	      &Apache::lonnet::gettitle($resource),
-	      &Apache::lonnet::gettitle($map)));
+	$r->print(
+            &mt('Already in this course:').'<br />'
+           .&mt('[_1] in folder/map [_2]',
+                    &Apache::lonnet::gettitle($resource),
+                    &Apache::lonnet::gettitle($map))
+           .'<br />');
     }
 }
 
 sub showpreview {
     my ($filelink)=@_;
-    if ($filelink=~m-^(/ext/|http://)-) {
+    if ($filelink=~m-^(/ext/|https?://)-) {
 	return &mt('External Resource, preview not enabled');
     }
     my ($curfext)=($filelink=~/\.(\w+)$/);
@@ -1201,7 +1423,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)/}) {
@@ -1232,7 +1453,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.'" />'.
@@ -1251,7 +1472,7 @@ sub start_fresh_session {
     delete $hash->{'form.element'};
     delete $hash->{'form.omit'};
     delete $hash->{'form.only'};
-    foreach (keys %{$hash}) {
+    foreach (keys(%{$hash})) {
         delete $hash->{$_} if (/^(pre_|store)/);
     }
 }
@@ -1302,18 +1523,6 @@ This module enables a scheme of browsing
 This is part of the LearningOnline Network with CAPA project
 described at http://www.lon-capa.org.
 
-=head1 BEGIN SUBROUTINE
-
-This routine is only run once after compilation.
-
-=over 4
-
-=item *
-
-Initializes %language hash table.
-
-=back
-
 =head1 HANDLER SUBROUTINE
 
 This routine is called by Apache and mod_perl.