--- loncom/html/res/adm/pages/menu.html	2001/06/15 22:25:10	1.35
+++ loncom/html/res/adm/pages/menu.html	2002/03/18 14:25:49	1.44
@@ -2,6 +2,33 @@
 <!--
 The LearningOnline Network with CAPA
 Remote Control
+
+//
+// $Id: menu.html,v 1.44 2002/03/18 14:25:49 matthew Exp $
+//
+// Copyright Michigan State University Board of Trustees
+//
+// This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+//
+// LON-CAPA is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// LON-CAPA is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with LON-CAPA; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// /home/httpd/html/adm/gpl.txt
+//
+// http://www.lon-capa.org/
+//
+
 6/12/00,6/13,6/14,6/15 Gerd Kortemeyer
 Sept Ben Tyszka
 10/2,10/3,10/4,10/17,10/19,3/1/1 Gerd Kortemeyer
@@ -11,7 +38,9 @@ Jan Guy Albertelli
 3/21 Gerd Kortemeyer
 4/30 Ben Tyszka
 5/2 Scott Harrison
-5/4,5/9,5/28,5/30,6/1,6/2,6/3,6/8 Gerd Kortemeyer
+5/4,5/9,5/28,5/30,6/1,6/2,6/3,6/8,6/15,6/16 Gerd Kortemeyer
+7/24,8/6 Scott Harrison
+8/24 Gerd Kortemeyer
 -->
 <head>
 <title>LON-CAPA Remote</title>
@@ -19,18 +48,16 @@ Jan Guy Albertelli
 
 
 <body bgcolor="#BBBBBB" 
-      background="remotebg.gif"
-      onLoad="activate();" 
-      onUnload="logout();">
+      background="remotebg.gif">
 <basefont size="1" />
 
 <script type="text/javascript">
 <!--
-statustop='';
-statusbot='';
-active=0;
+var statustop = '';
+var statusbot = '';
+var active = 0;
 
-imgpath='/res/adm/pages/';
+var imgpath='/res/adm/pages/';
 
 var currentURL='';
 var currentStale=1;
@@ -52,12 +79,21 @@ var w_LONcatInfo_flag=-1;
  // -1 means never yet opened/defined
 ///////////////////////////////////////
 
-hr=new Array;
-db=new Array;
-dt=new Array;
+var hr = new Array;
+var db = new Array;
+var dt = new Array;
+
+for (var i=1;i<=3;i++) {
+   for (var j=1;j<=10;j++) {
+      var index = 10*j+i;
+      hr[index]=null;
+      db[index]=null;
+      dt[index]=null;
+   }
+}
 
-clienthost=window.location.host;
-clientwindow=opener;
+var clienthost=window.location.host;
+var clientwindow=opener;
 
 function windowcheck() {
    if (clientwindow.closed) {
@@ -68,8 +104,7 @@ function windowcheck() {
 
 function logout () {
    windowcheck();
-   if (clientwindow.status!='MenuControl:nologout')
-   {   
+
       if (w_Annotator_flag!=-1 && annotator && !annotator.closed) {
           annotator.close();
       }
@@ -83,7 +118,7 @@ function logout () {
           loncatinfo.close();
       }
       clientwindow.window.location.href="http://"+clienthost+"/adm/logout";
-   }
+
 }
 
 function activate () {
@@ -98,8 +133,8 @@ function deactivate () {
 function display(utext,ltext) {
   var i; var ch;
   this.window.focus();
-  if (utext==undefined) { utext=''; }
-  if (ltext==undefined) { ltext=''; }
+  if (typeof(utext)=="undefined") { utext=''; }
+  if (typeof(ltext)=="undefined") { ltext=''; }
   if ((utext=='') && (ltext=='')) {
      utext=statustop;
      ltext=statusbot;
@@ -131,15 +166,15 @@ function defdis() {
 
 function switchbutton(row,col,imgsrc,texttop,textbot,action) {
    var idx=10*row+col;
-   this.document['b'+idx].src=imgpath+imgsrc;
+   this.document['b'+idx].src="http://"+clienthost+imgpath+imgsrc;
    hr[idx]=action;
    dt[idx]=texttop;
    db[idx]=textbot;
-}
+} 
 
 function clearbut(row,col) {
    var idx=10*row+col;
-   this.document['b'+idx].src=imgpath+'empty.gif';
+   this.document['b'+idx].src="http://"+clienthost+imgpath+'empty.gif';
    hr[idx]='javascript:defdis();';
    dt[idx]='';
    db[idx]='';
@@ -192,15 +227,20 @@ function annotate() {
    "<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+"'>"
+  +"<input type='hidden' name='urlnew' value='"+currentURL+"'>"
   +"</form></body></html>");
    annotator.document.close();
 }
 
 function set_bookmark() {
    go('');
-   clienttitle="Enter Title";
-   clienthref="Enter Address";
+   if (currentStale) {
+      clienttitle="Enter Title";
+      clienthref=currentURL;
+   } else {
+      clienttitle=clientwindow.document.title;
+      clienthref=clientwindow.location.pathname;
+   }
    w_bmquery_flag=1;
    bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
    bmquery.document.write(
@@ -326,7 +366,8 @@ function catalog_info() {
 
 <tr>
 <td><a href="javascript:eval(hr[101]);" onMouseOver="display(dt[101],db[101]);"><img border="0" name="b101" src="empty.gif"></img></a></td>
-<td colspan="2"><a href="javascript:eval(hr[102]);" onMouseOver="display(dt[102],db[102]);"><img border="0" name="b102" src="dempty.gif"></img></a></td>
+<td><a href="javascript:eval(hr[102]);" onMouseOver="display(dt[102],db[102]);"><img border="0" name="b102" src="empty.gif"></img></a></td>
+<td><a href="javascript:eval(hr[103]);" onMouseOver="display(dt[103],db[103]);"><img border="0" name="b103" src="empty.gif"></img></a></td>
 </tr>
 
 </table>
@@ -342,5 +383,15 @@ function catalog_info() {
 <input type="hidden" name="url" value="none" />
  </form>
 </center>
+<script>
+activate();
+</script>
 </body>
 </html>
+
+
+
+
+
+
+
