--- loncom/publisher/lonpubdir.pm	2004/01/03 15:11:37	1.53
+++ loncom/publisher/lonpubdir.pm	2004/01/05 22:13:16	1.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.53 2004/01/03 15:11:37 www Exp $
+# $Id: lonpubdir.pm,v 1.56 2004/01/05 22:13:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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,12 +271,12 @@ 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/;
+	$construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
 	&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
        				 $construct.'/'.$dirname.'/default.meta'
 								 ));
@@ -281,8 +284,8 @@ sub putdirectory {
 		  '<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><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>'.
@@ -308,7 +311,8 @@ sub putresource {
 	    $ratime,$rmtime,$rctime,
 	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
 	if ($rmtime>=$cmtime) {
-	    $status=&mt('Published');
+	    $status=&mt('Published').'<br />'.
+		&mt(&getCopyRightString($targetdir.'/'.$filename));
             $bgcolor='#CCFF88';
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
 		$status=&mt('Obsolete');
@@ -316,12 +320,13 @@ sub putresource {
 	    }
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.
 		'.meta" target=cat>'.
-		getTitleString($targetdir.'/'.$filename, 'title').'</a>';
+		&getTitleString($targetdir.'/'.$filename).'</a>';
 	} else {
-	    $status=&mt('Modified');
+	    $status=&mt('Modified').'<br />'.
+		&mt(&getCopyRightString($targetdir.'/'.$filename));
             $bgcolor='#FFFF77';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
-		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.
 		    $thisdisfn.'/'.$filename.
@@ -336,11 +341,11 @@ sub putresource {
     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=/~'.
@@ -352,9 +357,9 @@ sub putresource {
 	      '<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>'.