--- loncom/html/res/adm/pages/menu.html 2004/08/13 20:12:11 1.112 +++ loncom/html/res/adm/pages/menu.html 2007/04/24 23:26:15 1.120 @@ -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.120 2007/04/24 23:26:15 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,21 @@ 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"; + } else { + this.document.server.target="loncapaclient"; + } + 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(); } } @@ -286,16 +287,17 @@ function gopost(url,postdata,makenewwin) if (makenewwin) { var LONcomWin=window.open("http://"+clienthost+"/adm/rat/empty.html", 'LONcom', - "height=400,width=540,"+ + "height=600,width=600,"+ "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 +307,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; @@ -321,7 +324,7 @@ function annotate() { "" +"
" - +"" + +"" +"
"); annotator.document.close(); } @@ -402,13 +405,13 @@ function edit_bookmarks() { function catalog_info() { go(''); w_LONcatInfo_flag=1; - loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"cat",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); + loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"cat",'height=420,width=480,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,resizable=yes,location=no,menubar=no,toolbar=no'); + lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=420,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); } // --> @@ -481,6 +484,9 @@ function showdisplay(utext,ltext) { } //--> + +return ''; +