--- loncom/html/res/adm/pages/menu.html	2003/05/23 16:37:30	1.98
+++ loncom/html/res/adm/pages/menu.html	2003/06/06 00:42:14	1.101
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.98 2003/05/23 16:37:30 www Exp $
+// $Id: menu.html,v 1.101 2003/06/06 00:42:14 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -138,11 +138,19 @@ function advanceclock() {
     setTimeout('advanceclock();',1000);
 }
 
+function windowloaded(wname) {
+   if (wname=='loncapaclient') { noclient=0; }
+}
+
+function windowunloaded(wname) {
+   if (wname=='loncapaclient') { noclient=1;}
+}
+
 function windowcheck() {
    if (noclient || (clientwindow==null || clientwindow.closed)) {
       clientwindow=window.open("http://"+clienthost+"/",'',
       "height=400,width=440,"+
-      "scrollbars=1,toolbar=1,status=1,resizable=1,location=1,"+
+      "scrollbars=1,toolbar=1,status=1,resizable=1,location=1,menubar=1,"+
       "left=190,top=15,screenX=190,screenY=15"); 
    }
    clientwindow.name='loncapaclient';
@@ -176,7 +184,7 @@ function logout () {
           lonchat.close();
       }
       if (autologout) {
-         clientwindow.window.location.href="http://"+clienthost+"/adm/logout";
+         go("/adm/logout");
       }
 }
 
@@ -277,10 +285,14 @@ function go(url) {
    statuslocked=0;
    this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
    if (url!='' && url!= null) {
-       currentURL = null;
-       currentSymb= null;
-       clientwindow.window.location.href="http://"+clienthost+url;
-       noclient=0;
+      currentURL = null;
+      currentSymb= null;
+      this.document.server.action="http://"+clienthost+url;
+      this.document.server.postdata.value='';
+      this.document.server.command.value='';
+      this.document.server.url.value='';
+      this.document.server.postsymb.value='';
+      this.document.server.submit();
    }
 }
 
@@ -295,7 +307,6 @@ function gopost(url,postdata) {
       this.document.server.url.value='';
       this.document.server.postsymb.value='';
       this.document.server.submit();
-      noclient=0;
    }
 }
 
@@ -310,7 +321,6 @@ function gocmd(url,cmd) {
       this.document.server.url.value=currentURL;
       this.document.server.postsymb.value=currentSymb;
       this.document.server.submit();
-      noclient=0;
    }
 }