--- loncom/publisher/lonpubdir.pm	2024/02/28 04:58:02	1.160.2.5.2.3
+++ 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.3 2024/02/28 04:58:02 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"});
         }
     }
 
@@ -509,7 +507,14 @@ sub dircontrols {
 				       acti => 'Actions for current directory',
 				       updc => 'Upload a new document',
 				       pick => 'Please select an action to perform using the new filename',
+                                       shcu => 'Shortcuts',
                                       );
+    my %js_lt = &Apache::lonlocal::texthash(
+                                       nanf => 'Name of New File',
+                                       nans => 'Name of New Subdirectory',
+                                       psfn => 'Please specify file name',
+    );
+    &js_escape(\%js_lt);
     my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
     # Calculate free space in bytes.
     # $disk_quota is in MB and $current_disk_usage is in kB
@@ -544,7 +549,7 @@ sub dircontrols {
       <fieldset>
         <legend>$lt{'updc'}</legend>
         <input type="hidden" name="filename" value="/priv$thisdisfn/" />
-        <input type="file" name="upfile" class="LC_flUpload" size="20" />
+        <input type="file" name="upfile" class="LC_flUpload" />
         <input type="hidden" id="LC_free_space" value="$free_space" />
         <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
       </fieldset>
@@ -579,9 +584,9 @@ sub dircontrols {
                     <option value="newtaskfile">$lt{'nbt'}:</option>
                     <option value="newlibraryfile">$lt{'nlib'}:</option>
 	            <option value="newdir">$lt{'nsub'}:</option>
-		  </select>&nbsp;<input type="text" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
+		  </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>Quickactions:
+                <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"></a>
@@ -594,26 +599,36 @@ sub dircontrols {
                 </span>
                  <script type="text/javascript">
                      function validate_action(action){
-
-                         if (document.getElementsByName(\'newfilename\')[0].value != \'\'){
-                             if (action == "blank") {
-                                                                 document.fileaction.action.value=\'newproblemfile\';
-                                                                 document.fileaction.mode.value=\'blank\';
-                                                         } else if (action == "problemtempl") {
-                                                                 document.fileaction.action.value=\'newproblemfile\';
-                                 validate_go();
-                             } else if (action == "blankhtml") {
-                                 document.fileaction.action.value=\'newhtmlfile\';
-                                 validate_go();
-                             } else if (action == "folder") {
-                                 document.fileaction.action.value=\'newdir\';
-                                 document.fileaction.mode.value=\'folder\';
+                         if (document.getElementById('newnameid')) {
+                             if (document.getElementById('newnameid').value == '') {
+                                 var newname;
+                                 var prompttext = "$js_lt{'nanf'}";
+                                 if (action == 'folder') {
+                                     prompttext = "$js_lt{'nans'}";
+                                 }
+                                 newname=prompt(prompttext);
+                                 if (newname != '') {
+                                     document.getElementById('newnameid').value = newname;
+                                 }
+                             }
+                             if (document.getElementById('newnameid').value != '') {
+                                 if (action == 'blank') {
+                                     document.fileaction.action.value='newproblemfile';
+                                     document.fileaction.mode.value='blank';
+                                 } else if (action == 'problemtempl') {
+                                     document.fileaction.action.value='newproblemfile';
+                                     validate_go();
+                                 } else if (action == 'blankhtml') {
+                                     document.fileaction.action.value='newhtmlfile';
+                                     validate_go();
+                                 } else if (action == 'folder') {
+                                     document.fileaction.action.value='newdir';
+                                     document.fileaction.mode.value='folder';
+                                 }
+                                 fileaction.submit();
+                             } else {
+                                 alert("$js_lt{'psfn'}");
                              }
-                             fileaction.submit();
-                         } else {
-                             alert(\'Please specify file name.\');
-                             // TODO: ask for filename? if so, do some refactoring
-
                          }
                      }
                  </script>
@@ -724,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>'.
@@ -870,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='';
@@ -879,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>';