--- loncom/interface/lonnavmaps.pm	2025/01/03 05:38:17	1.567
+++ loncom/interface/lonnavmaps.pm	2025/05/27 23:31:49	1.575
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.567 2025/01/03 05:38:17 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.575 2025/05/27 23:31:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,7 +48,8 @@ described at http://www.lon-capa.org.
 
 =head1 OVERVIEW
 
-X<lonnavmaps, overview> When a user enters a course, LON-CAPA examines the
+X<lonnavmaps, overview>
+When a user enters a course, LON-CAPA examines the
 course structure and caches it in what is often referred to as the
 "big hash" X<big hash>. You can see it if you are logged into
 LON-CAPA, in a course, by going to /adm/test. The content of 
@@ -1120,7 +1121,7 @@ sub render_resource {
     }
 
     # Decide what to display
-    $result .= "$newBranchText$linkopen$icon$linkclose";
+    $result .= "$newBranchText$linkopen$icon";
     
     my $curMarkerBegin = '';
     my $curMarkerEnd = '';
@@ -1160,7 +1161,7 @@ sub render_resource {
             $linkopen = "<a href=\"$link\">";
         }
     }
-    $result .= "$curMarkerBegin$linkopen$title$partLabel$linkclose$curMarkerEnd$editmapLink$nonLinkedText</td>";
+    $result .= "$curMarkerBegin$title$partLabel$curMarkerEnd$linkclose$editmapLink$nonLinkedText</td>";
 
     return $result;
 }
@@ -1379,13 +1380,17 @@ sub cmp_title {
 sub render {
     my $args = shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
-    my $result = '';
     # Configure the renderer.
     my $cols = $args->{'cols'};
     if (!defined($cols)) {
         # no columns, no nav maps.
         return '';
     }
+    my $legend = '';
+    my $tools = '';
+    my $result = '';
+    my $tools_printed = 0;
+    my $tablestarted = 0;
     my $navmap;
     if (defined($args->{'navmap'})) {
         $navmap = $args->{'navmap'};
@@ -1572,10 +1577,15 @@ sub render {
     my $curRes;
     my $foundJump = 0;
     my $counter = 0;
-    
+
     while (($curRes = $mapIterator->next()) && !$foundJump) {
         if (ref($curRes)) { $counter++; }
-        
+        # Speed up display after course initialization
+        # when $jump is empty. Note: we still need
+        # $counter to be 1 in that case if there is at
+        # least one resource.
+        last if (($jump eq '') && ($counter));
+
         if (ref($curRes) && $jump eq $curRes->symb()) {
             
             # This is why we have to use the main iterator instead of the
@@ -1594,27 +1604,19 @@ sub render {
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-   
+
     # Print key?
     if ($printKey) {
-        $result .= '<table border="0" cellpadding="2" cellspacing="0">';
-        $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
-	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
-        if ($navmap->{LAST_CHECK}) {
-            $result .= 
-                '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('New discussion since').' '.
-                strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
-                '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').'<p>'.
-                '</td>'; 
-        } else {
-            $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').
-                '</td>'; 
-        }
-
-        $result .= '</tr></table>';
+        my $location = &Apache::loncommon::lonhttpdurl("/adm/lonMisc");
+        $legend = '<div class="LC_navtools">'."\n".
+                  '<span class="LC_middle LC_right">'.&mt('Key').':</span>'.
+                  '<span class="LC_middle LC_center">&nbsp;&nbsp;'.
+                  '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Unread Discussion').
+                  '&nbsp;&nbsp;'.
+                  '<img src="'.$location.'/feedback.gif" alt="" /> '.
+                  &mt('New message (click to open)').
+                  '</span></div>'.
+                  '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
     }
 
     if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
@@ -1634,9 +1636,9 @@ sub render {
                               "location.href='$link'",$text);
             }
 	} else {
-	    $result.= '<a href="'.$link.'">'.&mt($text).'</a>';
+	    $tools = '<a href="'.$link.'">'.&mt($text).'</a>';
 	}
-        $result .= "\n";
+        $tools .= "\n";
     }
 
     # Check for any unread discussions in all resources.
@@ -1648,7 +1650,7 @@ sub render {
 	my $time=time;
         my $submit = &mt($markread);
         my $querystr = &HTML::Entities::encode($ENV{'QUERY_STRING'},'<>&"');
-	$result .= (<<END);
+	$tools .= (<<END);
     <form name="clearbubbles" method="post" action="/adm/feedback" aria-hidden="true">
 	<input type="hidden" name="navurl" value="$querystr" />
 	<input type="hidden" name="navtime" value="$time" />
@@ -1665,12 +1667,12 @@ END
 	    }
 	    if ($totdisc > 0) {
 		$haveDisc =~ s/:$//;
-		$result .= (<<END);
+		$tools .= (<<END);
 	<input type="hidden" name="navmaps" value="$haveDisc" />
 END
             }
 	}
-	$result .= <<END;
+	$tools .= <<END;
         <input type="submit" value="$submit" class="LC_visually_hidden" tabindex="-1" disabled="disabled" />
     </form>
 END
@@ -1695,23 +1697,15 @@ END
     }
 
     if ($args->{'caller'} eq 'navmapsdisplay') {
-        $result .= &show_linkitems_toolbar($args,$condition);
+        $tools .= &show_linkitems_toolbar($args,$condition);
     } elsif ($args->{'sort_html'}) { 
-        $result.=$args->{'sort_html'}; 
+        $tools .= $args->{'sort_html'}; 
     }
 
-    #$result .= "<br />\n";
-    if ($r) {
-        $r->print($result);
-        $r->rflush();
-        $result = "";
-    }
+    #$tools .= "<br />\n";
     # End parameter setting
-    
-    $result .= "<br />\n";
 
     # Data
-    $result.=&Apache::loncommon::start_data_table("LC_tableOfContent");    
 
     my $res = "Apache::lonnavmaps::resource";
     my %condenseStatuses =
@@ -1723,7 +1717,8 @@ END
     $args->{'counter'} = 0; # counts the rows
     $args->{'indentLevel'} = 0;
     $args->{'isNewBranch'} = 0;
-    $args->{'condensed'} = 0;   
+    $args->{'condensed'} = 0;
+    $args->{'deeplinknolist'} = 0;
 
     my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif");
     $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' alt='' />");
@@ -1898,6 +1893,9 @@ END
 
         # If this has been filtered out, continue on
         if (!(&$filterFunc($curRes))) {
+            if (!$userCanSeeHidden && !$curRes->randomout && $curRes->deeplinkout) {
+                $args->{'deeplinknolist'} ++;
+            }
             $args->{'isNewBranch'} = 0; # Don't falsely remember this
             next;
         } 
@@ -1922,6 +1920,7 @@ END
                     if ($userCanSeeHidden) {
                         $args->{'mapHiddenDeepLink'} = 1;
                     } else {
+                        $args->{'deeplinknolist'} ++;
                         next;
                     }
                 } else {
@@ -1931,6 +1930,7 @@ END
                         if ($userCanSeeHidden) {
                             $args->{'mapUnlisted'} = 1;
                         } else {
+                            $args->{'deeplinknolist'} ++;
                             next;
                         }
                     }
@@ -1944,6 +1944,16 @@ END
         }
 
         $args->{'counter'}++;
+        unless ($tablestarted) {
+            $result.=&Apache::loncommon::start_data_table("LC_tableOfContent").
+                     &Apache::loncommon::start_data_table_header_row('LC_visually_hidden').
+                     '<th>'.&mt('Resource or Folder').'</th>'.
+                     '<th>'.&mt('Alerts').'</th>'.
+                     '<th>'.&mt('Status Icon').'</th>'.
+                     '<th>'.&mt('Date/Completion Status').'</th>'.
+                     &Apache::loncommon::end_data_table_row()."\n";
+                     $tablestarted = 1;
+        }
 
         # Does it have multiple parts?
         $args->{'multipart'} = 0;
@@ -2094,6 +2104,12 @@ END
         }
 
         if ($r && $rownum % 20 == 0) {
+            unless ($tools_printed) {
+                $r->print($legend.$tools);
+                $legend = "";
+                $tools = "";
+                $tools_printed = 1;
+            }
             $r->print($result);
             $result = "";
             $r->rflush();
@@ -2109,7 +2125,9 @@ END
 	}
     }
 
-    $result.=&Apache::loncommon::end_data_table();
+    if ($tablestarted) {
+        $result .= &Apache::loncommon::end_data_table();
+    }
     
     # Print out the part that jumps to #curloc if it exists
     # delay needed because the browser is processing the jump before
@@ -2127,12 +2145,23 @@ if (location.href.indexOf('#curloc')==-1
     }
 
     if ($r) {
+        unless ($tools_printed) {
+            if (($args->{'counter'}) || ($userCanSeeHidden) ||
+                (($args->{'caller'} eq 'navmapsdisplay') &&
+                 ($env{'form.showOnlyHomework'} ||
+                  $ENV{QUERY_STRING} =~ /^jumpToFirstHomework/))) {
+                $r->print($legend.$tools);
+            }
+            $legend = "";
+            $tools = "";
+            $tools_printed = 1;
+        }
         $r->print($result);
         $result = "";
         $r->rflush();
     }
         
-    return $result;
+    return $legend.$tools.$result;
 }
 
 sub add_linkitem {
@@ -2148,14 +2177,12 @@ sub show_linkitems_toolbar {
         if (ref($args->{'linkitems'}) eq 'HASH') {
             my $numlinks = scalar(keys(%{$args->{'linkitems'}}));
             if ($numlinks > 1) {
-                $result = '<td>'.
+                $result = '<div class="LC_navtools">'.
                           &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',
                                                              undef,'RAT').
-                          '</td>'.
-                          '<td>&nbsp;</td>'.
-                          '<td class="LC_middle">'.&mt('Tools:').'</td>';
+                          '</div><div class="LC_navtools">&nbsp;'.&mt('Tools:').'</div>';
             }
-            $result .= '<td align="left">'."\n".
+            $result .= '<div class="LC_navtools">'."\n".
                        '<ul id="LC_toolbar">';
             my @linkorder = ('firsthomework','everything','uncompleted',
                              'changefolder','clearbubbles','printout','edittoplevel');
@@ -2183,19 +2210,21 @@ sub show_linkitems_toolbar {
                 }
             }
             $result .= '</ul>'.
-                       '</td>';
+                       '</div>';
             if (($numlinks==1) && (exists($args->{'linkitems'}{'edittoplevel'}))) {
-                $result .= '<td><a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
-                           &mt('Content Editor').'</a></td>';
+                $result .= '<div class="LC_navtools">'.
+                           '&nbsp;<a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
+                           &mt('Content Editor').'</a></div>';
             }
         }
         if ($args->{'sort_html'}) {
-            $result .= '<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
-                       '<td align="right">'.$args->{'sort_html'}.'</td>';
+            $result .= '<div class="LC_navtools">&nbsp;&nbsp;&nbsp;'.
+                       $args->{'sort_html'}.'</div>';
         }
     }
     if ($result) {
-        $result = "<table><tr>$result</tr></table>";
+        $result = '<div class="LC_navtools">'.$result.'</div>'."\n".
+                  '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
     }
     return $result;
 }
@@ -3059,7 +3088,7 @@ sub parmval_real {
 }
 
 sub recurseup_maps {
-    my ($self,$mapname,$getsymb) = @_;
+    my ($self,$mapname,$getsymb,$inclusive) = @_;
     my @recurseup;
     if ($mapname) {
         my $res = $self->getResourceByUrl($mapname);
@@ -3073,6 +3102,13 @@ sub recurseup_maps {
                     @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->src()); } reverse(@pcs);
                 }
             }
+            if ($inclusive) {
+                if ($getsymb) {
+                    unshift(@recurseup,$res->symb());
+                } else {
+                    unshift(@recurseup,$mapname);
+                }
+            }
         }
     }
     return @recurseup;