--- loncom/html/res/adm/pages/menu.html	2004/08/13 20:12:11	1.112
+++ loncom/html/res/adm/pages/menu.html	2004/12/23 19:16:09	1.115
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.112 2004/08/13 20:12:11 albertel Exp $
+// $Id: menu.html,v 1.115 2004/12/23 19:16:09 albertel Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -250,6 +250,7 @@ function go(url) {
    if (url!='' && url!= null) {
       currentURL = null;
       currentSymb= null;
+      this.document.server.target='loncapaclient';
       this.document.server.action="http://"+clienthost+url;
       this.document.server.postdata.value='';
       this.document.server.command.value='';
@@ -260,21 +261,20 @@ function go(url) {
 }
 
 function gonav(url) {
-   if (w_loncapanav_flag != 1) {
-      go(url);
-   }  else {
+   if (w_loncapanav_flag == 1) {
       navwindowcheck();
       statuslocked=0;
-      this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
-      if (url!='' && url!= null) {
-         this.document.server.action="http://"+clienthost+url;
-         this.document.server.target="loncapanav";
-         this.document.server.postdata.value='';
-         this.document.server.command.value='';
-         this.document.server.url.value='';
-         this.document.server.postsymb.value='';
-         this.document.server.submit();
-      }
+      this.document.server.target="loncapanav";
+   }	 
+   
+   this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
+   if (url!='' && url!= null) {
+       this.document.server.action="http://"+clienthost+url;
+       this.document.server.postdata.value=currentURL;
+       this.document.server.command.value='';
+       this.document.server.url.value='';
+       this.document.server.postsymb.value=currentSymb;
+       this.document.server.submit();
    }
 }
 
@@ -289,13 +289,14 @@ function gopost(url,postdata,makenewwin)
                        "height=400,width=540,"+
       "scrollbars=1,toolbar=0,status=0,resizable=1,location=0,menubar=0"); 
          this.document.server.target='LONcom';
+      } else {
+         this.document.server.target='loncapaclient';
       }
       this.document.server.action="http://"+clienthost+url;
       this.document.server.postdata.value=postdata;
       this.document.server.command.value='';
       this.document.server.url.value='';
       this.document.server.postsymb.value='';
-      this.document.server.target='loncapaclient';
       this.document.server.submit();
    }
 }
@@ -305,6 +306,7 @@ function gocmd(url,cmd) {
    statuslocked=0;
    this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
    if (url!='') {
+      this.document.server.target='loncapaclient';
       this.document.server.action="http://"+clienthost+url;
       this.document.server.postdata.value='';
       this.document.server.command.value=cmd;
@@ -481,6 +483,9 @@ function showdisplay(utext,ltext) {
 }
 //-->
 </script>
+<display>
+return '<script type="text/javascript">w_loncapanav_flag=\''.('on' eq &EXT('user.environment.remotenavmap')).'\';</script>';
+</display>
 </block>
 <block condition="&EXT('request.browser.textremote')">
 <script type="text/javascript">