--- loncom/publisher/lonpubdir.pm	2001/12/28 22:14:10	1.19
+++ loncom/publisher/lonpubdir.pm	2002/02/05 22:25:00	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonpubdir.pm,v 1.19 2001/12/28 22:14:10 www Exp $
+# $Id: lonpubdir.pm,v 1.22 2002/02/05 22:25:00 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,8 +103,8 @@ sub handler {
   $r->print('<h1>Construction Space Directory <tt>'.$thisdisfn.'/</tt></h1>');
   
   if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
-          $r->print('<h3><font color=red>Co-Author: '.$uname.' at '.$udom.
-               '</font></h3>');
+          $r->print('<h3>Co-Author: '.$uname.' at '.$udom.
+               '</h3>');
   }
 
 
@@ -115,8 +115,8 @@ sub handler {
   my $linkdir='/~'.$uname.$thisdisfn;
 
   $r->print('<table border=2>'.
- '<tr><th>Filename</th><th>Metadata</th><th>Modified</th>'.
- '<th>Status</th><th>&nbsp;</th></tr>');
+ '<tr><th>Actions</th><th>Name</th><th>Title</th>'.
+ '<th>Status</th><th>Last Modified</th></tr>');
 
   my $filename;
   my $dirptr=16384;
@@ -132,56 +132,10 @@ sub handler {
      my $extension='';
      if ($filename=~/\.(\w+)$/) { $extension=$1; }
      if ($cmode&$dirptr) {
-         my $disfilename=$filename;
-         if ($filename eq '..') {
-	     $disfilename='<i>Parent Directory</i>';
-         }
-         unless ((($filename eq '..') && ($thisdisfn eq '')) ||
-                 ($filename eq '.')) {
-           $r->print('<tr bgcolor=#BBBBFF'.
-           '><td><a href="'.$linkdir.'/'.$filename.'">'.$disfilename.
- '</a></td><td>&nbsp;</td><td>'.localtime($cmtime).
- '</td><td>&nbsp;</td><td>&nbsp;</td></tr>'
-           );
-         }
+	 putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime);
      } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
-         my $status='Unpublished';
-         my $bgcol='#FFBBBB';
-         my $title='&nbsp;';
-         if (-e $resdir.'/'.$filename) {
-            my ($rdev,$rino,$rmode,$rnlink,
-                $ruid,$rgid,$rrdev,$rsize,
-                $ratime,$rmtime,$rctime,
-                $rblksize,$rblocks)=stat($resdir.'/'.$filename);
-            if ($rmtime>=$cmtime) {
-		$status='Published';
-                $bgcol='#BBFFBB';
-                $title=
- '<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
- &Apache::lonnet::metadata($targetdir.'/'.$filename,'title').'</a>';
-            } else {
-                $status='Modified';
-                $bgcol='#FFFFBB';
-                $title=
- '<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
- &Apache::lonnet::metadata($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>';
-	        }
-            }   
-            $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
-              $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
-	 }
-         $r->print('<tr bgcolor='.$bgcol.
-         '><td><a href="'.$linkdir.'/'.$filename.'">'.$filename.
-         '</a></td><td>'.$title.
-         '<td>'.localtime($cmtime).'</td><td>'.$status.'</td>'.
-     '<td><a target="_parent" href="/adm/publish?filename=/~'.$uname.
-                                      $thisdisfn.'/'.$filename.'">'.
-         'Publish</a></td></tr>');
+	 putresource($r, $uname, $filename, $thisdisfn, $resdir, 
+		     $targetdir, $linkdir, $cmtime);
      } else {
 	# "hidden" extension and not a directory, so hide it away.
      }
@@ -191,6 +145,82 @@ sub handler {
   $r->print('</table></body></html>');
   return OK;  
 }
+#
+#  Put out a directory table row:
+#    putdirectory(r, base, here, dirname, modtime)
+#      r       - Apache request object.
+#      reqfile - File in request.
+#      here    - Where we are in directory tree.
+#      dirname - Name of directory special file.
+#      modtime - Encoded modification time.
+# 
+sub putdirectory {
+    my ($r, $reqfile, $here, $dirname, $modtime) = @_;
+  
+    # construct the display filename: the directory name unless ..:
+    
+    my $disfilename = $dirname;
+    if ($dirname eq '..') {
+	$disfilename = '<i>Parent Directory</i>';
+    }
+    unless (( ($dirname eq '..') && ($reqfile eq '')) ||
+	    ($dirname eq '.')) {
+	$r->print('<tr>'.
+		  '<td>Click to cwd</td>'.
+		  '<td><a href="'.$here.'/'.$dirname.'/">'.
+		  $disfilename.'</a></td>'.
+		        '<td>&nbsp;</td>'.
+		  '<td>&nbsp;</td>'.
+		  '<td>'.localtime($modtime).'</td>'.
+		  '</tr>');
+    }	
+    return OK;
+}
+#
+#   Put a table row for a file resource.
+#
+sub putresource {
+    my ($r, $uname, $filename, $thisdisfn, 
+	$resdir, $targetdir, $linkdir,
+	$cmtime) = @_;
+
+    my $status='Unpublished';
+    my $title='&nbsp;';
+    if (-e $resdir.'/'.$filename) {
+	my ($rdev,$rino,$rmode,$rnlink,
+	    $ruid,$rgid,$rrdev,$rsize,
+	    $ratime,$rmtime,$rctime,
+	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+	if ($rmtime>=$cmtime) {
+	    $status='Published';
+	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
+		&Apache::lonnet::metadata($targetdir.'/'.$filename,'title').'</a>';
+	} else {
+	    $status='Modified';
+	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
+		&Apache::lonnet::metadata($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>';
+	    }
+	}   
+	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
+	    $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
+    }
+    $r->print('<tr>'.
+	      '<td><a target="_parent" href="/adm/publish?filename=/~'.
+	      $uname.$thisdisfn.'/'.$filename.'">'.'Publish</a>'.
+	      '</td>'.
+	      '<td>'.
+	      '<a href="'.$linkdir.'/'.$filename.'">'.$filename.'</a>'.
+	      '</td>'.
+	      '<td>'.$title.'</td>'.
+	      '<td>'.$status.'</td>'.
+	      '<td>'.localtime($cmtime).'</td>'.
+	      '</tr>');
+    return OK;
+}
 
 1;
 __END__