--- loncom/html/res/adm/pages/menu.html	2001/03/16 03:55:22	1.22
+++ loncom/html/res/adm/pages/menu.html	2001/05/04 15:28:01	1.28
@@ -8,19 +8,46 @@ Sept Ben Tyszka
 Jan Guy Albertelli
 5/1/1 Gerd Kortemeyer
 2/19 Guy Albertelli
+3/21 Gerd Kortemeyer
+4/30 Ben Tyszka
+5/2 Scott Harrison
+5/4 Gerd Kortemeyer
 -->
 <head>
 <title>LON-CAPA Remote</title>
 </head>
 
 
-<body bgcolor="#BBBBBB" background="remotebg.gif" onUnload="logout();">
+<body bgcolor="#BBBBBB" 
+      background="remotebg.gif"
+      onLoad="activate();" 
+      onUnload="logout();">
 <basefont size="1" />
 
 <script type="text/javascript">
 <!--
 statustop='';
 statusbot='';
+active=0;
+
+var currentURL='';
+var currentStale=1;
+
+// not used (yet)
+// var w_Annotator;
+// var w_bmquery;
+// var w_BookmarkPal;
+// var w_LONcatInfo;
+
+//////////////////////////////////////
+var w_Annotator_flag=-1;
+var w_bmquery_flag=-1;
+var w_BookmarkPal_flag=-1;
+var w_LONcatInfo_flag=-1;
+ // 1 means currently open
+ // 0 means closed (but has been open)
+ // -1 means never yet opened/defined
+///////////////////////////////////////
 
 clienthost=window.location.host;
 clientwindow=opener;
@@ -36,13 +63,34 @@ function logout () {
    windowcheck();
    if (clientwindow.status!='MenuControl:nologout')
    {   
+      if (w_Annotator_flag!=-1 && annotator && !annotator.closed) {
+          annotator.close();
+      }
+      if (w_bmquery_flag!=-1 && bmquery && !bmquery.closed) {
+          bmquery.close();
+      }
+      if (w_BookmarkPal_flag!=-1 && bookmarkpal && !bookmarkpal.closed) {
+          bookmarkpal.close();
+      }
+      if (w_LONcatInfo_flag!=-1 && loncatinfo && !loncatinfo.closed) {
+          loncatinfo.close();
+      }
       clientwindow.window.location.href="http://"+clienthost+"/adm/logout";
    }
 }
 
+function activate () {
+   setTimeout('active=1;',2000);
+}
+
+function deactivate () {
+   active=0;
+}
+
 function display(utext,ltext) {
-   var i; var ch;
-   this.window.focus();
+  var i; var ch;
+  this.window.focus();
+  if (active) { 
    for (i=0;i<=7;i++) {
       if (i<utext.length) {
          ch=utext.charAt(i);
@@ -59,6 +107,7 @@ function display(utext,ltext) {
       } else { ch='space'; }
       this.document['j'+i].src=ch+'.gif';
    }
+  }
 }
 
 function defdis() {
@@ -93,6 +142,7 @@ function gopost(url,postdata) {
 }
 
 function annotate() {
+   w_Annotator_flag=1;
    annotator=window.open('','Annotator','width=365,height=265,scrollbars=0');
    annotator.document.write(
    "<html><body onload='Javascript:document.goannotate.submit();'>"
@@ -105,19 +155,35 @@ function annotate() {
 
 function set_bookmark() {
    go('');
-   prompt("Please enter a name for this bookmark.", 
-           clientwindow.window.location.href);
+   clienttitle="Enter Title";
+   clienthref="Enter Address";
+   w_bmquery_flag=1;
+   bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
+   bmquery.document.write(
+   "<html><body bgcolor='bbbbbb'><center><form method='post'"
+   +" name='newlink' action='/adm/bookmarks' target='bmquery' "
+   +">\n <table width=340 height=150 "
+   +"bgcolor='ffffff' align=center><tr><td>Link Name:<br><input "
+   +"type='text' name='title' size=45 value='"+clienttitle+"'>"
+   +"<br>Address:<br><input type='text' name='address' size='45' "
+   +"value='"+clienthref+"'><br><center><input type='submit' "
+   +"value='Save'> <input type='button' value='Close (no save)' "
+   +"onclick='javascript:window.close();'></center></td>"
+   +"</tr></table></form></center></body></html>");
+   bmquery.document.close();
 }
 
 function edit_bookmarks() {
    go('');
-   window.open("http://"+clienthost+"/adm/bookmarks",
+   w_BookmarkPal_flag=1;
+   bookmarkpal=window.open("http://"+clienthost+"/adm/bookmarks",
                "BookmarkPal", "width=400,height=505,scrollbars=0");
 }
 
 function catalog_info() {
    go('');
-   window.open(clientwindow.window.location.href+'.meta',"LONcatInfo");
+   w_LONcatInfo_flag=1;
+   loncatinfo=window.open(clientwindow.window.location.href+'.meta',"LONcatInfo");
 }
 // -->
 </script>
