--- loncom/publisher/lonpubdir.pm	2003/06/16 21:32:43	1.33
+++ loncom/publisher/lonpubdir.pm	2003/10/18 17:17:12	1.43
@@ -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.43 2003/10/18 17:17:12 taceyjo1 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 {
 
@@ -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.
@@ -165,6 +168,7 @@ sub getEffectiveUrl {
 	    $fn=~s|^/~(\w+)|/home/$1/public_html|;
 	}
     }
+    $fn=~s/\/+/\//g;
     return $fn;
 }
 #
@@ -181,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>');
@@ -189,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();
@@ -203,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>');
     }
 }
@@ -237,7 +250,7 @@ sub getTitleString {
     my $title    = &Apache::lonnet::metadata($fullname, 'title');
 
     unless ($title) {
-	$title = "[untitled]";
+	$title = "[".&mt('untitled')."]";
     }
     return $title;
 }
@@ -259,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 '.')) {
@@ -269,7 +282,7 @@ sub putdirectory {
 		  $disfilename.'</a></td>'.
 		        '<td>&nbsp;</td>'.
 		  '<td>&nbsp;</td>'.
-		  '<td>'.localtime($modtime).'</td>'.
+		  '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
 		  "</tr>\n");
     }	
     return OK;
@@ -291,40 +304,52 @@ sub putresource {
 	    $ratime,$rmtime,$rctime,
 	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
 	if ($rmtime>=$cmtime) {
-	    $status='Published';
+	    $status=&mt('Published');
             $bgcolor='#CCFFCC';
+	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
+		$status=&mt('Obsolete');
+                $bgcolor='#AAAAAA';
+	    }
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.
 		'.meta" target=cat>'.
 		getTitleString($targetdir.'/'.$filename, 'title').'</a>';
 	} else {
-	    $status='Modified';
+	    $status=&mt('Modified');
             $bgcolor='#FFFFCC';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
 		getTitleString($targetdir.'/'.$filename,'title').'</a>';
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
 		$status.='<br><a href="/adm/diff?filename=/~'.$uname.
 		    $thisdisfn.'/'.$filename.
-		    '&versiontwo=priv" target=cat>Diffs</a>';
+		    '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
 	    }
 	}   
 	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
-	    $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
+	    $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</a>';
     }
     my $editlink='';
-    if ($filename=~/\.(xml|html|htm|xhtml|xhtm|problem|exam|quiz|assess|survey|form|library)$/) {
-	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">Edit</a>)';
+    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>)';
+    }
+    if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
+	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?decompress=1" target="_top">'.&mt('Decompress').'</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>'.$editlink.
+               $filename.'</a>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
 	      '<td>'.$status.'</td>'.
-	      '<td>'.localtime($cmtime).'</td>'.
+	      '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
 	      "</tr>\n");
     return OK;
 }