--- loncom/publisher/lonpubdir.pm	2022/05/27 04:24:55	1.174
+++ loncom/publisher/lonpubdir.pm	2023/07/13 21:41:40	1.179
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.174 2022/05/27 04:24:55 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.179 2023/07/13 21:41:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,8 +104,8 @@ sub handler {
                                 "$londocroot/priv/$udom/$uname"); # expressed in kB
     my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
                                                  $cstr,$crstype); # expressed in MB
-
     # Put out the start of page.
+    
     &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor);
 
     if (!-d $fn) {
@@ -128,7 +128,7 @@ sub handler {
     }
 
     # Put out actions for directory, browse/upload + new file page.
-    &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota);
+    &dircontrols($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota,$crsauthor);
     &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
 
     my $numdir = 0;
@@ -247,8 +247,13 @@ my $result = "<script type=\"text/javasc
         if (!($cmode&$dirptr)) {
             ($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir, 
                 $filename, $linkfilename, $cmtime, $meta_same);
-            ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename, 
-                                        $linkfilename, $meta_same, \%bombs);
+            if (($crsauthor) && ($extension eq 'rights')) {
+                $title = &getTitleString($targetdir.'/'.$filename);
+                $fulltitle = $title;
+            } else {
+                ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename, 
+                                                 $linkfilename, $meta_same, \%bombs);
+            }
         } else {
             ($status, $pubstatus) = ('','');
             ($fulltitle, $title) = ('','');
@@ -317,7 +322,8 @@ my $result = "<script type=\"text/javasc
                 $targetdir, \%bombs, \$numdir);
         } else {                                                # Files
             &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
-                $targetdir, $linkdir, $filehash->{$filename}->{"cmtime"}, 
+                $targetdir, $linkdir, $crsauthor, 
+                $filehash->{$filename}->{"cmtime"}, 
                 $filehash->{$filename}->{"size"}, \$numres, 
                 $filehash->{$filename}->{"linkfilename"},
                 $filehash->{$filename}->{"fulltitle"},
@@ -391,12 +397,16 @@ sub startpage {
 
     $disk_quota = 1024 * $disk_quota; # convert from MB to kB
 
+    my $headertext = &mt('Directory');
+    if ($crsauthor) {
+        $headertext = &mt('Course Authoring 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()));
+                    .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
 
     my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $doctitle = 'LON-CAPA '.&mt($title);
@@ -410,25 +420,6 @@ 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")
@@ -512,19 +503,16 @@ ENDPUBDIRSCRIPT
 }
 
 sub dircontrols {
-    my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
+    my ($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota,$crsauthor) = @_;
     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',
@@ -541,50 +529,72 @@ sub dircontrols {
                                        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',
-                                       qs   => 'Quick Search',
+                                       crea => 'Create a new subdirectory or document',
+                                       qs   => 'Quick name search',
                                        cs   => 'Case Sensitive',
                                        re   => 'Regular Expression',
-				       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
     my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
     $r->printf(<<END,&Apache::loncommon::help_open_topic('Quicksearch'));
 <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>
+      <fieldset style="display:inline">
+            <legend>$lt{'qs'}</legend>
+                <script type="text/javascript" src="/adm/quicksearch/quicksearch.js"></script>
+                <input type="text" id="quickfilter" placeholder="Enter search term" onkeyup="applyFilter()"/>
+                <input type="button" value="Clear" onclick="document.getElementById(\'quickfilter\').value=\'\'; applyFilter()" />
+                %s
+                <br />
+                <label><input type="checkbox" id="casesens" onchange="applyFilter()"/>$lt{'cs'}&nbsp;&nbsp;</label>
+                <label><input type="checkbox" id="regex" onchange="applyFilter()"/>$lt{'re'}&nbsp;&nbsp;</label>
+        </fieldset>
   </div>
-
+END
+    my %fileoptions = (
+                         none => "$lt{'sela'}:",
+                         newfile => "$lt{'nfil'}:",
+                         newhtmlfile => "$lt{'nhtm'}:",
+                         newproblemfile => "$lt{'nprb'}:",
+                         newdir => "$lt{'nsub'}:",
+                      );
+    $fileoptions{'select_form_order'} = ['none','newfile','newhtmlfile','newproblemfile'];
+    if ($crsauthor) {
+        push(@{$fileoptions{'select_form_order'}},'newdir');
+    } else {
+        my %extraoptions = (
+                              newpagefile => "$lt{'npag'}:",
+                              newsequencefile => "$lt{'nseq'}:",
+                              newrightsfile => "$lt{'ncrf'}:",
+                              newstyfile => "$lt{'nsty'}:",
+                              newtaskfile => "$lt{'nbt'}:",
+                              newlibraryfile => "$lt{'nlib'}:",
+        );
+        %fileoptions = (%fileoptions,%extraoptions);
+        push(@{$fileoptions{'select_form_order'}},('newpagefile','newsequencefile',
+                                                   'newrightsfile','newstyfile',
+                                                   'newtaskfile','newlibraryfile',
+                                                   'newdir'));
+    }
+    my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions); 
+    $r->print(<<END);
   <div style="padding-bottom: 2px">
     <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload">
       <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>
@@ -607,53 +617,51 @@ sub dircontrols {
                         }
                     }
                   </script>
-		  <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" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
+		  $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();" />
 		<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>
+		    <img src="/adm/lonIcons/unknown.gif" title="Create blank problem file" alt="file icon" /></a>
                  <a href="javascript:void(0)" onclick="javascript:validate_action('problemtempl')"> 
-                    <img src="/adm/lonIcons/problem.gif" title="Create new problem from template"></a>
+                    <img src="/adm/lonIcons/problem.gif" title="Create new problem from template" alt="problem icon" /></a>
                  <a href="javascript:void(0)" onclick="javascript:validate_action('blankhtml')"> 
-                    <img src="/adm/lonIcons/html.gif" title="Create new blank HTML file"></a>
+                    <img src="/adm/lonIcons/html.gif" title="Create new blank HTML file" alt="web page icon" /></a>
                  <a href="javascript:void(0)" onclick="javascript:validate_action('folder')"> 
-		    <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory"></a>
+		    <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory" alt="folder icon" /></a>
                 </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>
@@ -661,18 +669,6 @@ sub dircontrols {
       </fieldset>
     </form>
     </div>
-    <div>
-      <fieldset style="display:inline">
-            <legend>$lt{'qs'}</legend>
-                <script type="text/javascript" src="/adm/quicksearch/quicksearch.js"></script>
-                <input type="text" id="quickfilter" placeholder="Enter search term" onkeyup="applyFilter()"/>
-                <input type="button" value="Clear" onclick="document.getElementById(\'quickfilter\').value=\'\'; applyFilter()" />
-                %s
-                <br />
-                <label><input type="checkbox" id="casesens" onchange="applyFilter()"/>$lt{'cs'}&nbsp;&nbsp;</label>
-                <label><input type="checkbox" id="regex" onchange="applyFilter()"/>$lt{'re'}&nbsp;&nbsp;</label>
-        </fieldset>
-  </div>
 </div>
 END
 }
@@ -855,7 +851,7 @@ sub isMetaSame {
 
 sub getStatus {    
     my ($resdir, $targetdir, $cstr_dir, $filename,  
-            $linkfilename, $cmtime, $meta_same) = @_;
+        $linkfilename, $crsauthor, $cmtime, $meta_same) = @_;
     my $pubstatus = 'unpublished';
     my $status = &mt('Unpublished');
 
@@ -881,7 +877,9 @@ sub getStatus {
         );
         $rights_status .=
             $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
-
+        if (($crsauthor) && ($filename =~ /\.rights$/)) {
+            $rights_status =~ s/,\s+$//;
+        }
 	if ($same) {
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';
@@ -899,17 +897,21 @@ sub getStatus {
             $pubstatus = 'modified';
 	    $status=&mt('Modified').
 		'<br />'. $rights_status;
-	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
-		$status.='<br />'.
-                         &Apache::loncommon::modal_link(
-                             '/adm/diff?filename='.$linkfilename.'&amp;versiontwo=priv',
-                             &mt('Diffs'),600,500);
+            unless (($crsauthor) && ($filename =~ /\.rights$/)) {
+	        if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
+		    $status.='<br />'.
+                             &Apache::loncommon::modal_link(
+                                 '/adm/diff?filename='.$linkfilename.'&amp;versiontwo=priv',
+                                 &mt('Diffs'),600,500);
+	        }
 	    }
-	} 
+	}
 
-	$status.="\n".'<br />'.
-             &Apache::loncommon::modal_link(
-                 '/adm/retrieve?filename='.$linkfilename.'&amp;inhibitmenu=yes&amp;add_modal=yes',&mt('Retrieve'),600,500);
+        unless (($crsauthor) && ($filename =~ /\.rights$/)) {
+	    $status.="\n".'<br />'.
+                 &Apache::loncommon::modal_link(
+                     '/adm/retrieve?filename='.$linkfilename.'&amp;inhibitmenu=yes&amp;add_modal=yes',&mt('Retrieve'),600,500);
+        }
     }
 
     return ($status, $pubstatus);
@@ -920,9 +922,9 @@ sub getStatus {
 #   Put a table row for a file resource.
 #
 sub putresource {
-    my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, 
-            $linkdir, $cmtime, $size, $numres, $linkfilename, $title, 
-            $status, $pubstatus) = @_;
+    my ($r, $udom, $uname, $filename, $thisdisfn, $resdir,
+        $targetdir, $linkdir, $crsauthor, $cmtime, $size,
+        $numres, $linkfilename, $title, $status, $pubstatus) = @_; 
     &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
 
     my $editlink='';
@@ -948,7 +950,9 @@ sub putresource {
     }
     my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
     my $pub_select = '';
-    &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+    unless (($crsauthor) && ($filename=~ /\.rights$/)) {
+        &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+    }
     $r->print(&Apache::loncommon::start_data_table_row().
 	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
 		      '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.