--- loncom/html/res/adm/pages/menu.html	2003/01/31 21:46:36	1.85
+++ loncom/html/res/adm/pages/menu.html	2003/04/03 00:52:21	1.91
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.85 2003/01/31 21:46:36 www Exp $
+// $Id: menu.html,v 1.91 2003/04/03 00:52:21 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -36,10 +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 = '';
@@ -48,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='';
@@ -60,7 +64,7 @@ var menucltim;
 var clockdelta=0;
 
 var w_extdisp_flag=-1;
-var extdisp;
+var extdisp=null;
 
 var autologout=1;
 
@@ -145,6 +149,12 @@ function windowcheck() {
    extenddispclose();
 }
 
+function collapse() {
+   if (autologout) {
+       go('/adm/remote?action=collapse');
+   }
+}
+ 
 function logout () {
    windowcheck();
 
@@ -166,8 +176,8 @@ function logout () {
 }
 
 function activate () {
-   setTimeout('opener.menuloaded=1;',3000);
-   setTimeout('active=1;',2000);
+   setTimeout('opener.menuloaded=1;',1000);
+   setTimeout('active=1;',500);
    advanceclock();
 }
 
@@ -345,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" '+
@@ -394,6 +407,7 @@ function extenddisp() {
    extdisp.document.writeln('</table></body></html>');
    extdisp.document.close();
 }
+
 function edit_bookmarks() {
    go('');
    w_BookmarkPal_flag=1;
