--- loncom/publisher/lonpubdir.pm	2004/01/29 00:44:43	1.59
+++ loncom/publisher/lonpubdir.pm	2004/07/02 09:41:07	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.59 2004/01/29 00:44:43 www Exp $
+# $Id: lonpubdir.pm,v 1.62 2004/07/02 09:41:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -256,6 +256,11 @@ sub getCopyRightString {
     my $fullname = shift;
     return &Apache::lonnet::metadata($fullname, 'copyright');
 }
+
+sub getSourceRightString {
+    my $fullname = shift;
+    return &Apache::lonnet::metadata($fullname, 'sourceavail');
+}
 #
 #  Put out a directory table row:
 #    putdirectory(r, base, here, dirname, modtime)
@@ -312,15 +317,18 @@ sub putresource {
     my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';
     my $title=' ';
+    my $publish_button=&mt('Publish');
     if (-e $resdir.'/'.$filename) {
 	my ($rdev,$rino,$rmode,$rnlink,
 	    $ruid,$rgid,$rrdev,$rsize,
 	    $ratime,$rmtime,$rctime,
 	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+	$publish_button=&mt('Re-Publish');
 	if ($rmtime>=$cmtime) {
 	    $status=&mt('Published').'<br />'.
-		&mt(&getCopyRightString($targetdir.'/'.$filename));
-            $bgcolor='#CCFF88';
+		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
+		&mt(&getSourceRightString($targetdir.'/'.$filename));
+	    $bgcolor='#CCFF88';
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
 		$status=&mt('Obsolete');
                 $bgcolor='#AAAAAA';
@@ -330,7 +338,8 @@ sub putresource {
 		&getTitleString($targetdir.'/'.$filename).'</a>';
 	} else {
 	    $status=&mt('Modified').'<br />'.
-		&mt(&getCopyRightString($targetdir.'/'.$filename));
+		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
+		&mt(&getSourceRightString($targetdir.'/'.$filename));
             $bgcolor='#FFFF77';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
 		&getTitleString($targetdir.'/'.$filename).'</a>';
@@ -343,7 +352,7 @@ sub putresource {
 	$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>';
+	    $thisdisfn.'/'.$filename.'" target="_top">'.&mt('Retrieve').'</a>';
     }
     my $editlink='';
     my $editlink2='';
@@ -362,7 +371,7 @@ sub putresource {
 	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
 		      '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
 	      '<td><a target="_parent" href="/adm/publish?filename=/~'.
-	      $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.
+	      $uname.$thisdisfn.'/'.$filename.'">'.$publish_button.'</a>'.
 	      '</td>'.
 	      '<td><font face="arial">'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.