--- loncom/publisher/lonpubdir.pm	2003/12/30 22:19:18	1.50
+++ loncom/publisher/lonpubdir.pm	2004/01/15 20:22:47	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.50 2003/12/30 22:19:18 www Exp $
+# $Id: lonpubdir.pm,v 1.58 2004/01/15 20:22:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,8 +92,8 @@ sub handler {
   
   # Start off the directory table.
 
-  $r->print('<table border=2>'.
-	    '<tr><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.
+  $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+	    '<tr><th>&nbsp;</th><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.
 	    &mt('Title').'</th>'.
 	    '<th>'.&mt('Status').'</th><th>'.&mt('Last Modified').
 	    '</th></tr>');
@@ -223,7 +223,7 @@ ENDPUBDIRSCRIPT
 		  '</h3>');
     }
     $r->print(
-       &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv'));
+       &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv').'<br />');
 }
 
 #
@@ -245,7 +245,10 @@ sub getTitleString {
     return $title;
 }
 
-
+sub getCopyRightString {
+    my $fullname = shift;
+    return &Apache::lonnet::metadata($fullname, 'copyright');
+}
 #
 #  Put out a directory table row:
 #    putdirectory(r, base, here, dirname, modtime)
@@ -268,14 +271,24 @@ sub putdirectory {
 	    ($dirname eq '.')) {
 	my $kaputt=0;
 	foreach (keys %{$bombs}) {
-	    if ($_=~/^$resdir\/$disfilename\//) { $kaputt=1; last; }
+	    if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
 	}
+	%Apache::lonpublisher::metadatafields=();
+	%Apache::lonpublisher::metadatakeys=();
+	my $construct=$here;
+	$construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
+	&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
+       				 $construct.'/'.$dirname.'/default.meta'
+								 ));
 	$r->print('<tr bgcolor="#CCCCFF">'.
+		  '<td><img src="'.
+		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
 		  '<td>'.&mt('Go to ...').'</td>'.
-		  '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.
-		  $disfilename.'</a></td>'.
-		        '<td>'.($kaputt?'<img src="/adm/lonMisc/bomb.gif" />':'&nbsp;').'</td>'.
-		  '<td>&nbsp;</td>'.
+		  '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_top">'.
+		  $disfilename.'</a></font></td>'.
+		        '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
+		  $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
+		  $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
 		  '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
 		  "</tr>\n");
     }	
@@ -290,7 +303,7 @@ sub putresource {
 	$cmtime,$bombs) = @_;
 
     my $status=&mt('Unpublished');
-    my $bgcolor='#FFCCCC';
+    my $bgcolor='#FFAA99';
     my $title='&nbsp;';
     if (-e $resdir.'/'.$filename) {
 	my ($rdev,$rino,$rmode,$rnlink,
@@ -298,51 +311,55 @@ sub putresource {
 	    $ratime,$rmtime,$rctime,
 	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
 	if ($rmtime>=$cmtime) {
-	    $status=&mt('Published');
-            $bgcolor='#CCFFCC';
+	    $status=&mt('Published').'<br />'.
+		&mt(&getCopyRightString($targetdir.'/'.$filename));
+            $bgcolor='#CCFF88';
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
 		$status=&mt('Obsolete');
                 $bgcolor='#AAAAAA';
 	    }
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.
 		'.meta" target=cat>'.
-		($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':'').
-		getTitleString($targetdir.'/'.$filename, 'title').'</a>';
+		&getTitleString($targetdir.'/'.$filename).'</a>';
 	} else {
-	    $status=&mt('Modified');
-            $bgcolor='#FFFFCC';
+	    $status=&mt('Modified').'<br />'.
+		&mt(&getCopyRightString($targetdir.'/'.$filename));
+            $bgcolor='#FFFF77';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
-		($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':'').
-		getTitleString($targetdir.'/'.$filename,'title').'</a>';
+		&getTitleString($targetdir.'/'.$filename).'</a>';
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
-		$status.='<br><a href="/adm/diff?filename=/~'.$uname.
+		$status.='<br /><a href="/adm/diff?filename=/~'.$uname.
 		    $thisdisfn.'/'.$filename.
 		    '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
 	    }
-	}   
+	}
+	$title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
+	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
 	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</a>';
     }
     my $editlink='';
     my $editlink2='';
     if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
-	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';
+	$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';
     }
     if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
 	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)';
-	$editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';
+	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';
     }
     if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
 	$editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
 	      $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';
     }
     $r->print('<tr bgcolor="'.$bgcolor.'">'.
+	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
+		      '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
 	      '<td><a target="_parent" href="/adm/publish?filename=/~'.
 	      $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.
 	      '</td>'.
-	      '<td>'.
+	      '<td><font face="arial">'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
-               $filename.'</a>'.$editlink2.$editlink.
+               $filename.'</a></font>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
 	      '<td>'.$status.'</td>'.