--- loncom/interface/lonnavmaps.pm	2005/07/15 05:20:37	1.334
+++ loncom/interface/lonnavmaps.pm	2005/08/02 20:51:18	1.335
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.334 2005/07/15 05:20:37 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.335 2005/08/02 20:51:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -208,6 +208,20 @@ ENDSUBM
     if ($ENV{QUERY_STRING} eq 'launchExternal') {
 	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
 	&Apache::lonnet::appenv('environment.remotenavmap' => 'on');
+ 	my $menu=&Apache::lonmenu::reopenmenu();
+	my $navstatus=&Apache::lonmenu::get_nav_status();
+	if ($menu) {
+	    $r->print(<<MENU);
+             <script type="text/javascript">
+             swmenu=$menu
+             swmenu.clearTimeout(swmenu.menucltim);
+	     $navstatus
+             </script>
+MENU
+        }
+   }
+    if ($ENV{QUERY_STRING} eq 'turningOffExternal') {
+	$env{'environment.remotenavmap'}='off';
     }
 
     # Create the nav map
@@ -290,7 +304,7 @@ ENDSUBM
 
     if ($ENV{QUERY_STRING} eq 'launchExternal') {
 	$r->print('
-          <form name="returnwin" action="/adm/flip?postdata=return%3a" 
+          <form name="returnwin" action="/adm/flip?postdata=navlaunch%3a" 
                 method="post" target="loncapaclient">
           </form>');
 	$r->print('
@@ -1164,7 +1178,11 @@ sub render_communication_status {
     my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
 
     my $link = $params->{"resourceLink"};
-    my $linkopen = "<a href='$link'>";
+    my $target;
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$target=' target="loncapaclient" ';
+    }
+    my $linkopen = "<a $target href='$link'>";
     my $linkclose = "</a>";
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
@@ -1177,7 +1195,7 @@ sub render_communication_status {
         my $feedback = $resource->getFeedback();
         foreach (split(/\,/, $feedback)) {
             if ($_) {
-                $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
+                $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
                     . '<img src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
@@ -1192,7 +1210,7 @@ sub render_communication_status {
             last if ($errorcount>=10); # Only output 10 bombs maximum
             if ($_) {
                 $errorcount++;
-                $errorHTML .= '&nbsp;<a href="/adm/email?display='
+                $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
                     . '<img src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
@@ -1214,7 +1232,11 @@ sub render_quick_status {
         $params->{'multipart'} && $part eq "0";
 
     my $link = $params->{"resourceLink"};
-    my $linkopen = "<a href='$link'>";
+    my $target;
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$target=' target="loncapaclient" ';
+    }
+    my $linkopen = "<a $target href='$link'>";
     my $linkclose = "</a>";
 
     if ($resource->is_problem() &&