--- loncom/html/res/adm/pages/menu.html	2002/09/09 18:30:19	1.66.2.1
+++ loncom/html/res/adm/pages/menu.html	2002/11/12 18:20:33	1.75
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.66.2.1 2002/09/09 18:30:19 albertel Exp $
+// $Id: menu.html,v 1.75 2002/11/12 18:20:33 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -45,11 +45,14 @@ var statustop = '';
 var statusbot = '';
 var active = 0;
 var dislocked = 1;
+var statuslocked = 0;
 
-var imgpath='/res/adm/pages/';
-var fontpath='/adm/lonLCDfont/';
+var imgpath=':8080/res/adm/pages/';
+var fontpath=':8080/adm/lonLCDfont/';
 var currentURL='';
 var reloadURL='';
+var currentSymb='';
+var reloadSymb='';
 var currentStale=1;
 var menucltim;
 
@@ -74,6 +77,7 @@ var w_LONcatInfo_flag=-1;
 var hr = new Array;
 var db = new Array;
 var dt = new Array;
+var ds = new Array;
 
 for (var i=1;i<=3;i++) {
    for (var j=1;j<=10;j++) {
@@ -81,6 +85,7 @@ for (var i=1;i<=3;i++) {
       hr[index]='';
       db[index]='';
       dt[index]='';
+      ds[index]='';
    }
 }
 
@@ -95,30 +100,30 @@ function syncclock(servertime) {
 function advanceclock() {
     var clock=new Date();
     clock.setTime(clock.getTime()+clockdelta);
+    if (!statuslocked) {
+       var days=""+clock.getDate();
+       if (days.length<2) { days="0"+days; }
+       var mons=""+(clock.getMonth()+1);
+       if (mons.length<2) { mons="0"+mons; }
+       var years=""+clock.getYear();
+
+       if (years>1000) {
+          years=years.substring(2,4);
+       } else {
+          years=years.substring(1,3);
+       }
+       statustop=mons+'/'+days+'/'+years;
+
+       var secs=""+clock.getSeconds();
+       if (secs.length<2) { secs="0"+secs; }
+       var mins=""+clock.getMinutes();
+       if (mins.length<2) { mins="0"+mins; }
+       var hours=""+clock.getHours();
+       if (hours.length<2) { hours=" "+hours; }
+       statusbot=hours+':'+mins+':'+secs;
 
-    var days=""+clock.getDate();
-    if (days.length<2) { days="0"+days; }
-    var mons=""+(clock.getMonth()+1);
-    if (mons.length<2) { mons="0"+mons; }
-    var years=""+clock.getYear();
-
-    if (years>1000) {
-       years=years.substring(2,4);
-    } else {
-       years=years.substring(1,3);
+       if (!dislocked) { showdisplay(); }
     }
-    statustop=mons+'/'+days+'/'+years;
-
-    var secs=""+clock.getSeconds();
-    if (secs.length<2) { secs="0"+secs; }
-    var mins=""+clock.getMinutes();
-    if (mins.length<2) { mins="0"+mins; }
-    var hours=""+clock.getHours();
-    if (hours.length<2) { hours=" "+hours; }
-    statusbot=hours+':'+mins+':'+secs;
-
-    if (!dislocked) { showdisplay(); }
-
     setTimeout('advanceclock();',1000);
 }
 
@@ -188,7 +193,7 @@ function showdisplay(utext,ltext) {
          if (ch==':') { ch='colon'; }
          if (ch=='/') { ch='slash'; }
       } else { ch='space'; }
-      this.document['i'+i].src=fontpath+ch+'.gif';
+      this.document['i'+i].src="http://"+clienthost+fontpath+ch+'.gif';
    }
    for (i=0;i<=7;i++) {
       if (i<ltext.length) {
@@ -198,7 +203,7 @@ function showdisplay(utext,ltext) {
          if (ch==':') { ch='colon'; }
          if (ch=='/') { ch='slash'; }
       } else { ch='space'; }
-      this.document['j'+i].src=fontpath+ch+'.gif';
+      this.document['j'+i].src="http://"+clienthost+fontpath+ch+'.gif';
    }
   }
 }
@@ -208,12 +213,13 @@ function defdis() {
    display();
 }
 
-function switchbutton(row,col,imgsrc,texttop,textbot,action) {
+function switchbutton(row,col,imgsrc,texttop,textbot,action,desc) {
    var idx=10*row+col;
    this.document['b'+idx].src="http://"+clienthost+imgpath+imgsrc;
    hr[idx]=action;
    dt[idx]=texttop;
    db[idx]=textbot;
+   ds[idx]=desc;
 } 
 
 function clearbut(row,col) {
@@ -222,14 +228,15 @@ function clearbut(row,col) {
    hr[idx]='javascript:defdis();';
    dt[idx]='';
    db[idx]='';
+   ds[idx]='';
 }
 
 function setstatus(tp,bt) {
-   this.document['led'].src="ledblink.gif";
+   this.document['led'].src="http://"+clienthost+imgpath+"ledblink.gif";
    statustop=tp;
    statusbot=bt;
+   statuslocked=1;
    defdis();
-   endsend();
 }
 
 function is_editable_resource (url) {
@@ -270,33 +277,39 @@ function cstrgo(currenturl,defaulturl) {
 
 function go(url) {
    windowcheck();
+   statuslocked=0;
    this.document['led'].src="ledsend.gif";
    if (url!='' && url!= null) {
        currentURL = null;
+       currentSymb= null;
        clientwindow.window.location.href="http://"+clienthost+url;
    }
 }
 
 function gopost(url,postdata) {
    windowcheck();
-   this.document['led'].src="ledsend.gif";
+   statuslocked=0;
+   this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
    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.symb.value='';
       this.document.server.submit();
    }
 }
 
 function gocmd(url,cmd) {
    windowcheck();
-   this.document['led'].src="ledsend.gif";
+   statuslocked=0;
+   this.document['led'].src="http://"+clienthost+imgpath+"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.symb.value=currentSymb;
       this.document.server.submit();
    }
 }
@@ -338,6 +351,55 @@ function set_bookmark() {
    bmquery.document.close();
 }
 
+function extenddisp() {
+   go('');
+   extdisp=window.open("http://"+clienthost+"/adm/rat/empty.html",
+               "ExtDisp", "width=400,height=450");
+   extdisp.document.clear();
+   extdisp.document.writeln(
+  '<html><body bgcolor="#666666" text="#DDDDDD" link="#666666">'+
+  '<h2>LON-CAPA Extended Display Remote Control</h2>'+
+  '<script>var currentURL="'+currentURL+'";self.focus();</script>'+
+  '<table border="2">');
+   for (var i=0; i<=ds.length; i++) {
+       if (typeof(ds[i])!='undefined') {
+          if (ds[i]!='') {
+             extdisp.document.writeln(
+                '<tr><td><a href="javascript:opener.'+
+                  hr[i]+';self.close();"><img border="0" src="'+
+                  this.document['b'+i].src+'" /><br />'+
+  '<table hspace="0" border="0" cellspacing="1" cellpadding="0"><tr>');
+             for (var j=0;j<=7;j++) {
+                if (j<dt[i].length) {
+                   ch=dt[i].charAt(j);
+                   if (ch==' ') { ch='space'; }
+                   if (ch=='-') { ch='hyphen'; }
+                   if (ch==':') { ch='colon'; }
+                   if (ch=='/') { ch='slash'; }
+                } else { ch='space'; }
+                extdisp.document.writeln('<td><img border="0" src="http://'
+                                    +clienthost+fontpath+ch+'.gif" /></td>');
+             }
+             extdisp.document.writeln('</tr><tr>');
+             for (var j=0;j<=7;j++) {
+                if (j<db[i].length) {
+                   ch=db[i].charAt(j);
+                   if (ch==' ') { ch='space'; }
+                   if (ch=='-') { ch='hyphen'; }
+                   if (ch==':') { ch='colon'; }
+                   if (ch=='/') { ch='slash'; }
+                } else { ch='space'; }
+                extdisp.document.writeln('<td><img border="0" src="http://'
+                                    +clienthost+fontpath+ch+'.gif" /></td>');
+            }
+            extdisp.document.writeln(
+  '</tr></table></td><td>'+ds[i]+'</td></tr>');
+          }
+       }
+   }
+   extdisp.document.writeln('</table></body></html>');
+   extdisp.document.close();
+}
 function edit_bookmarks() {
    go('');
    w_BookmarkPal_flag=1;
@@ -348,7 +410,7 @@ function edit_bookmarks() {
 function catalog_info() {
    go('');
    w_LONcatInfo_flag=1;
-   loncatinfo=window.open(clientwindow.window.location.href+'.meta',"LONcatInfo");
+   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"LONcatInfo");
 }
 // -->
 </script>
@@ -365,9 +427,9 @@ function catalog_info() {
 </center>
 
 <center>
-<a href="javascript:defdis();"
+<a href="javascript:extenddisp();"
    onMouseOver="defdis();"
-><img width="103" height="3" border="0" src="spacer.gif" /></a>
+><img width="104" height="10" border="0" src="spacer.gif" /></a>
 </center>
 
 <center>
@@ -468,16 +530,11 @@ function catalog_info() {
 </table>
 </center>
 
-<center>
-<a href="javascript:defdis();"
-   onMouseOver="defdis();"
-><img width="103" height="3" border="0" src="spacer.gif" /></a>
-</center>
-
 <form name="server" action="/adm/logout" method="post" target="loncapaclient">
 <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" />
 </form>
 <script>
 activate();