--- loncom/publisher/lonpubdir.pm	2004/01/04 00:50:11	1.55
+++ loncom/publisher/lonpubdir.pm	2004/06/07 22:34:12	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.55 2004/01/04 00:50:11 www Exp $
+# $Id: lonpubdir.pm,v 1.60 2004/06/07 22:34:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -222,8 +222,15 @@ ENDPUBDIRSCRIPT
 	$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
 		  '</h3>');
     }
-    $r->print(
-       &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv').'<br />');
+    my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/';
+    $formaction=~s/\/+/\//g;
+    $r->print('<form name="dirs" method="post" action="'.$formaction
+	      .'" target="_top">'.
+      &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv').
+      &Apache::lonhtmlcommon::select_recent('construct','recent',
+	         'this.form.action=this.form.recent.value;this.form.submit()').
+	      '</form>');
+    &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
 }
 
 #
@@ -271,12 +278,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'
 								 ));
@@ -284,9 +291,9 @@ sub putdirectory {
 		  '<td><img src="'.
 		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
 		  '<td>'.&mt('Go to ...').'</td>'.
-		  '<td><font size="+1" face="arial"><a href="'.$here.'/'.$dirname.'/" target="_top">'.
+		  '<td><font 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>'.
+		        '<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>'.
@@ -305,15 +312,17 @@ sub putresource {
     my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';
     my $title='&nbsp;';
+    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';
+	    $bgcolor='#CCFF88';
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
 		$status=&mt('Obsolete');
                 $bgcolor='#AAAAAA';
@@ -328,7 +337,7 @@ sub putresource {
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
 		&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>';
 	    }
@@ -355,9 +364,9 @@ 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 size="+1" face="arial">'.
+	      '<td><font face="arial">'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
                $filename.'</a></font>'.$editlink2.$editlink.
 	      '</td>'.