--- loncom/publisher/lonpubdir.pm	2003/05/16 20:47:08	1.31
+++ loncom/publisher/lonpubdir.pm	2003/09/25 22:30:06	1.40
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# (Publication Handler
+# Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.31 2003/05/16 20:47:08 albertel Exp $
+# $Id: lonpubdir.pm,v 1.40 2003/09/25 22:30:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,7 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 use Apache::loncommon();
+use Apache::lonlocal;
 
 sub handler {
 
@@ -69,13 +70,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/\/$//;
 
@@ -103,8 +104,10 @@ sub handler {
   # Start off the diretory table.
 
   $r->print('<table border=2>'.
-	    '<tr><th>Actions</th><th>Name</th><th>Title</th>'.
-	    '<th>Status</th><th>Last Modified</th></tr>');
+	    '<tr><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.
+	    &mt('Title').'</th>'.
+	    '<th>'.&mt('Status').'</th><th>'.&mt('Last Modified').
+	    '</th></tr>');
 
   my $filename;
   my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
@@ -147,7 +150,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 (?) 
 	
@@ -163,6 +168,7 @@ sub getEffectiveUrl {
 	    $fn=~s|^/~(\w+)|/home/$1/public_html|;
 	}
     }
+    $fn=~s/\/+/\//g;
     return $fn;
 }
 #
@@ -179,7 +185,7 @@ sub getEffectiveUrl {
 sub startpage {
     my ($r, $uname, $udom, $thisdisfn) = @_;
     
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     
     $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
@@ -187,6 +193,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();
@@ -201,22 +213,25 @@ sub startpage {
 </script>
 ENDPUBDIRSCRIPT
 
-    $r->print('<h1>Construction Space Directory <tt>'.
+    $r->print('<h1>'.&mt('Construction Space Directory').' <tt>'.
 	      $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="button" onClick="pubdir(this.form);" value="'.
+&mt('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="'.
+&mt('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="'.
+&mt('Edit Directory Catalog Information').'" /></td></tr><tr><td><input type="checkbox" name="forcerepub" /> '.&mt('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.
+	$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
 		  '</h3>');
     }
 }
@@ -235,7 +250,7 @@ sub getTitleString {
     my $title    = &Apache::lonnet::metadata($fullname, 'title');
 
     unless ($title) {
-	$title = "[untitled]";
+	$title = "[".&mt('untitled')."]";
     }
     return $title;
 }
@@ -257,7 +272,7 @@ sub putdirectory {
     
     my $disfilename = $dirname;
     if ($dirname eq '..') {
-	$disfilename = '<i>Parent Directory</i>';
+	$disfilename = '<i>'.&mt('Parent Directory').'</i>';
     }
     unless (( ($dirname eq '..') && ($reqfile eq '')) ||
 	    ($dirname eq '.')) {
@@ -291,6 +306,10 @@ sub putresource {
 	if ($rmtime>=$cmtime) {
 	    $status='Published';
             $bgcolor='#CCFFCC';
+	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
+		$status='Obsolete';
+                $bgcolor='#AAAAAA';
+	    }
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.
 		'.meta" target=cat>'.
 		getTitleString($targetdir.'/'.$filename, 'title').'</a>';
@@ -308,16 +327,25 @@ sub putresource {
 	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
     }
+    my $editlink='';
+    my $editlink2='';
+    if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
+	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';
+    }
+    if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)';
+	$editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';
+    }
     $r->print('<tr bgcolor="'.$bgcolor.'">'.
 	      '<td><a target="_parent" href="/adm/publish?filename=/~'.
-	      $uname.$thisdisfn.'/'.$filename.'">'.'Publish</a>'.
+	      $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.
 	      '</td>'.
 	      '<td>'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
-               $filename.'</a>'.
+               $filename.'</a>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
-	      '<td>'.$status.'</td>'.
+	      '<td>'.&mt($status).'</td>'.
 	      '<td>'.localtime($cmtime).'</td>'.
 	      "</tr>\n");
     return OK;
@@ -353,7 +381,7 @@ __END__
 
 =head1 NAME
 
-Apache::lonpubdir - Publication Handler for Directories
+Apache::lonpubdir - Construction space directory lister
 
 =head1 SYNOPSIS
 

Actions	Name	Title	Status	Last Modified
'.&mt('Actions').'	'.&mt('Name').'	'. + &mt('Title').'	'.&mt('Status').'	'.&mt('Last Modified'). + '
'. ''); + $uname.$thisdisfn."/default.meta'".'" value="'. +&mt('Edit Directory Catalog Information').'" />
'.&mt('Force publication of unmodified files').'.