--- loncom/publisher/lonpubdir.pm	2023/06/10 23:55:41	1.176
+++ 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.176 2023/06/10 23:55:41 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.179 2023/07/13 21:41:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,14 +104,9 @@ sub handler {
                                 "$londocroot/priv/$udom/$uname"); # expressed in kB
     my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
                                                  $cstr,$crstype); # expressed in MB
-    my $diraction;
-    if (-d $fn) {
-        $diraction = &diractions($thisdisfn);
-    }
-
     # Put out the start of page.
     
-    &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor, $diraction);
+    &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor);
 
     if (!-d $fn) {
         if (-e $fn) {
@@ -133,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;
@@ -252,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) = ('','');
@@ -322,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"},
@@ -366,7 +367,7 @@ my $result = "<script type=\"text/javasc
 #      $crstype - Course type, if this is for "course author"
 
 sub startpage {
-    my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor, $diraction) = @_;
+    my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor) = @_;
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
@@ -396,13 +397,16 @@ sub startpage {
 
     $disk_quota = 1024 * $disk_quota; # convert from MB to kB
 
-    my $heading = &mt('Directory');
+    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('','',$heading,$diraction)));
+                    .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
 
     my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $doctitle = 'LON-CAPA '.&mt($title);
@@ -416,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")
@@ -517,43 +502,8 @@ ENDPUBDIRSCRIPT
     $r->print($pubdirscript);
 }
 
-sub diractions {
-    my ($thisdisfn) = @_;
-    my %lt=&Apache::lonlocal::texthash(
-                                       acti => 'Actions for current directory',
-                                       sela => 'Select Action',
-                                       pubd => 'Publish this Directory',
-                                       prnt => 'Print contents of directory',
-                                       edit => 'Edit Metadata',
-                                       dedr => 'Delete Directory',
-    );
-    return <<END;
-<div style="display:inline-block;padding-left:20px">
-<b>$lt{'acti'}</b><br />
-<form name="curractions" method="post" action="">
-    <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/" />
-</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>
-END
-
-}
-
 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',
@@ -612,6 +562,32 @@ sub dircontrols {
         </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">
@@ -641,30 +617,18 @@ END
                         }
                     }
                   </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" 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();" />
+		  $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>$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){
@@ -887,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');
 
@@ -913,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';
@@ -931,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);
@@ -952,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='';
@@ -980,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>'.