--- loncom/html/res/adm/pages/menu.html	2000/10/04 23:01:52	1.9
+++ loncom/html/res/adm/pages/menu.html	2000/10/19 10:13:30	1.14
@@ -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,10/19 Gerd Kortemeyer
 -->
 <head>
 <title>LON-CAPA Remote</title>
@@ -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');
+   annotator.document.write(
+   "<html><body onload='Javascript:document.goannotate.submit();'>"
+  +"<form name='goannotate' target='Annotator' method='post' "
+  +"action='/adm/annotations'>"
+  +"<input type='hidden' name='urlnew' value='"+clientwindow.location.href+"'>"
+  +"</form></body></html>");
+   annotator.document.close();
 }
 
 function set_bookmark() {
@@ -110,6 +110,10 @@ function edit_bookmarks() {
                "BookmarkPal", "width=400,height=505,scrollbars=0");
 }
 
+function catalog_info() {
+   go('');
+   window.open(clientwindow.window.location.href+'.meta',"LONcatInfo");
+}
 </script>
 
 <center>
@@ -193,7 +197,7 @@ function edit_bookmarks() {
     >
 
     <AREA SHAPE="rect" COORDS="4,30,34,48"
-         href="javascript:go('');"
+         href="javascript:catalog_info('');"
           onMouseOver="display('catalog','info');"
     >
 
@@ -219,7 +223,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"
@@ -238,27 +242,28 @@ function edit_bookmarks() {
 
 <MAP NAME="navmenuMap">
     <AREA SHAPE="rect" COORDS="86,24,110,80"
-          href="javascript:gopost('/adm/flip',
+          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:gopost('/adm/flip',
+          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:gopost('/adm/flip',
+          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:gopost('/adm/flip',
+          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:');"
           onMouseOver="display('return','location');"
     >
     <AREA SHAPE="polygon" COORDS="2,2,42,2,2,42"
