--- loncom/html/res/adm/pages/menu.html	2000/10/02 18:51:53	1.6
+++ 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 Gerd Kortemeyer
+10/2,10/3,10/4,10/17 Gerd Kortemeyer
 -->
 <head>
 <title>LON-CAPA Remote</title>
@@ -25,11 +25,15 @@ function windowcheck() {
    if (clientwindow.closed) {
       clientwindow=window.open("http://"+clienthost+"/"); 
    }
+   clientwindow.name='loncapaclient';
 }
 
 function logout () {
    windowcheck();
-   clientwindow.window.location.href="http://"+clienthost+"/adm/logout";
+   if (clientwindow.status!='MenuControl:nologout')
+   {   
+      clientwindow.window.location.href="http://"+clienthost+"/adm/logout";
+   }
 }
 
 function display(utext,ltext) {
@@ -66,17 +70,32 @@ function setstatus(tp,bt) {
 }
 
 function go(url) {
+   windowcheck();
+   this.document['led'].src="ledsend.gif";
+   if (url!='') {
+       clientwindow.window.location.href="http://"+clienthost+url;
+   }
+}
+
+function gopost(url,postdata) {
+   windowcheck();
    this.document['led'].src="ledsend.gif";
    if (url!='') {
-         clientwindow.window.location.href="http://"+clienthost+url;
+      this.document.server.action="http://"+clienthost+url;
+      this.document.server.postdata.value=postdata;
+      this.document.server.submit();
    }
 }
 
 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="<html><body onload='Javascript:document.goannotate.submit();'>";
+   anstr+="<form name='goannotate' target='Annotator' method='post' action='/adm/annotations'>";
+   anstr+="<input type='hidden' name='urlnew' value='"+clientwindow.location.href+"'>";
+   anstr+="</form></body></html>";
+   anndoc.write(anstr);
+   anndoc.close();
 }
 
 function set_bookmark() {
@@ -200,7 +219,7 @@ function edit_bookmarks() {
 
 <MAP NAME="endmenuMap">
    <AREA SHAPE="rect" COORDS="76,1,131,19"
-          href="javascript:window.close();"
+          href="javascript:logout();"
           onMouseOver="display('logout','');"
     >
     <AREA SHAPE="rect" COORDS="39,0,69,19"
@@ -219,23 +238,28 @@ function edit_bookmarks() {
 
 <MAP NAME="navmenuMap">
     <AREA SHAPE="rect" COORDS="86,24,110,80"
-          href="javascript:go('');"
+          href="javascript:windowcheck();gopost('/adm/flip',
+                               'forward:'+clientwindow.window.location.href);"
           onMouseOver="display('go','forward');"
     >
     <AREA SHAPE="rect" COORDS="20,23,44,81"
-          href="javascript:go('');"
+          href="javascript:windowcheck();gopost('/adm/flip',
+                               'back:'+clientwindow.window.location.href);"
           onMouseOver="display('go','back');"
     >
     <AREA SHAPE="rect" COORDS="35,72,95,97"
-          href="javascript:go('');"
+          href="javascript:windowcheck();gopost('/adm/flip',
+                               'down:'+clientwindow.window.location.href);"
           onMouseOver="display('go level','down');"
     >
     <AREA SHAPE="rect" COORDS="36,7,94,31"
-          href="javascript:go('');"
+          href="javascript:windowcheck();gopost('/adm/flip',
+                               'up:'+clientwindow.window.location.href);"
           onMouseOver="display('go level','up');"
     >
     <AREA SHAPE="circle" COORDS="64,51,21"
-          href="javascript:go('');"
+          href="javascript:windowcheck();gopost('/adm/flip',
+                               'return:'+clientwindow.window.location.href);"
           onMouseOver="display('return','location');"
     >
     <AREA SHAPE="polygon" COORDS="2,2,42,2,2,42"
@@ -259,7 +283,9 @@ function edit_bookmarks() {
          onMouseOver="defdis()";
     >
 </MAP>
-
+<form name='server' action='/adm/logout' method='post' target='loncapaclient'>
+<input type='hidden' name='postdata' value='none'>
+</form>
 </body>
 </html>
 
