--- loncom/publisher/lonpubdir.pm	2002/02/09 01:38:54	1.23
+++ loncom/publisher/lonpubdir.pm	2003/05/16 20:47:08	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonpubdir.pm,v 1.23 2002/02/09 01:38:54 foxr Exp $
+# $Id: lonpubdir.pm,v 1.31 2003/05/16 20:47:08 albertel 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
 #
 ###
@@ -95,11 +94,11 @@ sub handler {
 
   my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn; # Resource directory
   my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory.
-  my $linkdir='/~'.$uname.$thisdisfn;        # Full URL name of constr space.
+  my $linkdir='/priv/'.$uname.$thisdisfn;      # Full URL name of constr space.
 
 
 
-  startpage($r, $uname, $udom, $thisdisfn);	# Put out the start of page.
+  &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.
   
   # Start off the diretory table.
 
@@ -153,8 +152,16 @@ sub getEffectiveUrl {
 	#  Remove trailing / strings (?) 
 	
 	$fn=~s/\/[^\/]+$//;
-    } else {			# If no form is defined, use request filename.
-	$fn=$r->filename();
+    } else {
+	#   If no form is defined, use request filename.
+	$fn = $r->filename();
+	my $lonDocRoot=$r->dir_config('lonDocRoot');
+	if ( $fn =~ /$lonDocRoot/ ) {
+	    #internal authentication, needs fixup.
+	    $fn = $r->uri(); # non users do not get the full path request
+                             # through SCRIPT_FILENAME
+	    $fn=~s|^/~(\w+)|/home/$1/public_html|;
+	}
     }
     return $fn;
 }
@@ -168,6 +175,7 @@ sub getEffectiveUrl {
 #      $uname - User name.
 #      $udom  - Domain name the user is logged in under.
 #      $thisdisfn - Displayable version of the filename.
+
 sub startpage {
     my ($r, $uname, $udom, $thisdisfn) = @_;
     
@@ -176,11 +184,36 @@ sub startpage {
     
     $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
     
-    $r->print('<body bgcolor="#FFFFFF"><img align=right '.
-	      'src=/adm/lonIcons/lonlogos.gif>');
-    
+    $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>'.
+	      '<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="/~'.
+               $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="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.
@@ -228,14 +261,14 @@ sub putdirectory {
     }
     unless (( ($dirname eq '..') && ($reqfile eq '')) ||
 	    ($dirname eq '.')) {
-	$r->print('<tr>'.
-		  '<td>Click to cwd</td>'.
-		  '<td><a href="'.$here.'/'.$dirname.'/">'.
+	$r->print('<tr bgcolor="#CCCCFF">'.
+		  '<td>Go to ...</td>'.
+		  '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.
 		  $disfilename.'</a></td>'.
 		        '<td>&nbsp;</td>'.
 		  '<td>&nbsp;</td>'.
 		  '<td>'.localtime($modtime).'</td>'.
-		  '</tr>');
+		  "</tr>\n");
     }	
     return OK;
 }
@@ -248,6 +281,7 @@ sub putresource {
 	$cmtime) = @_;
 
     my $status='Unpublished';
+    my $bgcolor='#FFCCCC';
     my $title='&nbsp;';
     if (-e $resdir.'/'.$filename) {
 	my ($rdev,$rino,$rmode,$rnlink,
@@ -256,33 +290,36 @@ sub putresource {
 	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
 	if ($rmtime>=$cmtime) {
 	    $status='Published';
+            $bgcolor='#CCFFCC';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.
 		'.meta" target=cat>'.
 		getTitleString($targetdir.'/'.$filename, 'title').'</a>';
 	} else {
 	    $status='Modified';
+            $bgcolor='#FFFFCC';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
-		&Apache::lonnet::metadata($targetdir.'/'.$filename,'title').'</a>';
+		getTitleString($targetdir.'/'.$filename,'title').'</a>';
 	    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.
 	    $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
     }
-    $r->print('<tr>'.
+    $r->print('<tr bgcolor="'.$bgcolor.'">'.
 	      '<td><a target="_parent" href="/adm/publish?filename=/~'.
 	      $uname.$thisdisfn.'/'.$filename.'">'.'Publish</a>'.
 	      '</td>'.
 	      '<td>'.
-	      '<a href="'.$linkdir.'/'.$filename.'">'.$filename.'</a>'.
+	      '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
+               $filename.'</a>'.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
 	      '<td>'.$status.'</td>'.
 	      '<td>'.localtime($cmtime).'</td>'.
-	      '</tr>');
+	      "</tr>\n");
     return OK;
 }
 #
