--- loncom/publisher/lonpubdir.pm	2005/05/17 00:46:36	1.79
+++ loncom/publisher/lonpubdir.pm	2005/06/23 22:24:54	1.84
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.79 2005/05/17 00:46:36 www Exp $
+# $Id: lonpubdir.pm,v 1.84 2005/06/23 22:24:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -279,7 +279,7 @@ parent.lastknownpriv='/~$uname$thisdisfn
       if (activity == 'obsolete') {
           var pubform = document.pubresource
           pubform.filename.value = theform.filename.value
-          alert("You will be taken to the publication page.\\nCheck the 'Obsolete' checkbox at the bottom of the page, and click 'Finalize Publication'.")
+          pubform.makeobsolete.value=1;
           pubform.submit()
       }
       if (activity == 'print') {
@@ -290,6 +290,10 @@ parent.lastknownpriv='/~$uname$thisdisfn
           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) {
@@ -315,21 +319,53 @@ ENDPUBDIRSCRIPT
 
 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="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Actions for current directory</b></font></td>
-          <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Upload a new document</b></font></td>
-          <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Create a new directory or LON-CAPA document</b></font></td>
+          <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'acti'}</b></font></td>
+          <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'updc'}</b></font></td>
+          <td bgcolor="#DDDDDD" align="middle"><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>Select action</option>
-            <option value="publish">Publish directory</option>
-            <option value="editcat">Edit catalog information</option>
-            <option value="printdir">Print contents of directory</option>
+            <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>
@@ -345,23 +381,24 @@ sub dircontrols {
 	    <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="Upload file"  onclick="checkUpload(this.form)" />
+	      <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>Select Action</option>
-		    <option value="newfile">New file:</option>
-		    <option value="newhtmlfile">New HTML file:</option>
-		    <option value="newproblemfile">New problem:</option>
-                    <option value="newpagefile">New assembled page:</option>
-                    <option value="newsequencefile">New assembled sequence:</option>
-                    <option value="newrightsfile">New custom rights file:</option>
-                    <option value="newstyfile">New style file:</option>
-		    <option value="newdir">New subdirectory:</option>
+			  <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>
@@ -396,6 +433,7 @@ sub resourceactions {
        </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="" />
@@ -403,6 +441,9 @@ sub resourceactions {
        <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
 }
 
@@ -507,6 +548,7 @@ sub putresource {
     my ($r, $udom, $uname, $filename, $thisdisfn, 
 	$resdir, $targetdir, $linkdir,
 	$cmtime,$bombs,$numres) = @_;
+    &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
     my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';
@@ -568,6 +610,10 @@ sub putresource {
 	$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>)';
@@ -613,6 +659,7 @@ sub create_pubselect {
     }
     $$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="/~'.