--- loncom/interface/londocs.pm	2025/01/07 03:51:55	1.720
+++ loncom/interface/londocs.pm	2025/02/03 22:52:36	1.723
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.720 2025/01/07 03:51:55 raeburn Exp $
+# $Id: londocs.pm,v 1.723 2025/02/03 22:52:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1177,9 +1177,9 @@ ENDJS
                 $r->print('<p>'.&mt('Copied the following files to [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
                           '</p>'."\n".
                           '<ul><li>'.join('</li><li>',sort(keys(%newfile))).'</li></ul></p>'."\n");
-                foreach my $key (keys(%newfile)) {
-                    my %storehash = ( 
-                                      'priv' => $newfile{$key},
+                foreach my $file (keys(%newfile)) {
+                    my %storehash = (
+                                      'priv' => $newfile{$file},
                                       'who'  => $env{'user.name'}.':'.$env{'user.domain'},
                                     );
                     if (exists($newresfile{$file})) {
@@ -1277,7 +1277,32 @@ ENDJS
                       &mt('Choose the files and/or folders to copy from Course Authoring to User Authoring').
                       '</span><br /><br />'."\n";
         my $count = 0;
-        my $startcount = 4 + $home;
+#
+# Warning to developers:
+#
+# If you add or remove form elements which precede the table of items to copy
+# you will need to modify the value for startcount. Form elements include both:
+# <input> and <fieldset> tags.
+# $startcount (set to 9) contains the following:
+# fieldsets with following legends: (a) Folder in Authoring Space, (b) Distribution to set in metadata
+# (c) Content to copy
+# inputs: textbox for destination folder; dropdown lists: (a) Copyright, (b) Source
+# hidden: customrights file;  buttons: (a) check all, (b) uncheck all.
+# authorspace: if more than 1: a fieldset with legend: Select the Authoring Space,
+# or if 1: an input (hidden) with available author/coauthor role.
+# if there are multiple possible author/coauthor roles (i.e., $home > 1),
+# incerement startcount by 1 for the dropdown list uses to select the target.
+#
+# If there are published files, increment startcount by 3:
+# fieldset (legend: Published Resources), and two radio buttons (Yes/No).
+#
+        my $startcount = 9;
+        if ($home > 1) {
+            $startcount ++;
+        }
+        if ($numpub) {
+            $startcount += 3;
+        }
         my $lastcontainer = $startcount;
         $display .= &Apache::loncommon::start_data_table()."\n".
                     &Apache::loncommon::start_data_table_header_row().
@@ -2501,6 +2526,15 @@ sub print_paste_buffer {
                     &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
             } else {
                 my $icon = &Apache::loncommon::icon($extension);
+                my $icontext;
+                if ($extension eq 'sequence') {
+                    $icontext = &mt('folder icon');
+                } elsif ($extension eq 'page') {
+                    $icontext = &mt('composite page icon');
+                } else {
+                    $icontext = &mt('file icon');
+                }
+                $icontext = &HTML::Entities::encode($icontext);
                 if ($extension eq 'sequence' &&
                     $url =~ m{/default_\d+\.sequence$}x) {
                     $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -2510,7 +2544,7 @@ sub print_paste_buffer {
                 if ($title eq '') {
                     ($title) = ($url =~ m{/([^/]+)$});
                 }
-                $buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'.
+                $buffer = '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />'.
                           ': '.
                           &Apache::loncommon::parse_supplemental_title(
                              &LONCAPA::map::qtescape($title));
@@ -4946,16 +4980,18 @@ sub editor {
             if (!$allowed) {
                 $helpitem = 'Supplemental_Navigation';
             }
-            $toolslink = '<table><tr><td>'
+            $toolslink = '<div class="LC_navtools">'
+                       .'<div class="LC_navtools">'
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
                                                            $helpitem,undef,'RAT')
-                       .'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
-                       .'<td align="left"><ul id="LC_toolbar">'
+                       .'</div><div class="LC_navtools">'.&mt('Tools:').'</div>'
+                       .'<div class="LC_navtools">'."\n".'<ul id="LC_toolbar">' 
                        .'<li><a href="/adm/coursedocs?forcesupplement=1&amp;command=editsupp" '
                        .'id="LC_content_toolbar_edittoplevel" '
                        .'class="LC_toolbarItem" '
                        .'title="'.&mt('Supplemental Content Editor').'">'
-                       .'</a></li></ul></td></tr></table><br />';
+                       .'</a></li></ul></div></div>'."\n"
+                       .'<div style="padding:0;clear:both;margin:0;border:0"></div><br />'."\n";
         }
         if ($shown) {
             if ($allowed) {
@@ -5458,7 +5494,7 @@ ENDCOPY
 	    $copylink=(<<ENDCOPY);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
+<label><input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a></label>
 $form_end
 ENDCOPY
             if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) {
@@ -5476,7 +5512,7 @@ ENDCUT
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
 <input type="hidden" name="skip_$orderidx" id="skip_cut_$orderidx" value="$skip_confirm" />
-<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
+<label><input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a></label>
 $form_end
 ENDCUT
             if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) {
@@ -5495,7 +5531,7 @@ ENDREM
 $form_common
 <input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />
 <input type="hidden" name="confirm_rem_$orderidx" id="confirm_removal_$orderidx" value="$confirm_removal" />
-<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
+<label><input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a></label>
 $form_end
 ENDREM
             if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) {
@@ -5540,8 +5576,17 @@ $copylink
 </td>
 END
     }
+    my $icontext;
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
+    if ($extension eq 'sequence') {
+        $icontext = &mt('folder icon');
+    } elsif ($extension eq 'page') {
+        $icontext = &mt('composite page icon');
+    } else {
+        $icontext = &mt('file icon');
+    }
+    $icontext = &HTML::Entities::encode($icontext);
     my $uploaded=($url=~/^\/*uploaded\//);
     my $icon=&Apache::loncommon::icon($url);
     my $isfolder;
@@ -5883,9 +5928,9 @@ $form_end;
             }
         }
         if ($nolink) {
-            $line .= '<img src="'.$icon.'" alt="" class="LC_icon" /></a>';
+            $line .= '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" /></a>';
         } else {
-            $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
+            $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" /></a>';
         }
     } elsif ($url) {
        if ($anchor ne '') {
@@ -5915,16 +5960,16 @@ $form_end;
            }
        }
        if ($nolink) {
-           $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
+           $line.='<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />';
        } elsif ($nomodal) {
            $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
-                  '<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>';
+                  '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" border="0" /></a>';
        } else {
            $line.=&Apache::loncommon::modal_link($link,
-                                                 '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+                                                 '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />',600,500);
        }
     } else {
-       $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
+       $line.='<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />';
     }
     $line.='</span></td><td'.$tdwidth.'>';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
@@ -7566,10 +7611,6 @@ sub handler {
     my $quotainfo = '<p>'.&mt('Currently using [_1] of the [_2] available.',
                               $percent.'%',$quota.' MB').'</p>';
 
-	my $fileupload=(<<FIUP);
-        $quotainfo
-	$lt{'file'}:<br />
-FIUP
 	my $checkbox=(<<CHBO);
 	<!-- <label>$lt{'parse'}?
 	<input type="checkbox" name="parserflag" />
@@ -7588,8 +7629,9 @@ CHBO
         <form name="uploadims" action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" target="IMSimport">
         <fieldset id="uploadimsform" style="display: none;">
         <legend>$lt{'imsf'}</legend>
-        $fileupload
-        <input type="file" name="uploaddoc" id="uploaddocims" class="LC_flUpload LC_uploaddoc" size="40" $disabled />
+        $quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" id="uploaddocims" class="LC_flUpload LC_uploaddoc" size="40" $disabled /></label>
         <input type="hidden" id="LC_free_space_ims" value="$free_space" />
         <br />
         <p>
@@ -7616,12 +7658,14 @@ IMSFORM
         <fieldset id="uploaddocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="aa" />
-    $fileupload
-        <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled />
+        $quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /></label>
         <input type="hidden" id="LC_free_space" value="$free_space" />
 	<br />
+        <label>
 	$lt{'title'}:<br />
-	<input type="text" size="60" name="comment" $disabled />
+	<input type="text" size="60" name="comment" $disabled /></label>
 	$pathitem
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
@@ -7647,11 +7691,11 @@ FUFORM
         <fieldset id="importmapform" style="display: none;">
         <legend>$lt{'impm'}</legend>
 	<input type="hidden" name="active" value="bb" />
-        $lt{'copm'}<br />
+        <label>$lt{'copm'}<br />
         <span class="LC_nobreak">
         <input type="text" name="importmap" size="40" value="" 
         onfocus="this.blur();$mapimportjs" $disabled />
-        &nbsp;<a href="$mapimportjs">$lt{'selm'}</a></span><br />
+        &nbsp;<a href="$mapimportjs">$lt{'selm'}</a></span></label><br />
         <input type="submit" name="loadmap" value="$lt{'load'}" $disabled />
         </fieldset>
         </form>
@@ -7692,9 +7736,9 @@ SEDFFORM
         <div id="importcrsrescontent" style="display: none;">
         <input type="hidden" name="active" value="bb" />
         $pickfile
-        <p>
+        <p><label>
         $lt{'title'}: <input type="text" name="crsrestitle" value="" $disabled />
-        </p>
+        </label></p>
         <input type="hidden" name="importdetail" value="" />
         <input type="submit" name="crsres" value="$lt{'impo'}" $disabled /><br />
         </div>
@@ -7957,7 +8001,7 @@ NWEBFORM
             $is_home{'course'} = 1;
         }
         $rolehomes .= '<input type="hidden" id="rolehome_course" name="rolehome_course" value="'.$crshome.'" />'."\n";
-        my $pickdir = $lt{'loca'}.
+        my $pickdir = '<label>'.$lt{'loca'}.
                    '<select name="authorrole" onchange="populateDirSelects(this.form,'."'authorrole','authorpath'".',1,1,0);">'."\n".
                    '<option value="" selected="selected">'.&mt('Select').'</option>'."\n";
         if ($env{'user.author'}) {
@@ -7978,11 +8022,11 @@ NWEBFORM
         if ($checkcrsres) {
             $pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n";
         }
-        $pickdir .= '</select><br />'."\n".
-                    $lt{'dire'}.
+        $pickdir .= '</select></label><br />'."\n".
+                    '<label>'.$lt{'dire'}.
                     '<select name="authorpath" onchange="toggleCrsResTitle();">'.
                     '<option value=""></option>'.
-                    '</select><br />'."\n";
+                    '</select></label><br />'."\n";
         my %seltemplate_menus;
         my @files = &Apache::lonhomework::get_template_list('problem');
         my @noexamplelink = ('blank.problem','blank.library','script.library');
@@ -8015,12 +8059,17 @@ NWEBFORM
             }
         }
 
-        my $templates = $lt{'cate'}.' '.
-                        &Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'tmpl'}.' ',
-                                                                $defcategory,'tempcategory','template',
-                                                                \%seltemplate_menus,\@catorder,
-                                                                "resize_scrollbox('contentscroll','1','0');",
-                                                                "toggleExampleText();",'template').'<br />';
+        my ($templates,$haslabel);
+        if ($lt{'cate'} ne '') {
+            $templates = '<label>';
+            $haslabel = 1;
+        }
+        $templates .= $lt{'cate'}.' '.
+                      &Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'tmpl'}.' ',
+                                                              $defcategory,'tempcategory','template',
+                                                              \%seltemplate_menus,\@catorder,
+                                                              "resize_scrollbox('contentscroll','1','0');",
+                                                              "toggleExampleText();",'template',$haslabel).'<br />';
         my $templatepreview =  '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true);  return false;">'.
                                '<span id="newresexample">'.&mt('Example').'</span></a>';
         my $crsresform;
@@ -8041,12 +8090,12 @@ NWEBFORM
         <label><input type="radio" name="newsubdir" value="0" onclick="toggleNewsubdir(this.form);" checked="checked" $disabled />No</label>
         &nbsp;
         <label><input type="radio" name="newsubdir" value="1" onclick="toggleNewsubdir(this.form);" $disabled />Yes</label>
-        </span><span id="newsubdir"></span>
+        </span><label for="newsubdirname"><span id="newsubdir"></span></label>
         <input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" />
         </p>
         </div>
-        $lt{'fnam'}
-        <input type="text" size="20" name="newresourcename" autocomplete="off" $disabled />
+        <label>$lt{'fnam'}
+        <input type="text" size="20" name="newresourcename" autocomplete="off" $disabled /></label>
         <div id="newresource" style="display:none">
         <p>
         $lt{'addp'}
@@ -8054,7 +8103,7 @@ NWEBFORM
         $lt{'no'}</label>&nbsp;&nbsp;
         <label><input type="radio" name="newresourceadd" value="1" onclick="toggleNewInCourse(this.form);" $disabled />
         $lt{'yes'}</label>
-        <span id="newrestitle"></span>
+        <label for="newresourcetitle"><span id="newrestitle"></span></label>
         <input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" $disabled />
         </p>
         </div>
@@ -8249,8 +8298,9 @@ unless ($container eq 'page') {
         <fieldset id="uploadsuppdocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="ee" />
-	$fileupload
-        <input type="file" name="uploaddoc" id="uploaddocsupp" class="LC_flUpload LC_uploaddoc" size="40" $disabled />
+	$quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" id="uploaddocsupp" class="LC_flUpload LC_uploaddoc" size="40" $disabled /></label>
         <input type="hidden" id="LC_free_space_supp" value="$free_space" />
 	<br />
 	<br />
@@ -8258,8 +8308,8 @@ unless ($container eq 'page') {
 	$checkbox
 	</span>
 	<br /><br />
-	$lt{'comment'}:<br />
-	<textarea cols="50" rows="4" name="comment"></textarea>
+	<label>$lt{'comment'}:<br />
+	<textarea cols="50" rows="4" name="comment"></textarea></label>
 	<br />
 	$pathitem
 	<input type="hidden" name="cmd" value="upload_supplemental" />