--- loncom/publisher/lonpubdir.pm	2024/08/22 18:32:56	1.160.2.5.2.5
+++ loncom/publisher/lonpubdir.pm	2024/07/03 21:05:49	1.160.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.160.2.5.2.5 2024/08/22 18:32:56 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.160.2.6 2024/07/03 21:05:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,7 +290,6 @@ sub handler {
     }
 
     # Print the sorted resources
-    my %editors = &Apache::loncommon::permitted_editors();
     foreach my $filename (@sorted_files) {
         if ($filehash->{$filename}->{"cmode"}&$dirptr) {        # Directories
             &putdirectory($r, $thisdisfn, $linkdir, $filename, 
@@ -303,8 +302,7 @@ sub handler {
                 $filehash->{$filename}->{"linkfilename"},
                 $filehash->{$filename}->{"fulltitle"},
                 $filehash->{$filename}->{"status"},
-                $filehash->{$filename}->{"pubstatus"},
-                \%editors);
+                $filehash->{$filename}->{"pubstatus"});
         }
     }
 
@@ -354,14 +352,12 @@ sub startpage {
     my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB
     $disk_quota = 1024 * $disk_quota; # convert from MB to kB
 
-    my $headertext = &mt('Directory');
-
     $r->print(&Apache::loncommon::head_subbox(
                      '<div style="float:right;padding-top:0;margin-top;0">'
                     .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
                                                            $disk_quota,'authoring')
                     .'</div>'
-                    .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
+                    .&Apache::loncommon::CSTR_pageheader()));
 
     my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $doctitle = 'LON-CAPA '.&mt('Authoring Space');
@@ -375,6 +371,25 @@ parent.lastknownpriv='/priv$esc_thisdisf
 
 // 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 == 'editmeta') {
+            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();
+        }
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
+              var delform = document.delresource
+              delform.filename.value = theform.filename.value
+              delform.submit()
+        }
+    }
+  
     function checkUpload(theform) {
         if (theform.file == '') {
             alert("Please use 'Browse..' to choose a file first, before uploading")
@@ -458,16 +473,19 @@ ENDPUBDIRSCRIPT
 }
 
 sub dircontrols {
-    my ($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota) = @_;
+    my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
     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',
+                                       dedr => 'Delete Directory',
                                        rtrv => 'Retrieve Old Version',
                                        list => 'List Directory',
                                        uplo => 'Upload file',  
                                        dele => 'Delete',
+                                       edit => 'Edit Metadata', 
                                        sela => 'Select Action',
                                        nfil => 'New file',
                                        nhtm => 'New HTML file',
@@ -484,7 +502,9 @@ sub dircontrols {
                                        copy => 'Copy current file to',
                                        type => 'Type Name Here',
                                        go   => 'Go',
-                                       crea => 'Create a new subdirectory or document',
+                                       prnt => 'Print contents of directory',
+                                       crea => 'Create a new directory or LON-CAPA document',
+				       acti => 'Actions for current directory',
 				       updc => 'Upload a new document',
 				       pick => 'Please select an action to perform using the new filename',
                                        shcu => 'Shortcuts',
@@ -499,25 +519,31 @@ sub dircontrols {
     # Calculate free space in bytes.
     # $disk_quota is in MB and $current_disk_usage is in kB
     my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
-    $r->print("\n".'<div class="LC_columnSection">'."\n");
-    my %fileoptions = (
-                         none => "$lt{'sela'}:",
-                         newfile => "$lt{'nfil'}:",
-                         newhtmlfile => "$lt{'nhtm'}:",
-                         newproblemfile => "$lt{'nprb'}:",
-                         newdir => "$lt{'nsub'}:",
-                         newpagefile => "$lt{'npag'}:",
-                         newsequencefile => "$lt{'nseq'}:",
-                         newrightsfile => "$lt{'ncrf'}:",
-                         newstyfile => "$lt{'nsty'}:",
-                         newtaskfile => "$lt{'nbt'}:",
-                         newlibraryfile => "$lt{'nlib'}:",
-                      );
-    $fileoptions{'select_form_order'} = ['none','newfile','newhtmlfile','newproblemfile',
-                                         'newpagefile','newsequencefile','newrightsfile',
-                                         'newstyfile','newtaskfile','newlibraryfile','newdir'];
-    my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions);
     $r->print(<<END);
+<div class="LC_columnSection">
+  <div>
+    <form name="curractions" method="post" action="">
+      <fieldset>
+        <legend>$lt{'acti'}</legend>
+        <select name="dirtask" onchange="currdiract(this.form)">
+            <option>$lt{'sela'}</option>
+            <option value="publish">$lt{'pubd'}</option>
+            <option value="editmeta">$lt{'edit'}</option>
+            <option value="printdir">$lt{'prnt'}</option>
+            <option value="delete">$lt{'dedr'}</option>
+        </select>
+        <input type="hidden" name="filename" value="/priv$thisdisfn/" />
+      </fieldset>
+    </form>
+    <form name="publishdir" method="post" action="/adm/publish">
+      <input type="hidden" name="pubrec" value="" />
+      <input type="hidden" name="filename" value="" />
+    </form>
+    <form name="printdir" method="post" action="/adm/printout">
+      <input type="hidden" name="postdata" value="" />
+    </form>
+  </div>
+
   <div style="padding-bottom: 2px">
     <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload">
       <fieldset>
@@ -534,8 +560,8 @@ sub dircontrols {
     <form name="fileaction" method="post" action="/adm/cfile">
       <fieldset>
               <legend>$lt{'crea'}</legend>
-              <span class="LC_nobreak">
-                <input type="hidden" name="filename" value="/priv$thisdisfn/" />
+	      <span class="LC_nobreak">
+		<input type="hidden" name="filename" value="/priv$thisdisfn/" />
                   <script type="text/javascript">
                     function validate_go() {
                         var selected = document.fileaction.action.selectedIndex;
@@ -546,18 +572,30 @@ sub dircontrols {
                         }
                     }
                   </script>
-                  $selectbox&nbsp;<input type="text" id="newnameid" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
+		  <select name="action">
+		    <option value="none">$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="newtaskfile">$lt{'nbt'}:</option>
+                    <option value="newlibraryfile">$lt{'nlib'}:</option>
+	            <option value="newdir">$lt{'nsub'}:</option>
+		  </select>&nbsp;<input type="text" id="newnameid" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
                 <br />
                 <span>$lt{'shcu'}:
                  <input type="hidden" name="mode"/>
                  <a href="javascript:void(0)" onclick="javascript:validate_action('blank')">
-                    <img src="/adm/lonIcons/unknown.gif" title="Create blank problem file" alt="file icon" /></a>
+                    <img src="/adm/lonIcons/unknown.gif" title="Create blank problem file"></a>
                  <a href="javascript:void(0)" onclick="javascript:validate_action('problemtempl')">
-                    <img src="/adm/lonIcons/problem.gif" title="Create new problem from template" alt="problem icon" /></a>
+                    <img src="/adm/lonIcons/problem.gif" title="Create new problem from template"></a>
                  <a href="javascript:void(0)" onclick="javascript:validate_action('blankhtml')">
-                    <img src="/adm/lonIcons/html.gif" title="Create new blank HTML file" alt="web page icon" /></a>
+                    <img src="/adm/lonIcons/html.gif" title="Create new blank HTML file"></a>
                  <a href="javascript:void(0)" onclick="javascript:validate_action('folder')">
-                    <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory" alt="folder icon" /></a>
+                    <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory"></a>
                 </span>
                  <script type="text/javascript">
                      function validate_action(action){
@@ -594,10 +632,10 @@ sub dircontrols {
                          }
                      }
                  </script>
-                 </span>
+		 </span>
       </fieldset>
     </form>
-    </div>
+  </div>
 </div>
 END
 }
@@ -701,8 +739,7 @@ sub putdirectory {
             $disfilename = '<i>'.&mt('Parent Directory').'</i>';
         } else {
             $actionitem = 
-                    '<form name="dirselect_'.$$numdir.
-                    '" action="/adm/publish">'.
+                    '<form name="dirselect_'.$$numdir.'" action="/adm/publish">'. 
                     '<select name="diraction" onchange="SetPubDir(this.form,document)">'.
                       '<option selected="selected">'.&mt('Select action').'</option>'.
                       '<option value="open">'.&mt('Open').'</option>'.
@@ -847,7 +884,7 @@ sub getStatus {
 sub putresource {
     my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, 
             $linkdir, $cmtime, $size, $numres, $linkfilename, $title, 
-            $status, $pubstatus, $editors) = @_;
+            $status, $pubstatus) = @_;
     &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
 
     my $editlink='';
@@ -856,19 +893,8 @@ sub putresource {
 	$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
     }
     if ($filename=~/$LONCAPA::assess_re/) {
-        if ($editors->{'xml'}) {
-	    $editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=editxml">'.&mt('EditXML').'</a>)';
-        }
-        if ($editors->{'edit'}) {
-	    $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
-        }
-    }
-    if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) {
-        if (($editors->{'daxe'}) &&
-            ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9)) {
-            my $daxeurl = '/daxepage'.$linkdir.'/'.$filename;
-            $editlink .= ' (<a href="'.$daxeurl.'">Daxe</a>)';
-        }
+	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=editxml">'.&mt('EditXML').'</a>)';
+	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
     }
     if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
 	$editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'">'.&mt('Clean Up').')</a>';