--- loncom/publisher/lonpubdir.pm	2002/09/16 13:05:49	1.26
+++ loncom/publisher/lonpubdir.pm	2003/02/03 18:03:53	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonpubdir.pm,v 1.26 2002/09/16 13:05:49 www Exp $
+# $Id: lonpubdir.pm,v 1.30 2003/02/03 18:03:53 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,6 @@
 # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)
 # 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer
-# 12/15 Scott Harrison
 # 12/28 Gerd Kortemeyer
 #
 ###
@@ -186,14 +185,32 @@ sub startpage {
     $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
     
     $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1));
-    
+    my $pubdirscript=(<<ENDPUBDIRSCRIPT);
+<script>
+    function pubdir(theform) {
+	if (confirm('Publish complete directory?')) {
+	    theform.submit();
+        }
+    }
+   function pubrecdir(theform) {
+	if (confirm('Publish directory and all subdirectories?')) {
+            theform.pubrec.value='1';
+	    theform.submit();
+        }
+    }
+</script>
+ENDPUBDIRSCRIPT
+
     $r->print('<h1>Construction Space Directory <tt>'.
-	      $thisdisfn.'/</tt></h1>'.
+	      $thisdisfn.'/</tt></h1>'.$pubdirscript.
               '<form method="post" action="/adm/publish" target="_parent">'.
               '<input type="hidden" name="filename" value="/~'.
                $uname.$thisdisfn.'/" />'.
-              '<input type="submit" value="Publish Directory" />'.
-              '<input type="submit" name="pubrec" value="Publish Directory and Sub Directories" /></form>');
+              '<input type="button" onClick="pubdir(this.form);" value="Publish Directory" />'.
+              '<input type="hidden" name="pubrec" value="" />'.
+              '<input type="button" onClick="pubrecdir(this.form);" value="Publish Directory and Sub Directories" />'.
+'<input type="button" onClick="window.location='."'/~".
+               $uname.$thisdisfn."/default.meta'".'" value="Directory Catalog Information" /></form>');
     
     if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
 	$r->print('<h3>Co-Author: '.$uname.' at '.$udom.
@@ -282,7 +299,7 @@ sub putresource {
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
 		$status.='<br><a href="/adm/diff?filename=/~'.$uname.
 		    $thisdisfn.'/'.$filename.
-		    '&versionone=priv" target=cat>Diffs</a>';
+		    '&versiontwo=priv" target=cat>Diffs</a>';
 	    }
 	}   
 	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
