--- loncom/html/res/adm/pages/menu.html 2000/10/04 23:01:52 1.9 +++ loncom/html/res/adm/pages/menu.html 2000/10/17 17:03:21 1.12 @@ -4,7 +4,7 @@ The LearningOnline Network with CAPA Remote Control 6/12/00,6/13,6/14,6/15 Gerd Kortemeyer Sept Ben Tyszka -10/2,10/3,10/4 Gerd Kortemeyer +10/2,10/3,10/4,10/17 Gerd Kortemeyer --> LON-CAPA Remote @@ -29,13 +29,9 @@ function windowcheck() { } function logout () { - if (( - clientwindow.window.location.href!="http://"+clienthost+"/adm/logout" - ) && ( - clientwindow.window.location.href!="http://"+clienthost+"/adm/authenticate" - )) - { - windowcheck(); + windowcheck(); + if (clientwindow.status!='MenuControl:nologout') + { clientwindow.window.location.href="http://"+clienthost+"/adm/logout"; } } @@ -74,17 +70,17 @@ function setstatus(tp,bt) { } function go(url) { + windowcheck(); this.document['led'].src="ledsend.gif"; if (url!='') { - windowcheck(); clientwindow.window.location.href="http://"+clienthost+url; } } function gopost(url,postdata) { + windowcheck(); this.document['led'].src="ledsend.gif"; if (url!='') { - windowcheck(); this.document.server.action="http://"+clienthost+url; this.document.server.postdata.value=postdata; this.document.server.submit(); @@ -92,10 +88,14 @@ function gopost(url,postdata) { } function annotate() { - go(''); - window.open("http://"+clienthost+"/adm/annotations?url_new=" - +clientwindow.location.href, "Annotator", - "width=365,height=265,scrollbars=0"); + annotator=window.open('','Annotator','width=365,height=265,scrollbars=0'); + anndoc=annotator.document; + anstr=""; + anstr+="
"; + anstr+=""; + anstr+="
"; + anndoc.write(anstr); + anndoc.close(); } function set_bookmark() { @@ -219,7 +219,7 @@ function edit_bookmarks() {