--- loncom/html/res/adm/pages/menu.html 2003/05/23 13:56:39 1.97 +++ loncom/html/res/adm/pages/menu.html 2003/06/15 18:21:00 1.103 @@ -4,7 +4,7 @@ The LearningOnline Network with CAPA Remote Control // -// $Id: menu.html,v 1.97 2003/05/23 13:56:39 www Exp $ +// $Id: menu.html,v 1.103 2003/06/15 18:21:00 www Exp $ // // Copyright Michigan State University Board of Trustees // @@ -59,7 +59,6 @@ var currentSymb=''; var reloadSymb=''; var currentStale=1; var menucltim; -var noclient=1; var clockdelta=0; @@ -139,15 +138,13 @@ function advanceclock() { } 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,"+ + "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(); } @@ -176,7 +173,7 @@ function logout () { lonchat.close(); } if (autologout) { - clientwindow.window.location.href="http://"+clienthost+"/adm/logout"; + go("/adm/logout"); } } @@ -277,9 +274,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; + 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(); } } @@ -423,7 +425,7 @@ 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() {