--- loncom/html/res/adm/pages/menu.html	2003/05/28 13:34:45	1.100
+++ loncom/html/res/adm/pages/menu.html	2003/08/15 21:40:47	1.106
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.100 2003/05/28 13:34:45 www Exp $
+// $Id: menu.html,v 1.106 2003/08/15 21:40:47 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -59,7 +59,6 @@ var currentSymb='';
 var reloadSymb='';
 var currentStale=1;
 var menucltim;
-var noclient=0;
 
 var clockdelta=0;
 
@@ -138,24 +137,14 @@ 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)) {
+   if (clientwindow==null || clientwindow.closed) {
       clientwindow=window.open("http://"+clienthost+"/",'',
       "height=400,width=440,"+
       "scrollbars=1,toolbar=1,status=1,resizable=1,location=1,menubar=1,"+
       "left=190,top=15,screenX=190,screenY=15"); 
+      clientwindow.name='loncapaclient';
    }
-   clientwindow.name='loncapaclient';
-   clientwindow.menuwindow=self;
-   noclient=0;
    extenddispclose();
 }
 
@@ -184,7 +173,7 @@ function logout () {
           lonchat.close();
       }
       if (autologout) {
-         clientwindow.window.location.href="http://"+clienthost+"/adm/logout";
+         go("/adm/logout");
       }
 }
 
@@ -285,24 +274,36 @@ 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;
-       clientwindow.name='loncapaclient';
+      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();
    }
 }
 
-function gopost(url,postdata) {
+function gopost(url,postdata,makenewwin) {
    windowcheck();
    statuslocked=0;
    this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
    if (url!='') {
+      if (makenewwin) {
+         var LONcomWin=window.open("http://"+clienthost+"/adm/rat/empty.html",
+                       'LONcom',
+                       "height=400,width=540,"+
+      "scrollbars=1,toolbar=0,status=0,resizable=1,location=0,menubar=0"); 
+         this.document.server.target='LONcom';
+      }
       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.submit();
+      this.document.server.target='loncapaclient';
    }
 }
 
@@ -432,13 +433,13 @@ function edit_bookmarks() {
 function catalog_info() {
    go('');
    w_LONcatInfo_flag=1;
-   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"cat",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }
 
 function chat_win() {
    go('');
    w_LONchat_flag=1;
-   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
 }
 // -->
 </script>