--- loncom/interface/lonnavmaps.pm	2023/04/04 23:15:48	1.563
+++ loncom/interface/lonnavmaps.pm	2025/01/31 16:07:31	1.568
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.563 2023/04/04 23:15:48 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.568 2025/01/31 16:07:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1120,7 +1120,7 @@ sub render_resource {
     }
 
     # Decide what to display
-    $result .= "$newBranchText$linkopen$icon$linkclose";
+    $result .= "$newBranchText$linkopen$icon";
     
     my $curMarkerBegin = '';
     my $curMarkerEnd = '';
@@ -1160,7 +1160,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;
 }
@@ -1641,17 +1641,19 @@ sub render {
 
     # Check for any unread discussions in all resources.
     if (($args->{'caller'} eq 'navmapsdisplay') && (!$args->{'notools'})) {
+        my $markread = 'Mark all posts read';
 	&add_linkitem($args->{'linkitems'},'clearbubbles',
 		      'document.clearbubbles.submit()',
-		      'Mark all posts read');
+		      $markread);
 	my $time=time;
+        my $submit = &mt($markread);
         my $querystr = &HTML::Entities::encode($ENV{'QUERY_STRING'},'<>&"');
 	$result .= (<<END);
-    <form name="clearbubbles" method="post" action="/adm/feedback">
+    <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" />
 END
-        if ($args->{'sort'} eq 'discussion') { 
+        if ($args->{'sort'} eq 'discussion') {
 	    my $totdisc = 0;
 	    my $haveDisc = '';
 	    my @allres=$navmap->retrieveResources();
@@ -1665,11 +1667,13 @@ END
 		$haveDisc =~ s/:$//;
 		$result .= (<<END);
 	<input type="hidden" name="navmaps" value="$haveDisc" />
-    </form>
 END
             }
 	}
-	$result.='</form>';
+	$result .= <<END;
+        <input type="submit" value="$submit" class="LC_visually_hidden" tabindex="-1" disabled="disabled" />
+    </form>
+END
     }
     if (($args->{'caller'} eq 'navmapsdisplay') && ($env{'request.course.id'})) {
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -2286,10 +2290,17 @@ sub new {
 
     $self->{USERNAME} = shift || $env{'user.name'};
     $self->{DOMAIN}   = shift || $env{'user.domain'};
+    $self->{SECTION}  = shift;
     $self->{CODE}     = shift;
-    $self->{NOHIDE} = shift;
+    $self->{NOHIDE}   = shift;
 
 
+    if (($self->{SECTION} eq '') && ($env{'request.course.sec'} ne '')) {
+        if (($self->{USERNAME} eq $env{'user.name'}) &&
+            ($self->{USERNAME} eq $env{'user.domain'})) {
+            $self->{SECTION} = $env{'request.course.sec'};
+        }
+    }
 
     # Resource cache stores navmap resources as we reference them. We generate
     # them on-demand so we don't pay for creating resources unless we use them.
@@ -2331,7 +2342,7 @@ sub new {
 	$self->{PARM_HASH} = \%parmhash;
 	$self->{PARM_CACHE} = {};
     } else {
-	$self->change_user($self->{USERNAME}, $self->{DOMAIN},  $self->{CODE}, $self->{NOHIDE});
+	$self->change_user($self->{USERNAME}, $self->{DOMAIN}, $self->{SECTION}, $self->{CODE}, $self->{NOHIDE});
     }
 
     return $self;
@@ -2342,15 +2353,17 @@ sub new {
 # username/domain associated with a navmap (e.g. to navigate for someone
 # else besides the current user...if sufficiently privileged.
 # Parameters:
-#    user  - New user.
-#    domain- Domain the user belongs to.
-#    code  - Anonymous CODE in use.
+#    user    - New user.
+#    domain  - Domain to which the user belongs.
+#    section - Section to which the user belongs.
+#    code    - Anonymous CODE in use.
 # Implicit inputs:
 #   
 sub change_user {
     my $self = shift;
     $self->{USERNAME} = shift;
     $self->{DOMAIN}   = shift;
+    $self->{SECTION}  = shift;
     $self->{CODE}     = shift;
     $self->{NOHIDE}   = shift;
 
@@ -2857,7 +2870,7 @@ sub parmval_real {
     $self->generate_course_user_opt();
 
     my $cid=$env{'request.course.id'};
-    my $csec=$env{'request.course.sec'};
+    my $csec=$self->{SECTION};
     my $cgroup='';
     my @cgrps=split(/:/,$env{'request.course.groups'});
     if (@cgrps > 0) {
@@ -3046,7 +3059,7 @@ sub parmval_real {
 }
 
 sub recurseup_maps {
-    my ($self,$mapname) = @_;
+    my ($self,$mapname,$getsymb) = @_;
     my @recurseup;
     if ($mapname) {
         my $res = $self->getResourceByUrl($mapname);
@@ -3054,7 +3067,11 @@ sub recurseup_maps {
             my @pcs = split(/,/,$res->map_hierarchy());
             shift(@pcs);
             if (@pcs) {
-                @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->src()); } reverse(@pcs);
+                if ($getsymb) {
+                    @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->symb()); } reverse(@pcs);
+                } else {
+                    @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->src()); } reverse(@pcs);
+                }
             }
         }
     }
@@ -3182,7 +3199,7 @@ sub get_mapparam {
     # Get the course id and section if there is one.
 
     my $cid=$env{'request.course.id'};
-    my $csec=$env{'request.course.sec'};
+    my $csec=$self->{SECTION};
     my $cgroup='';
     my @cgrps=split(/:/,$env{'request.course.groups'});
     if (@cgrps > 0) {
@@ -3383,11 +3400,11 @@ sub getcourseparam {
 
     my $uname = $self->{USERNAME};
     my $udom  = $self->{DOMAIN};
+    my $csec  = $self->{SECTION};
     
-    # Course, section, group ids come from the env:
+    # Course and group ids come from the env:
 
     my $cid   = $env{'request.course.id'};
-    my $csec  = $env{'request.course.sec'};
     my $cgroup = '';		# Assume no group
 
     my @cgroups = split(/:/, $env{'request.course.groups'});
@@ -5245,7 +5262,7 @@ sub weight {
     my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
                                 $self->{SYMB}, $self->{DOMAIN},
                                 $self->{USERNAME},
-                                $env{'request.course.sec'});
+                                $self->{SECTION});  
     return $weight;
 }
 sub part_display {