--- loncom/interface/londocs.pm	2025/02/03 22:52:36	1.723
+++ loncom/interface/londocs.pm	2025/06/14 02:50:25	1.728
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.723 2025/02/03 22:52:36 raeburn Exp $
+# $Id: londocs.pm,v 1.728 2025/06/14 02:50:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1704,7 +1704,7 @@ sub group_import {
                 my $marker = $2;
                 my $info = $3;
                 my ($toolid,$toolprefix,$tooltype,%toolhash,%toolsettings);
-                my @extras = ('linktext','explanation','crslabel','crstitle','crsappend');
+                my @extras = ('linktext','explanation','crslabel','crstitle','crsappend','returnurl','backtourl','desturl','delay');
                 my @toolinfo = split(/:/,$info);
                 if ($residx) {
                     %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
@@ -1721,10 +1721,17 @@ sub group_import {
                 $toolid =~ s/\D//g;
                 ($toolhash{'target'},$toolhash{'width'},$toolhash{'height'},
                  $toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'},
-                 $toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'}) = @toolinfo;
+                 $toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'},
+                 $toolhash{'returnurl'},$toolhash{'backtourl'},$toolhash{'desturl'},
+                 $toolhash{'delay'}) = @toolinfo;
                 foreach my $item (@extras) {
                     $toolhash{$item} = &unescape($toolhash{$item});
                 }
+                foreach my $item ('crsappend','gradable','returnurl',
+                                  'backtourl','desturl','delay') {
+                    $toolhash{$item} =~ s/^\s+//;
+                    $toolhash{$item} =~ s/\s+$//;
+                }
                 if ($folder =~ /^supplemental/) {
                     delete($toolhash{'gradable'});
                 } else {
@@ -1785,6 +1792,7 @@ sub group_import {
                                     }
                                 }
                             }
+                            my $nocrsdest = 1;
                             if (ref($tools{'crsconf'}) eq 'HASH') {
                                 foreach my $item ('label','title','linktext','explanation') {
                                     my $crsitem;
@@ -1808,6 +1816,25 @@ sub group_import {
                                         }
                                     }
                                 }
+                                if ($tools{'crsconf'}{'returnurl'}) {
+                                    unless ($toolhash{'returnurl'} eq 'custom') {
+                                        delete($toolhash{'backtourl'});
+                                    }
+                                } else {
+                                    delete($toolhash{'returnurl'});
+                                    delete($toolhash{'backtourl'});
+                                }
+                                if ($tools{'crsconf'}{'desturl'}) {
+                                    if ($toolhash{'desturl'} =~ m{^(https?\://|/)}) {
+                                        undef($nocrsdest);
+                                    } else {
+                                        delete($toolhash{'desturl'});
+                                        delete($toolhash{'delay'});
+                                    }
+                                } else {
+                                    delete($toolhash{'desturl'});
+                                    delete($toolhash{'delay'});
+                                }
                             }
                             if ($toolhash{'passback'}) {
                                 my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
@@ -1819,6 +1846,17 @@ sub group_import {
                                 $toolhash{'rostersecret'} = $rostersecret;
                                 $toolhash{'rostersecretdate'} = time;
                             }
+                            if ($nocrsdest) {
+                                foreach my $item ('desturl','delay') {
+                                    if (exists($toolhash{$item})) {
+                                        delete($toolhash{$item});
+                                    }
+                                }
+                            } elsif (exists($toolhash{'delay'})) {
+                                unless ($toolhash{'delay'} =~ /^(\d+\.?\d*)$/) {
+                                    delete($toolhash{'delay'});
+                                }
+                            }
                             my $changegradable;
                             if (($residx) && ($folder =~ /^default/)) {
                                 if ($toolsettings{'gradable'}) {
@@ -1836,6 +1874,20 @@ sub group_import {
                                     }
                                 }
                             }
+                            if ($residx) {
+                                if (($toolsettings{'backtourl'} ne '') && (!exists($toolhash{'backtourl'}))) {
+                                    push(@deleted,'backtourl');
+                                }
+                                if (($toolsettings{'returnurl'} ne '') && (!exists($toolhash{'returnurl'}))) {
+                                    push(@deleted,'returnurl');
+                                }
+                                if (($toolsettings{'desturl'} ne '') && (!exists($toolhash{'desturl'}))) {
+                                    push(@deleted,'desturl');
+                                }
+                                if (($toolsettings{'delay'} ne '') && (!exists($toolhash{'delay'}))) {
+                                    push(@deleted,'delay');
+                                }
+                            }
                             my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum);
                             if ($putres eq 'ok') {
                                 if (@deleted) {
@@ -4985,7 +5037,7 @@ sub editor {
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
                                                            $helpitem,undef,'RAT')
                        .'</div><div class="LC_navtools">'.&mt('Tools:').'</div>'
-                       .'<div class="LC_navtools">'."\n".'<ul id="LC_toolbar">' 
+                       .'<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" '
@@ -5044,6 +5096,9 @@ sub editor {
             } else {
                 $to_show .= $toolslink
                            .&Apache::loncommon::start_data_table('LC_tableOfContent')
+                           .&Apache::loncommon::start_data_table_header_row('LC_visually_hidden')
+                           .'<th>'.&mt('Resource Type (Icon)').'</th><th>'.&mt('Resource or Folder').'</th>'
+                           .&Apache::loncommon::end_data_table_header_row()
                            .$output.' '
                            .&Apache::loncommon::end_data_table();
             }
@@ -5908,18 +5963,21 @@ $form_end;
     } else {
         $reinit = &mt('(re-initialize course to access)');
     }
-    $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink.'</span>';
-    if ($orig_url =~ /$LONCAPA::assess_re/) {
-        $line.= '<br />';
-        if ($curralias ne '') {
-            $line.='<span class="LC_nobreak"><a href="javascript:delalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'.
-                   $lt{'da'}.'</a></span>';
-        } else {
-            $line.='<span class="LC_nobreak"><a href="javascript:setalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'.
-                   $lt{'sa'}.'</a></span>';
+    if ($allowed) {
+        $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink.'</span>';
+        if ($orig_url =~ /$LONCAPA::assess_re/) {
+            $line.= '<br />';
+            if ($curralias ne '') {
+                $line.='<span class="LC_nobreak"><a href="javascript:delalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'.
+                       $lt{'da'}.'</a></span>';
+            } else {
+                $line.='<span class="LC_nobreak"><a href="javascript:setalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'.
+                       $lt{'sa'}.'</a></span>';
+            }
         }
+        $line.='</td>';
     }
-    $line.='</td><td><span class="LC_nobreak">';
+    $line .= '<td><span class="LC_nobreak">';
     my ($link,$nolink);
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
         if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) {
@@ -6841,7 +6899,8 @@ sub create_form_ul {
 
 sub startContentScreen {
     my ($mode) = @_;
-    my $output = '<ul class="LC_TabContentBigger" id="mainnav">';
+    my $output = '<div class="LC_landmark" role="main">'.
+                 '<ul class="LC_TabContentBigger" id="mainnav">';
     if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
         $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
         $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n";
@@ -6865,7 +6924,7 @@ sub startContentScreen {
 #
 
 sub endContentScreen {
-    return '</div></div></div>';
+    return '</div></div></div></div>';
 }
 
 sub supplemental_base {
@@ -7335,10 +7394,10 @@ sub handler {
                 @tabids = ('002','dd2','ee2','ff2');
                 $tid = 2;
             } else {
-                @tabids = ('aa1','bb1','cc1','ff1');
+                @tabids = ('aa1','bb1','cc1','dd1','ff1');
                 unless ($env{'form.folderpath'} =~ /\:1$/) {
                     unshift(@tabids,'001');
-                    push(@tabids,('dd1','ee1'));
+                    push(@tabids,'ee1');
                 }
             }
             my $tabidstr = join("','",@tabids);