--- loncom/html/res/adm/pages/menu.html	2000/10/04 23:01:52	1.9
+++ loncom/html/res/adm/pages/menu.html	2000/10/05 15:31:42	1.10
@@ -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();
@@ -219,7 +215,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,22 +234,22 @@ 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');"
     >