--- loncom/html/res/adm/pages/menu.html	2003/01/15 23:59:26	1.83
+++ loncom/html/res/adm/pages/menu.html	2003/04/04 19:35:04	1.92
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.83 2003/01/15 23:59:26 www Exp $
+// $Id: menu.html,v 1.92 2003/04/04 19:35:04 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -36,9 +36,11 @@ Remote Control
 
 <body bgcolor="#BBBBBB" 
       background="remotebg.gif"
-      onUnload="logout();"
+      onUnload="collapse();"
+      onLoad="activate();"
       >
 <font size="1">
+<LONCAPA_INTERNAL_LONHTTPD_PORT />
 <script type="text/javascript">
 <!--
 var statustop = '';
@@ -47,8 +49,11 @@ var active = 0;
 var dislocked = 1;
 var statuslocked = 0;
 
-var imgpath=':8080/res/adm/pages/';
-var fontpath=':8080/adm/lonLCDfont/';
+if (lonhttpdport == null) {
+    var lonhttpdport='8080';
+}
+var imgpath=':'+lonhttpdport+'/res/adm/pages/';
+var fontpath=':'+lonhttpdport+'/adm/lonLCDfont/';
 var currentURL='';
 var reloadURL='';
 var currentSymb='';
@@ -59,7 +64,9 @@ var menucltim;
 var clockdelta=0;
 
 var w_extdisp_flag=-1;
-var extdisp;
+var extdisp=null;
+
+var autologout=1;
 
 // not used (yet)
 // var w_Annotator;
@@ -142,6 +149,12 @@ function windowcheck() {
    extenddispclose();
 }
 
+function collapse() {
+   if (autologout) {
+       go('/adm/remote?action=collapse');
+   }
+}
+ 
 function logout () {
    windowcheck();
 
@@ -157,13 +170,14 @@ function logout () {
       if (w_LONcatInfo_flag!=-1 && loncatinfo && !loncatinfo.closed) {
           loncatinfo.close();
       }
-      clientwindow.window.location.href="http://"+clienthost+"/adm/logout";
-
+      if (autologout) {
+         clientwindow.window.location.href="http://"+clienthost+"/adm/logout";
+      }
 }
 
 function activate () {
-   opener.menuloaded=1;
-   setTimeout('active=1;',2000);
+   setTimeout('opener.menuloaded=1;',1000);
+   setTimeout('active=1;',500);
    advanceclock();
 }
 
@@ -224,7 +238,11 @@ function switchbutton(row,col,imgsrc,tex
    dt[idx]=texttop;
    db[idx]=textbot;
    ds[idx]=desc;
-   eval('this.document.links.link'+idx+'.title="'+desc+'"');
+   for (var k=0;k<document.links.length;k++) {
+       if (document.links[k].name=='link'+idx) {
+          document.links[k].title=desc;
+       }
+   }
 } 
 
 function clearbut(row,col) {
@@ -234,7 +252,11 @@ function clearbut(row,col) {
    dt[idx]='';
    db[idx]='';
    ds[idx]='';
-   eval('this.document.links.link'+idx+'.title=""');
+   for (var k=0;k<document.links.length;k++) {
+       if (document.links[k].name=='link'+idx) {
+          document.links[k].title='';
+       }
+   }
 }
 
 function setstatus(tp,bt) {
@@ -265,7 +287,7 @@ function gopost(url,postdata) {
       this.document.server.postdata.value=postdata;
       this.document.server.command.value='';
       this.document.server.url.value='';
-      this.document.server.symb.value='';
+      this.document.server.postsymb.value='';
       this.document.server.submit();
    }
 }
@@ -279,7 +301,7 @@ function gocmd(url,cmd) {
       this.document.server.postdata.value='';
       this.document.server.command.value=cmd;
       this.document.server.url.value=currentURL;
-      this.document.server.symb.value=currentSymb;
+      this.document.server.postsymb.value=currentSymb;
       this.document.server.submit();
    }
 }
@@ -333,8 +355,11 @@ function extenddispclose() {
 function extenddisp() {
    go('');
    w_extdisp_flag=1;
-   extdisp=window.open("http://"+clienthost+"/adm/rat/empty.html",
+   extdisp=window.open("http://"+clienthost+"/adm/rat/loading.html",
                "ExtDisp", "scrollbars=1,width=400,height=450");
+}
+
+function drawwindow() {
    extdisp.document.clear();
    extdisp.document.writeln(
   '<html><body bgcolor="#666666" text="#DDDDDD" link="#EEEEEE" '+
@@ -382,6 +407,7 @@ function extenddisp() {
    extdisp.document.writeln('</table></body></html>');
    extdisp.document.close();
 }
+
 function edit_bookmarks() {
    go('');
    w_BookmarkPal_flag=1;
@@ -516,11 +542,8 @@ function catalog_info() {
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />
-<input type="hidden" name="symb" value="none" />
+<input type="hidden" name="postsymb" value="none" />
 </form>
-<script>
-activate();
-</script>
 </font>
 </body>
 </html>
