--- loncom/html/res/adm/pages/menu.html	2001/06/02 19:55:45	1.32
+++ loncom/html/res/adm/pages/menu.html	2001/08/16 02:21:58	1.38
@@ -11,7 +11,8 @@ 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 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
 -->
 <head>
 <title>LON-CAPA Remote</title>
@@ -20,7 +21,6 @@ Jan Guy Albertelli
 
 <body bgcolor="#BBBBBB" 
       background="remotebg.gif"
-      onLoad="activate();" 
       onUnload="logout();">
 <basefont size="1" />
 
@@ -34,6 +34,7 @@ imgpath='/res/adm/pages/';
 
 var currentURL='';
 var currentStale=1;
+var menucltim;
 
 // not used (yet)
 // var w_Annotator;
@@ -97,8 +98,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;
@@ -166,6 +167,20 @@ function gopost(url,postdata) {
    if (url!='') {
       this.document.server.action="http://"+clienthost+url;
       this.document.server.postdata.value=postdata;
+      this.document.server.command.value='';
+      this.document.server.url.value='';
+      this.document.server.submit();
+   }
+}
+
+function gocmd(url,cmd) {
+   windowcheck();
+   this.document['led'].src="ledsend.gif";
+   if (url!='') {
+      this.document.server.action="http://"+clienthost+url;
+      this.document.server.postdata.value='';
+      this.document.server.command.value=cmd;
+      this.document.server.url.value=currentURL;
       this.document.server.submit();
    }
 }
@@ -177,15 +192,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(
@@ -305,7 +325,13 @@ function catalog_info() {
 
 <tr>
 <td><a href="javascript:eval(hr[91]);" onMouseOver="display(dt[91],db[91]);"><img border="0" name="b91" src="empty.gif"></img></a></td>
-<td colspan="2"><a href="javascript:eval(hr[92]);" onMouseOver="display(dt[92],db[92]);"><img border="0" name="b92" src="dempty.gif"></img></a></td>
+<td><a href="javascript:eval(hr[92]);" onMouseOver="display(dt[92],db[92]);"><img border="0" name="b92" src="empty.gif"></img></a></td>
+<td><a href="javascript:eval(hr[93]);" onMouseOver="display(dt[93],db[93]);"><img border="0" name="b93" src="empty.gif"></img></a></td>
+</tr>
+
+<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>
 </tr>
 
 </table>
@@ -316,8 +342,13 @@ function catalog_info() {
 ><img border="0" src="spacer.gif"></img></a><br />
 
 <form name='server' action='/adm/logout' method='post' target='loncapaclient'>
-<input type='hidden' name='postdata' value='none'></input>
-</form>
+<input type='hidden' name='postdata' value='none' />
+<input type="hidden" name="command" value="none" />
+<input type="hidden" name="url" value="none" />
+ </form>
 </center>
+<script>
+activate();
+</script>
 </body>
 </html>
