--- loncom/publisher/lonpubdir.pm	2003/09/22 03:02:06	1.39
+++ loncom/publisher/lonpubdir.pm	2003/11/18 04:08:15	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.39 2003/09/22 03:02:06 www Exp $
+# $Id: lonpubdir.pm,v 1.45 2003/11/18 04:08:15 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -113,7 +113,7 @@ sub handler {
   my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
 
   opendir(DIR,$fn);
-  my @files=sort(readdir(DIR));
+  my @files=sort {uc($a) cmp uc($b)} (readdir(DIR));
   foreach my $filename (@files) {
      my ($cdev,$cino,$cmode,$cnlink,
          $cuid,$cgid,$crdev,$csize,
@@ -221,11 +221,14 @@ ENDPUBDIRSCRIPT
               '<form method="post" action="/adm/publish" target="_parent">'.
               '<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" /></td><td>'.
+              '<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="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>');
+               $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>'.&mt('Co-Author').': '.$uname.' at '.$udom.
@@ -247,7 +250,7 @@ sub getTitleString {
     my $title    = &Apache::lonnet::metadata($fullname, 'title');
 
     unless ($title) {
-	$title = "[untitled]";
+	$title = "[".&mt('untitled')."]";
     }
     return $title;
 }
@@ -279,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;
@@ -301,24 +304,28 @@ 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='';
     my $editlink2='';
@@ -329,9 +336,13 @@ sub putresource {
 	$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)$/) {
+	&Apache::lonnet::appenv('cgi.file' => $filename);
+	$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">'.
@@ -339,7 +350,7 @@ sub putresource {
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
 	      '<td>'.$status.'</td>'.
-	      '<td>'.localtime($cmtime).'</td>'.
+	      '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
 	      "</tr>\n");
     return OK;
 }