--- loncom/html/res/adm/pages/menu.html	2000/10/03 19:38:11	1.7
+++ loncom/html/res/adm/pages/menu.html	2001/01/03 16:45:55	1.15
@@ -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 Gerd Kortemeyer
+10/2,10/3,10/4,10/17,10/19,3/1/1 Gerd Kortemeyer
 -->
 <head>
 <title>LON-CAPA Remote</title>
@@ -30,7 +30,10 @@ function windowcheck() {
 
 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) {
@@ -67,28 +70,32 @@ 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.postdata=postdata;
       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');
+   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() {
@@ -103,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>
@@ -171,37 +182,40 @@ function edit_bookmarks() {
     >
 
     <AREA SHAPE="rect" COORDS="35,3,65,21"
-         href="javascript:go('');"
+         href="javascript:go('/adm/searchcat');"
           onMouseOver="display('search','catalog');"
     >
 
     <AREA SHAPE="rect" COORDS="66,3,96,21"
-         href="javascript:go('');"
+         href="javascript:gopost('/adm/feedback',
+                                 clientwindow.window.location.href);"
           onMouseOver="display('feedback','on this');"
     >
 
     <AREA SHAPE="rect" COORDS="97,3,127,21"
-         href="javascript:go('');"
+         href="javascript:go('/adm/preferences');"
           onMouseOver="display('my pre-','ferences');"
     >
 
     <AREA SHAPE="rect" COORDS="4,30,34,48"
-         href="javascript:go('');"
+         href="javascript:catalog_info('');"
           onMouseOver="display('catalog','info');"
     >
 
     <AREA SHAPE="rect" COORDS="35,30,65,48"
-         href="javascript:go('');"
+         href="javascript:gopost('/adm/printout',
+                                 clientwindow.window.location.href);"
           onMouseOver="display('prepare','printout');"
     >
 
     <AREA SHAPE="rect" COORDS="66,30,96,48"
-         href="javascript:go('');"
+         href="javascript:gopost('/adm/evaluate',
+                                 clientwindow.window.location.href);"
           onMouseOver="display('evaluate','this');"
     >
 
     <AREA SHAPE="rect" COORDS="97,30,127,48"
-         href="javascript:go('');"
+         href="javascript:go('/adm/assignments');"
           onMouseOver="display('assign-','ments');"
     >
     <area shape="default"
@@ -212,15 +226,15 @@ 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"
-          href="javascript:go('');"
+          href="javascript:go('/adm/mydesk');"
           onMouseOver="display('my desk','');"
     >
     <AREA SHAPE="rect" COORDS="1,1,30,19" 
-          href="javascript:go('');"
+          href="javascript:go('/adm/communicate');"
           onMouseOver="display('commu-','nication');"
     >
     <area shape="default"
@@ -231,25 +245,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: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:');"
           onMouseOver="display('return','location');"
     >
     <AREA SHAPE="polygon" COORDS="2,2,42,2,2,42"
@@ -261,7 +278,8 @@ function edit_bookmarks() {
           onMouseOver="display('set','bookmark');"
     >
     <AREA SHAPE="polygon" COORDS="127,2,87,2,127,42"
-         href="javascript:go('');"
+         href="javascript:gopost('/adm/navmaps',
+                                 clientwindow.window.location.href);"
           onMouseOver="display('navigate','maps');"
     >
     <AREA SHAPE="polygon" COORDS="128,102,89,102,128,63"
