--- loncom/publisher/lonpubdir.pm	2003/06/16 21:32:43	1.33
+++ loncom/publisher/lonpubdir.pm	2003/09/21 03:30:02	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.33 2003/06/16 21:32:43 www Exp $
+# $Id: lonpubdir.pm,v 1.38 2003/09/21 03:30:02 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,6 +165,7 @@ sub getEffectiveUrl {
 	    $fn=~s|^/~(\w+)|/home/$1/public_html|;
 	}
     }
+    $fn=~s/\/+/\//g;
     return $fn;
 }
 #
@@ -189,6 +190,12 @@ sub startpage {
     $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1));
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script>
+// Store directory location for menu bar to find
+
+parent.lastknownpriv='/~$uname/$thisdisfn/';
+
+// Confirmation dialogues
+
     function pubdir(theform) {
 	if (confirm('Publish complete directory?')) {
 	    theform.submit();
@@ -209,13 +216,13 @@ ENDPUBDIRSCRIPT
 	      $thisdisfn.'/ - LON-CAPA Construction Space\';</script>'.
 	      $pubdirscript.
               '<form method="post" action="/adm/publish" target="_parent">'.
-              '<input type="hidden" name="filename" value="/~'.
+              '<table><tr><td><input type="hidden" name="filename" value="/~'.
                $uname.$thisdisfn.'/" />'.
               '<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="pubrecdir(this.form);" value="Publish Directory and Sub Directories" /></td><td>'.
 '<input type="button" onClick="window.location='."'/~".
-               $uname.$thisdisfn."/default.meta'".'" value="Directory Catalog Information" /></form>');
+               $uname.$thisdisfn."/default.meta'".'" value="Edit Directory Catalog Information" /></td></tr><tr><td><input type="checkbox" name="forcerepub" /> Force publication of unmodified files.</td><td>&nbsp;</td></tr></table></form>');
     
     if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
 	$r->print('<h3>Co-Author: '.$uname.' at '.$udom.
@@ -311,16 +318,21 @@ sub putresource {
 	    $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
     }
     my $editlink='';
-    if ($filename=~/\.(xml|html|htm|xhtml|xhtm|problem|exam|quiz|assess|survey|form|library)$/) {
+    my $editlink2='';
+    if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
 	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">Edit</a>)';
     }
+    if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">EditXML</a>)';
+	$editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">Edit</a>)';
+    }
     $r->print('<tr bgcolor="'.$bgcolor.'">'.
 	      '<td><a target="_parent" href="/adm/publish?filename=/~'.
 	      $uname.$thisdisfn.'/'.$filename.'">'.'Publish</a>'.
 	      '</td>'.
 	      '<td>'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
-               $filename.'</a>'.$editlink.
+               $filename.'</a>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
 	      '<td>'.$status.'</td>'.