--- loncom/publisher/lonpubdir.pm	2005/07/14 18:27:35	1.87
+++ loncom/publisher/lonpubdir.pm	2005/07/14 21:31:34	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.87 2005/07/14 18:27:35 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.88 2005/07/14 21:31:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -233,6 +233,11 @@ parent.lastknownpriv='/~$uname$thisdisfn
             document.printdir.postdata.value=theform.filename.value
             document.printdir.submit();
         }
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
+              var delform = document.delresource
+              delform.filename.value = theform.filename.value
+              delform.submit()
+        }
     }
   
     function checkUpload(theform) {
@@ -259,6 +264,11 @@ parent.lastknownpriv='/~$uname$thisdisfn
             theform.postdata.value = theform.filename.value
             theform.submit()
         }
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "delete") {
+              var delform = document.delresource
+              delform.filename.value = theform.filename.value
+              delform.submit()
+        }
         return
     }
     function SetResChoice(theform) {
@@ -325,8 +335,8 @@ sub dircontrols {
                                        mcdi => 'Must create new subdirectory inside a directory',
                                        pubr => 'Publish this Resource',
                                        pubd => 'Publish this Directory',
+                                       dedr => 'Delete Directory',
                                        rtrv => 'Retrieve Old Version',
-                                       pubs => 'Publish with Subdirectories',
                                        list => 'List Directory',
                                        uplo => 'Upload file',  
                                        dele => 'Delete',
@@ -366,6 +376,7 @@ sub dircontrols {
             <option value="publish">$lt{'pubd'}</option>
             <option value="editcat">$lt{'edit'}</option>
             <option value="printdir">$lt{'prnt'}</option>
+            <option value="delete">$lt{'dedr'}</option>
            </select>
            <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
           </form>
@@ -519,6 +530,7 @@ sub putdirectory {
                       '<option value="publish">'.&mt('Publish').'</option>'.
                       '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
                       '<option value="printdir">'.&mt('Print directory').'</option>'.
+                      '<option value="delete">'.&mt('Delete directory').'</option>'.
                     '</select>'.
                      '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.
                      '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.