--- loncom/publisher/lonpubdir.pm	2003/02/03 18:03:53	1.30
+++ loncom/publisher/lonpubdir.pm	2005/07/14 18:27:35	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# (Publication Handler
+# Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.30 2003/02/03 18:03:53 harris41 Exp $
+# $Id: lonpubdir.pm,v 1.87 2005/07/14 18:27:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,19 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 
-# (TeX Content Handler
-#
-# YEAR=2000
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
-# YEAR=2001
-# 03/23 Guy Albertelli
-# 03/24,03/29 Gerd Kortemeyer)
-# 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer
-# 12/28 Gerd Kortemeyer
-#
 ###
 
 package Apache::lonpubdir;
@@ -48,6 +35,11 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 use Apache::loncommon();
+use Apache::lonhtmlcommon();
+use Apache::lonlocal;
+use Apache::lonmsg;
+use Apache::lonmenu;
+use Apache::lonnet;
 
 sub handler {
 
@@ -69,18 +61,18 @@ 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/\/$//;
 
   unless ($fn) { 
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' trying to list empty directory', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
@@ -96,21 +88,36 @@ sub handler {
   my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory.
   my $linkdir='/priv/'.$uname.$thisdisfn;      # Full URL name of constr space.
 
-
+  my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
 
   &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.
-  
-  # Start off the diretory table.
+  if ($env{'environment.remote'} eq 'off') {
+      &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory, 
+                                               # browse/upload + new file page.
+  } else {
+      &pubbuttons($r,$uname,$thisdisfn);
+  }
+  &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
 
-  $r->print('<table border=2>'.
-	    '<tr><th>Actions</th><th>Name</th><th>Title</th>'.
-	    '<th>Status</th><th>Last Modified</th></tr>');
+  my $numdir = 0;
+  my $numres = 0;
+  
+  # Start off the directory table.
+  $r->print('<h3>Directory Contents:</h3>');
+  $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr>'.
+            '<th bgcolor="#DDDDDD">'.&mt('Type').'</th>'.
+            '<th bgcolor="#DDDDDD">'.&mt('Actions').'</th>'.
+            '<th bgcolor="#DDDDDD">'.&mt('Name').'</th>'.
+            '<th bgcolor="#DDDDDD">'.&mt('Title').'</th>'.
+	    '<th bgcolor="#DDDDDD">'.&mt('Status').'</th>'.
+            '<th bgcolor="#DDDDDD">'.&mt('Last Modified').
+	    '</th></tr>'."\n");
 
   my $filename;
   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,
@@ -120,10 +127,10 @@ sub handler {
      my $extension='';
      if ($filename=~/\.(\w+)$/) { $extension=$1; }
      if ($cmode&$dirptr) {
-	 putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime);
+	 putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir);
      } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
-	 putresource($r, $uname, $filename, $thisdisfn, $resdir, 
-		     $targetdir, $linkdir, $cmtime);
+	 putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, 
+		     $targetdir, $linkdir, $cmtime,\%bombs,\$numres);
      } else {
 	# "hidden" extension and not a directory, so hide it away.
      }
@@ -141,13 +148,15 @@ sub getEffectiveUrl {
     my $r = shift;
     my $fn;
     
-    if ($ENV{'form.filename'}) {	# If a form filename is defined.
-	$fn=$ENV{'form.filename'};
+    if ($env{'form.filename'}) {	# If a form filename is defined.
+	$fn=$env{'form.filename'};
 	#
 	#   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 +172,7 @@ sub getEffectiveUrl {
 	    $fn=~s|^/~(\w+)|/home/$1/public_html|;
 	}
     }
+    $fn=~s/\/+/\//g;
     return $fn;
 }
 #
@@ -178,46 +188,265 @@ sub getEffectiveUrl {
 
 sub startpage {
     my ($r, $uname, $udom, $thisdisfn) = @_;
-    
-    $r->content_type('text/html');
+    my $currdir = '/priv/'.$uname.$thisdisfn;
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-    
-    $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-    
-    $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1));
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>LON-CAPA Construction Space</title></head>');
+
+    my $pagetitle;
+    my $formaction='/priv/'.$uname.$thisdisfn.'/';
+    $formaction=~s/\/+/\//g;
+    $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
+        '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font>&nbsp;'.
+        '<form name="dirs" method="post" action="'.$formaction.
+        '" target="_parent"><tt><b>'.
+        &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />".
+        &Apache::lonhtmlcommon::select_recent('construct','recent',
+                 'this.form.action=this.form.recent.value;this.form.submit()').
+              '</form>';
+    &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+    if ($env{'environment.remote'} eq 'off') {
+	$env{'request.noversionuri'}=$currdir.'/';
+	$r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
+    } else {
+	$r->print($pagetitle);
+    }
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
-<script>
-    function pubdir(theform) {
-	if (confirm('Publish complete directory?')) {
-	    theform.submit();
+<script type="text/javascript">
+top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
+// Store directory location for menu bar to find
+
+parent.lastknownpriv='/~$uname$thisdisfn/';
+
+// Confirmation dialogues
+
+    function currdiract(theform) {
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {
+            document.publishdir.filename.value = theform.filename.value;
+	    document.publishdir.submit();
+        }
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
+            top.location=theform.filename.value+'default.meta'
         }
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
+            document.printdir.postdata.value=theform.filename.value
+            document.printdir.submit();
+        }
+    }
+  
+    function checkUpload(theform) {
+        if (theform.file == '') {
+            alert("Please use 'Browse..' to choose a file first, before uploading")
+            return 
+        }
+        theform.submit()  
     }
-   function pubrecdir(theform) {
-	if (confirm('Publish directory and all subdirectories?')) {
-            theform.pubrec.value='1';
-	    theform.submit();
+
+    function SetPubDir(theform,printForm) {
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") {
+            top.location = theform.openname.value
+            return
+        }
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
+            theform.submit();
+        }
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
+            top.location=theform.filename.value+'default.meta'
+        }
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
+            theform.action = '/adm/printout'
+            theform.postdata.value = theform.filename.value
+            theform.submit()
         }
+        return
+    }
+    function SetResChoice(theform) {
+      var activity = theform.reschoice.options[theform.reschoice.selectedIndex].value
+      if ((activity == 'rename') || (activity == 'copy') || (activity == 'move')) {
+          changename(theform,activity)
+      }
+      if (activity == 'publish') {
+          var pubform = document.pubresource
+          pubform.filename.value = theform.filename.value
+          pubform.submit()
+      }
+      if (activity == 'delete') {
+          var delform = document.delresource
+          delform.filename.value = theform.filename.value
+          delform.submit()
+      }
+      if (activity == 'obsolete') {
+          var pubform = document.pubresource
+          pubform.filename.value = theform.filename.value
+          pubform.makeobsolete.value=1;
+          pubform.submit()
+      }
+      if (activity == 'print') {
+          document.printresource.postdata.value = theform.filename.value
+          document.printresource.submit()
+      }
+      if (activity == 'retrieve') {
+          document.retrieveres.filename.value = theform.filename.value
+          document.retrieveres.submit()
+      }
+      if (activity == 'cleanup') {
+          document.cleanup.filename.value = theform.filename.value
+          document.cleanup.submit()
+      }
+      return
+    }
+    function changename(theform,activity) {
+        var newname=prompt('New Name');
+        if (newname == "" || !newname)  {
+            return
+        }
+        document.moveresource.newfilename.value = newname
+        document.moveresource.filename.value = theform.filename.value
+        document.moveresource.action.value = activity
+        document.moveresource.submit();
     }
 </script>
 ENDPUBDIRSCRIPT
+    $r->print($pubdirscript);
 
-    $r->print('<h1>Construction Space Directory <tt>'.
-	      $thisdisfn.'/</tt></h1>'.$pubdirscript.
-              '<form method="post" action="/adm/publish" target="_parent">'.
-              '<input type="hidden" name="filename" value="/~'.
-               $uname.$thisdisfn.'/" />'.
-              '<input type="button" onClick="pubdir(this.form);" value="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="window.location='."'/~".
-               $uname.$thisdisfn."/default.meta'".'" value="Directory Catalog Information" /></form>');
-    
-    if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
-	$r->print('<h3>Co-Author: '.$uname.' at '.$udom.
+    if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
+	$env{'environment.remote'} ne 'off') {
+	$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
 		  '</h3>');
     }
 }
 
+sub dircontrols {
+    my ($r,$uname,$udom,$thisdisfn) = @_;
+    my %lt=&Apache::lonlocal::texthash(
+                                       cnpd => 'Cannot publish directory',
+                                       cnrd => 'Cannot retrieve directory',
+                                       mcdi => 'Must create new subdirectory inside a directory',
+                                       pubr => 'Publish this Resource',
+                                       pubd => 'Publish this Directory',
+                                       rtrv => 'Retrieve Old Version',
+                                       pubs => 'Publish with Subdirectories',
+                                       list => 'List Directory',
+                                       uplo => 'Upload file',  
+                                       dele => 'Delete',
+                                       edit => 'Edit Catalog Information', 
+                                       sela => 'Select Action',
+                                       nfil => 'New file',
+                                       nhtm => 'New HTML file',
+                                       nprb => 'New problem',
+                                       npag => 'New assembled page',
+                                       nseq => 'New assembled sequence',
+                                       ncrf => 'New custom rights file',
+                                       nsty => 'New style file',
+                                       nlib => 'New library file',
+                                       nsub => 'New subdirectory',
+                                       renm => 'Rename current file to',
+                                       move => 'Move current file to',
+                                       copy => 'Copy current file to',
+                                       type => 'Type Name Here',
+                                       go => 'Go',
+                                       prnt => 'Print contents of directory',
+                                       crea => 'Create a new directory or LON-CAPA document',
+				       acti => 'Actions for current directory',
+				       updc => 'Upload a new document'
+                                      );
+    $r->print(<<END);
+        <table cellspacing="4" cellpadding="4" width="100%">
+         <tr>
+          <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'acti'}</b></font></td>
+          <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'updc'}</b></font></td>
+          <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'crea'}</b></font></td>
+        </tr>
+        <tr>
+         <td bgcolor="#ccddaa" valign="top" align="center">
+          <form name="curractions" method="post" action="">
+           <select name="dirtask" onchange="currdiract(this.form)">
+            <option>$lt{'sela'}</option>
+            <option value="publish">$lt{'pubd'}</option>
+            <option value="editcat">$lt{'edit'}</option>
+            <option value="printdir">$lt{'prnt'}</option>
+           </select>
+           <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+          </form>
+          <form name="publishdir" method="post" action="/adm/publish" target="_parent">
+           <input type="hidden" name="pubrec" value="" />
+           <input type="hidden" name="filename" value="" />
+          </form>
+          <form name="printdir" method="post" action="/adm/printout" target="_parent">
+           <input type="hidden" name="postdata" value="" />
+          </form>
+         </td>
+         <td bgcolor="#ccddaa" valign="top" align="center">
+	    <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
+	      <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+	      <input type="file" name="upfile" size="20" />
+	      <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
+	    </form>
+	 </td>
+	 <td bgcolor="#ccddaa" align="center">
+	    <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
+	      <nobr>
+		<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+			  <select name="action">
+			    <option value="Select Action">$lt{'sela'}</option>
+			    <option value="newfile">$lt{'nfil'}:</option>
+			    <option value="newhtmlfile">$lt{'nhtm'}:</option>
+			    <option value="newproblemfile">$lt{'nprb'}:</option>
+                            <option value="newpagefile">$lt{'npag'}:</option>
+                            <option value="newsequencefile">$lt{'nseq'}:</option>
+                            <option value="newrightsfile">$lt{'ncrf'}:</option>
+                            <option value="newstyfile">$lt{'nsty'}:</option>
+                            <option value="newlibraryfile">$lt{'nlib'}:</option>
+			    <option value="newdir">$lt{'nsub'}:</option>
+		  </select>&nbsp;<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" />&nbsp;<input type="button" value="Go" onclick="document.fileaction.submit()" />
+		 </nobr>
+		</form>
+	  </td>
+         </tr>
+        </table>
+END
+}
+
+sub pubbuttons {
+    my ($r,$uname,$thisdisfn) = @_;
+    $r->print('<form method="post" action="/adm/publish" target="_parent">'.
+              '<table><tr><td><input type="hidden" name="filename" value="/~'.
+               $uname.$thisdisfn.'/" />'.
+              '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
+'<input type="button" onclick="window.location='."'/~".
+               $uname.$thisdisfn."/default.meta'".'" value="'.
+&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
+}
+
+sub resourceactions {
+    my ($r,$uname,$udom,$thisdisfn) = @_;
+    $r->print(<<END);
+       <form name="moveresource" action="/adm/cfile" target="_parent" method="post">
+         <input type="hidden" name="filename" value="" />
+         <input type="hidden" name="newfilename" value="" />
+         <input type="hidden" name="action" value="" />
+       </form>
+       <form name="delresource" action="/adm/cfile" target="_parent" method="post">
+         <input type="hidden" name="filename" value="" />
+         <input type="hidden" name="action" value="delete" />
+       </form>
+       <form name="pubresource" action="/adm/publish" target="_parent" method="post">
+         <input type="hidden" name="filename" value="" />
+         <input type="hidden" name="makeobsolete" value="0" />
+       </form>
+       <form name="printresource" action="/adm/printout" target="_parent" method="post">
+           <input type="hidden" name="postdata" value="" />
+       </form>
+       <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
+           <input type="hidden" name="filename" value="" />
+       </form>
+       <form name="cleanup" action="/adm/cleanup" target="_parent" method="post">
+           <input type="hidden" name="filename" value="" />
+       </form>
+END
+}
+
 #
 #   Get the title string or "[untitled]" if the file has no title metadata:
 #   Without the latter substitution, it's impossible to examine metadata for
@@ -232,12 +461,20 @@ sub getTitleString {
     my $title    = &Apache::lonnet::metadata($fullname, 'title');
 
     unless ($title) {
-	$title = "[untitled]";
+	$title = "[".&mt('untitled')."]";
     }
     return $title;
 }
 
+sub getCopyRightString {
+    my $fullname = shift;
+    return &Apache::lonnet::metadata($fullname, 'copyright');
+}
 
+sub getSourceRightString {
+    my $fullname = shift;
+    return &Apache::lonnet::metadata($fullname, 'sourceavail');
+}
 #
 #  Put out a directory table row:
 #    putdirectory(r, base, here, dirname, modtime)
@@ -248,77 +485,206 @@ sub getTitleString {
 #      modtime - Encoded modification time.
 # 
 sub putdirectory {
-    my ($r, $reqfile, $here, $dirname, $modtime) = @_;
-  
+    my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_;
     # construct the display filename: the directory name unless ..:
     
     my $disfilename = $dirname;
     if ($dirname eq '..') {
-	$disfilename = '<i>Parent Directory</i>';
+	$disfilename = '<i>'.&mt('Parent Directory').'</i>';
     }
-    unless (( ($dirname eq '..') && ($reqfile eq '')) ||
-	    ($dirname eq '.')) {
+    unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) {
+	my $kaputt=0;
+	foreach (keys %{$bombs}) {
+	    if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
+	}
+	%Apache::lonpublisher::metadatafields=();
+	%Apache::lonpublisher::metadatakeys=();
+	my $construct=$here;
+	$construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
+        my $dirpath = $here;
+        $dirpath=~s:^/priv/:/~:;
+	&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
+       				 $construct.'/'.$dirname.'/default.meta'
+								 ));
+        my $actionitem = '';
+        if ($dirname eq '..') {
+            $actionitem = 'Go to ...';
+        } else {
+            $actionitem = 
+                    '<form name="dirselect_'.$$numdir.
+                    '" action="/adm/publish" target="_parent">'.
+                    '<select name="diraction" onchange="SetPubDir(this.form,document)">'.
+                      '<option selected="selected">'.&mt('Select action').'</option>'.
+                      '<option value="open">'.&mt('Open').'</option>'.
+                      '<option value="publish">'.&mt('Publish').'</option>'.
+                      '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
+                      '<option value="printdir">'.&mt('Print directory').'</option>'.
+                    '</select>'.
+                     '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.
+                     '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
+                     '<input type="hidden" name="postdata" value="" />'.
+                   '</form>';
+            $$numdir ++;
+        }
 	$r->print('<tr bgcolor="#CCCCFF">'.
-		  '<td>Go to ...</td>'.
-		  '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.
-		  $disfilename.'</a></td>'.
-		        '<td>&nbsp;</td>'.
-		  '<td>&nbsp;</td>'.
-		  '<td>'.localtime($modtime).'</td>'.
+		  '<td><img src="'.
+		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" alt="folder" /></td>'.
+		  '<td>'.$actionitem.'</td>'.
+		  '<td><font face="arial"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
+		  $disfilename.'</a></font></td>'.
+		        '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
+		  $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
+		  $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
+		  '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
 		  "</tr>\n");
-    }	
+    }
     return OK;
 }
 #
 #   Put a table row for a file resource.
 #
 sub putresource {
-    my ($r, $uname, $filename, $thisdisfn, 
+    my ($r, $udom, $uname, $filename, $thisdisfn, 
 	$resdir, $targetdir, $linkdir,
-	$cmtime) = @_;
-
-    my $status='Unpublished';
-    my $bgcolor='#FFCCCC';
+	$cmtime,$bombs,$numres) = @_;
+    &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
+    my $pubstatus = 'unpublished';
+    my $status=&mt('Unpublished');
+    my $bgcolor='#FFAA99';
     my $title='&nbsp;';
+    my $publish_button=&mt('Publish');
+#    my $action_buttons=
+#        '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.
+#	$uname.'/'.$thisdisfn.'/'.$filename.'">'.
+#	&mt('Delete').'</a>';
     if (-e $resdir.'/'.$filename) {
 	my ($rdev,$rino,$rmode,$rnlink,
 	    $ruid,$rgid,$rrdev,$rsize,
 	    $ratime,$rmtime,$rctime,
 	    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+	$publish_button=&mt('Re-publish');
 	if ($rmtime>=$cmtime) {
-	    $status='Published';
-            $bgcolor='#CCFFCC';
+            $pubstatus = 'published';
+	    $status=&mt('Published').'<br />'.
+		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
+		&mt(&getSourceRightString($targetdir.'/'.$filename));
+	    $bgcolor='#CCFF88';
+	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
+                $pubstatus = 'obsolete';
+		$status=&mt('Obsolete');
+                $bgcolor='#AAAAAA';
+            }
+#	    } else {
+#		$action_buttons='';
+#	    }
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.
-		'.meta" target=cat>'.
-		getTitleString($targetdir.'/'.$filename, 'title').'</a>';
+		'.meta" target="cat">'.
+		&getTitleString($targetdir.'/'.$filename).'</a>';
 	} else {
-	    $status='Modified';
-            $bgcolor='#FFFFCC';
-	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
-		getTitleString($targetdir.'/'.$filename,'title').'</a>';
+            $pubstatus = 'modified';
+	    $status=&mt('Modified').'<br />'.
+		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
+		&mt(&getSourceRightString($targetdir.'/'.$filename));
+            $bgcolor='#FFFF77';
+#	    $action_buttons='';
+	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.
+		&getTitleString($targetdir.'/'.$filename).'</a>';
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
-		$status.='<br><a href="/adm/diff?filename=/~'.$uname.
+		$status.='<br /><a href="/adm/diff?filename=/~'.$uname.
 		    $thisdisfn.'/'.$filename.
-		    '&versiontwo=priv" target=cat>Diffs</a>';
+		    '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
 	    }
-	}   
-	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
-	    $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
+	}
+	$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
+	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';
+	$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
+	    $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }
+    my $editlink='';
+    my $editlink2='';
+    if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
+	$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('Edit').'</a>)';
+    }
+    if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';
+	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';
+    }
+    if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
+	$editlink.=' (<a href="/adm/cleanup?filename=/~'.$uname.
+	    $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Clean Up').')</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>)';
+    }
+    my $pub_select = '';
+    &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
     $r->print('<tr bgcolor="'.$bgcolor.'">'.
-	      '<td><a target="_parent" href="/adm/publish?filename=/~'.
-	      $uname.$thisdisfn.'/'.$filename.'">'.'Publish</a>'.
-	      '</td>'.
-	      '<td>'.
-	      '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
-               $filename.'</a>'.
+	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
+		      '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
+              '<td>'.$pub_select.'</td>'.
+	      '<td><font face="arial">'.
+	      '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
+               $filename.'</a></font>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.
 	      '<td>'.$status.'</td>'.
-	      '<td>'.localtime($cmtime).'</td>'.
+	      '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
 	      "</tr>\n");
     return OK;
 }
+
+sub create_pubselect {
+    my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;
+    $$pub_select = '
+<form name="resselect_'.$$numres.'" action="">
+<select name="reschoice"  onchange="SetResChoice(this.form)">
+<option>'.&mt('Select action').'</option>'.
+'<option value="copy">'.&mt('Copy').'</option>';
+    if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
+        $$pub_select .= 
+'<option value="rename">'.&mt('Rename').'</option>'.
+'<option value="move">'.&mt('Move').'</option>'.
+'<option value="delete">'.&mt('Delete').'</option>';
+    } else {
+        $$pub_select .= '
+<option value="obsolete">'.&mt('Mark obsolete').'</option>';
+    }
+# check for versions
+    my $versions = &check_for_versions($r,'/'.$filename,$udom,$uname);
+    if ($versions > 0) {
+        $$pub_select .='
+<option value="retrieve">'.&mt('Retrieve old version').'</option>';
+    }
+    $$pub_select .= '
+<option value="publish">'.$publish_button.'</option>'.
+'<option value="cleanup">'.&mt('Clean up').'</option>'.
+'<option value="print">'.&mt('Print').'</option>'.
+'</select>
+<input type="hidden" name="filename" value="/~'.
+ &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /></form>';
+    $$numres ++;
+}
+
+sub check_for_versions {
+    my ($r,$fn,$udom,$uname) = @_;
+    my $versions = 0;
+    my $docroot=$r->dir_config('lonDocRoot');
+    my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn;
+    my $resdir=$resfn;
+    $resdir=~s/\/[^\/]+$/\//;
+    $fn=~/\/([^\/]+)\.(\w+)$/;
+    my $main=$1;
+    my $suffix=$2;
+    opendir(DIR,$resdir);
+    while (my $filename=readdir(DIR)) {
+        if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
+            $versions ++;        
+        }
+    }
+    return $versions;
+}
+
 #
 #   Categorize files in the directory.
 #   For each file in a list of files in a file directory, 
@@ -350,7 +716,7 @@ __END__
 
 =head1 NAME
 
-Apache::lonpubdir - Publication Handler for Directories
+Apache::lonpubdir - Construction space directory lister
 
 =head1 SYNOPSIS