--- rat/lonsequence.pm	2018/04/14 02:29:57	1.49
+++ rat/lonsequence.pm	2020/09/03 12:14:30	1.52
@@ -2,7 +2,7 @@
 #
 # Sequence Handler
 #
-# $Id: lonsequence.pm,v 1.49 2018/04/14 02:29:57 raeburn Exp $
+# $Id: lonsequence.pm,v 1.52 2020/09/03 12:14:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -246,29 +246,40 @@ sub handler {
                }
            }
 
+           &Apache::loncommon::content_type($r,'text/html');
+           $r->send_http_header;
+
+           my $mapurl = &Apache::lonnet::declutter($requrl);
+           my $maptitle = &Apache::lonnet::gettitle($mapurl);
+           my @crumbs = ({text => $maptitle, no_mt => 1});
+           my $args = {'bread_crumbs' => \@crumbs,
+                       'bread_crumbs_nomenu' => 1};
+
            # Create the nav map
            my $navmap = Apache::lonnavmaps::navmap->new();
 
            if (ref($navmap)) {
                # renderer call
                if (&Apache::lonnet::is_on_map($requrl)) {
-                   my $ltiscope;
+                   my ($ltiscope,$ltiuri);
                    if (($env{'request.lti.login'}) && ($env{'request.lti.uri'})) {
                        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
                        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                       ($ltiscope) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum);
+                       ($ltiscope,$ltiuri) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum);
                    }
-                   my $mapurl = &Apache::lonnet::declutter($requrl);
-                   my @crumbs;
-                   unless (($ltiscope eq 'resource') || ($ltiscope eq 'map')) {
-                       @crumbs = ({text  => $crstype.' Contents',
-                                   href  => "javascript:gopost('/adm/navmaps','')"});
+                   @crumbs = ();
+                   unless ($ltiscope eq 'resource') {
+                       unless ($ltiscope eq 'map') {
+                           @crumbs = ({text  => $crstype.' Contents',
+                                       href  => "javascript:gopost('/adm/navmaps','')"});
+                       }
                        my $res = $navmap->getResourceByUrl($mapurl);
                        if (ref($res)) {
                            my $symb = $res->symb();
                            if ($symb) {
                                my ($parent) = &Apache::lonnet::decode_symb($res->symb());
-                               if ($parent ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
+                               if (($parent ne $env{'course.'.$env{'request.course.id'}.'.url'}) &&
+                                   !(($ltiscope eq 'map') && ($requrl eq $ltiuri))) {
                                    my @mapcrumbs = $navmap->recursed_crumbs($parent);
                                    if (@mapcrumbs) {
                                        push(@crumbs,@mapcrumbs);
@@ -278,13 +289,9 @@ sub handler {
                            }
                        }
                    }
-                   my $maptitle = &Apache::lonnet::gettitle($mapurl);
                    push(@crumbs,{text => $maptitle, no_mt => 1});
-                   my $args = {'bread_crumbs' => \@crumbs,
-                               'bread_crumbs_nomenu' => 1};
-                   &Apache::loncommon::content_type($r,'text/html');
-                   $r->send_http_header;
-
+                   $args = {'bread_crumbs' => \@crumbs,
+                            'bread_crumbs_nomenu' => 1};
                    $r->print(&Apache::loncommon::start_page($maptitle,undef,$args));
 
                    my $renderArgs = { 'cols'                    => [0,1,2,3],
@@ -304,14 +311,27 @@ sub handler {
 
                    # If no resources were found let the user know.
                    if ($renderArgs->{'counter'} == 0) {
-                       $r->print("<p><span class=\"LC_info\">".
-                                 &mt("This folder is empty.")."</span></p>");
+                       $r->print('<p class="LC_info">'.
+                                 &mt('No items found in folder').
+                                 '</p>');
                    }
                    $r->print(&Apache::loncommon::end_page());
-                   $r->rflush();
-                   return OK;
+               } else {
+                   $r->print(&Apache::loncommon::start_page($maptitle,undef,$args).
+                             '<p class="LC_info">'.
+                             &mt('Folder no longer appears to be a part of the course').
+                             '</p>'.
+                             &Apache::loncommon::end_page());
                }
+           } else {
+               $r->print(&Apache::loncommon::start_page($maptitle,undef,$args).
+                         '<p class="LC_warning">'.
+                         &mt('Error: could not determine contents of folder').
+                         '</p>'.
+                         &Apache::loncommon::end_page());
            }
+           $r->rflush();
+           return OK;
        }
    }
 
@@ -397,8 +417,12 @@ sub handler {
       if ($is_encrypted) {
           $showdisurl = &Apache::lonenc::encrypted($disurl);
       }
-      &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid],
-				'last_known' => [$disurl,$dismapid]); 
+      if ($disurl =~ m{/adm/navmaps(\?|$)}) {
+          &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid]);
+      } else {
+          &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid],
+                                    'last_known' => [$disurl,$dismapid]);
+      }
       &Apache::loncommon::content_type($r,'text/html');
       $r->header_out(Location => &Apache::lonnet::absolute_url($ENV{'SERVER_NAME'}).
                                  $showdisurl);