--- loncom/interface/lonnavdisplay.pm	2017/11/16 13:41:56	1.35
+++ loncom/interface/lonnavdisplay.pm	2021/02/18 14:48:02	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.35 2017/11/16 13:41:56 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.38 2021/02/18 14:48:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::londocs();
 use Apache::lonuserstate;
+use LONCAPA::ltiutils;
 
 sub handler {
     my $r = shift;
@@ -87,7 +88,7 @@ sub real_handler {
         my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
                        '<br />'.
                        &mt('Your course session is being updated because of recent changes by course personnel.').
-                       ' '.&mt('Please be patient.').'<br /></div>'.
+                       ' '.&mt('Please be patient').'.<br /></div>'.
                        '<div style="padding:0;clear:both;margin:0;border:0"></div>';
         $closure = <<ENDCLOSE;
 <script type="text/javascript">
@@ -100,7 +101,7 @@ ENDCLOSE
         &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
         $r->rflush();
         my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);
-        &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));
+        &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
         if ($ferr) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());
@@ -125,6 +126,20 @@ ENDCLOSE
         }
     }
 
+    if ($env{'request.lti.login'}) {
+        if ($env{'request.lti.uri'} ne '') {
+            my $cid = $env{'request.course.id'};
+            my $cnum = $env{'course.'.$cid.'.num'};
+            my $cdom = $env{'course.'.$cid.'.domain'};
+            my ($scope,$url) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum);
+            if (($scope eq 'map') || ($scope eq 'resource')) {
+                &Apache::loncommon::content_type($r,'text/html');
+                $r->header_out(Location => $url);
+                return REDIRECT;
+            }
+        }
+    }
+
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
 
@@ -242,7 +257,7 @@ ENDCLOSE
                      ."</span>");
         }
     } else {
-        my $link = 'navmaps?jumpToFirstHomework';
+        my $link = '/adm/navmaps?jumpToFirstHomework';
         if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'}; 
         }
@@ -265,7 +280,7 @@ ENDCLOSE
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
-        my $link = 'navmaps?sort='.$env{'form.sort'};
+        my $link = '/adm/navmaps?sort='.$env{'form.sort'};
         if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};
         }
@@ -277,7 +292,7 @@ ENDCLOSE
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
-        my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
+        my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
         if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};
         }