--- loncom/publisher/lonpubdir.pm	2003/12/29 19:01:27	1.49
+++ loncom/publisher/lonpubdir.pm	2004/01/03 15:57:11	1.54
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.49 2003/12/29 19:01:27 www Exp $
+# $Id: lonpubdir.pm,v 1.54 2004/01/03 15:57:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::loncacc;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonmsg;
 
 sub handler {
 
@@ -85,14 +86,14 @@ sub handler {
   my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory.
   my $linkdir='/priv/'.$uname.$thisdisfn;      # Full URL name of constr space.
 
-
+  my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
 
   &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.
   
-  # Start off the diretory table.
+  # 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>');
@@ -111,10 +112,10 @@ sub handler {
      my $extension='';
      if ($filename=~/\.(\w+)$/) { $extension=$1; }
      if ($cmode&$dirptr) {
-	 putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime);
+	 putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs);
      } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
 	 putresource($r, $uname, $filename, $thisdisfn, $resdir, 
-		     $targetdir, $linkdir, $cmtime);
+		     $targetdir, $linkdir, $cmtime,\%bombs);
      } else {
 	# "hidden" extension and not a directory, so hide it away.
      }
@@ -222,7 +223,7 @@ ENDPUBDIRSCRIPT
 		  '</h3>');
     }
     $r->print(
-       &Apache::lonhtmlcommon::crumbs($thisdisfn.'/','_top','/priv/'.$uname));
+       &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv').'<br />');
 }
 
 #
@@ -255,7 +256,7 @@ sub getTitleString {
 #      modtime - Encoded modification time.
 # 
 sub putdirectory {
-    my ($r, $reqfile, $here, $dirname, $modtime) = @_;
+    my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs) = @_;
   
     # construct the display filename: the directory name unless ..:
     
@@ -265,12 +266,26 @@ sub putdirectory {
     }
     unless (( ($dirname eq '..') && ($reqfile eq '')) ||
 	    ($dirname eq '.')) {
+	my $kaputt=0;
+	foreach (keys %{$bombs}) {
+	    if ($_=~/^$resdir\/$disfilename\//) { $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>&nbsp;</td>'.
-		  '<td>&nbsp;</td>'.
+		  '<td><font size="+1" face="arial"><a href="'.$here.'/'.$dirname.'/" target="_top">'.
+		  $disfilename.'</a></font></td>'.
+		        '<td colspan="2">'.($kaputt?'<img src="/adm/lonMisc/bomb.gif" />':'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
+		  $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
+		  $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
 		  '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
 		  "</tr>\n");
     }	
@@ -282,10 +297,10 @@ sub putdirectory {
 sub putresource {
     my ($r, $uname, $filename, $thisdisfn, 
 	$resdir, $targetdir, $linkdir,
-	$cmtime) = @_;
+	$cmtime,$bombs) = @_;
 
     my $status=&mt('Unpublished');
-    my $bgcolor='#FFCCCC';
+    my $bgcolor='#FFAA99';
     my $title='&nbsp;';
     if (-e $resdir.'/'.$filename) {
 	my ($rdev,$rino,$rmode,$rnlink,
@@ -294,7 +309,7 @@ sub putresource {
 	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
 	if ($rmtime>=$cmtime) {
 	    $status=&mt('Published');
-            $bgcolor='#CCFFCC';
+            $bgcolor='#CCFF88';
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
 		$status=&mt('Obsolete');
                 $bgcolor='#AAAAAA';
@@ -304,7 +319,7 @@ sub putresource {
 		getTitleString($targetdir.'/'.$filename, 'title').'</a>';
 	} else {
 	    $status=&mt('Modified');
-            $bgcolor='#FFFFCC';
+            $bgcolor='#FFFF77';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
 		getTitleString($targetdir.'/'.$filename,'title').'</a>';
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
@@ -312,30 +327,34 @@ sub putresource {
 		    $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 size="+1" face="arial">'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
-               $filename.'</a>'.$editlink2.$editlink.
+               $filename.'</a></font>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
 	      '<td>'.$status.'</td>'.