--- loncom/publisher/lonpubdir.pm	2003/02/03 18:03:53	1.30
+++ loncom/publisher/lonpubdir.pm	2003/07/05 10:07:12	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# (Publication Handler
+# Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.30 2003/02/03 18:03:53 harris41 Exp $
+# $Id: lonpubdir.pm,v 1.35 2003/07/05 10:07:12 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,13 +69,13 @@ sub handler {
              $fn,$r->dir_config('lonDefDomain')); 
   unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.
-         ' trying to publish file '.$ENV{'form.filename'}.
+         ' trying to list directory '.$ENV{'form.filename'}.
          ' ('.$fn.') - not authorized', 
          $r->filename); 
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  # Remove trailing / from direcgtory name.
+  # Remove trailing / from directory name.
 
   $fn=~s/\/$//;
 
@@ -147,7 +147,9 @@ sub getEffectiveUrl {
 	#   Replace the ~username of the URL with /home/username/public_html
 	#   so that we don't have to worry about ~ expansion internally.
 	#
-	$fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+	$fn=~s/^http\:\/\/[^\/]+\///;
+        $fn=~s/^\///;
+        $fn=~s/\~(\w+)/\/home\/$1\/public_html/;
 	
 	#  Remove trailing / strings (?) 
 	
@@ -202,15 +204,18 @@ sub startpage {
 ENDPUBDIRSCRIPT
 
     $r->print('<h1>Construction Space Directory <tt>'.
-	      $thisdisfn.'/</tt></h1>'.$pubdirscript.
+	      $thisdisfn.'/</tt></h1>'.
+	      '<script type="text/javascript">top.document.title = \''.
+	      $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.
@@ -305,13 +310,20 @@ sub putresource {
 	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
     }
+    my $editlink='';
+    if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/) {
+	$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>)';
+    }
     $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>'.
+               $filename.'</a>'.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
 	      '<td>'.$status.'</td>'.
@@ -350,7 +362,7 @@ __END__
 
 =head1 NAME
 
-Apache::lonpubdir - Publication Handler for Directories
+Apache::lonpubdir - Construction space directory lister
 
 =head1 SYNOPSIS