--- loncom/publisher/lonpubdir.pm	2003/09/25 22:30:06	1.40
+++ loncom/publisher/lonpubdir.pm	2003/12/05 14:26:25	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.40 2003/09/25 22:30:06 www Exp $
+# $Id: lonpubdir.pm,v 1.47 2003/12/05 14:26:25 sakharuk 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,
@@ -277,12 +277,12 @@ sub putdirectory {
     unless (( ($dirname eq '..') && ($reqfile eq '')) ||
 	    ($dirname eq '.')) {
 	$r->print('<tr bgcolor="#CCCCFF">'.
-		  '<td>Go to ...</td>'.
+		  '<td>'.&mt('Go to ...').'</td>'.
 		  '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.
 		  $disfilename.'</a></td>'.
 		        '<td>&nbsp;</td>'.
 		  '<td>&nbsp;</td>'.
-		  '<td>'.localtime($modtime).'</td>'.
+		  '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
 		  "</tr>\n");
     }	
     return OK;
@@ -295,7 +295,7 @@ sub putresource {
 	$resdir, $targetdir, $linkdir,
 	$cmtime) = @_;
 
-    my $status='Unpublished';
+    my $status=&mt('Unpublished');
     my $bgcolor='#FFCCCC';
     my $title='&nbsp;';
     if (-e $resdir.'/'.$filename) {
@@ -304,28 +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='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='';
@@ -336,6 +336,10 @@ 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)$/) {
+	$editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
+	      $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';
+    }
     $r->print('<tr bgcolor="'.$bgcolor.'">'.
 	      '<td><a target="_parent" href="/adm/publish?filename=/~'.
 	      $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.
@@ -345,8 +349,8 @@ sub putresource {
                $filename.'</a>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
-	      '<td>'.&mt($status).'</td>'.
-	      '<td>'.localtime($cmtime).'</td>'.
+	      '<td>'.$status.'</td>'.
+	      '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
 	      "</tr>\n");
     return OK;
 }