--- loncom/html/res/adm/pages/menu.html	2003/10/11 14:06:01	1.107
+++ loncom/html/res/adm/pages/menu.html	2007/08/30 22:56:32	1.121
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.107 2003/10/11 14:06:01 www Exp $
+// $Id: menu.html,v 1.121 2007/08/30 22:56:32 albertel Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -38,10 +38,11 @@ Remote Control
       background="remotebg.gif"
       onUnload="collapse();"
       onLoad="activate();"
+      style="{background-repeat: no-repeat;}"
       >
 <LONCAPA_INTERNAL_LONHTTPD_PORT />
 <script type="text/javascript">
-<!--
+//<!--
 var statustop = '';
 var statusbot = '';
 var active = 0;
@@ -52,6 +53,10 @@ if (lonhttpdport == null) {
     var lonhttpdport='8080';
 }
 
+var protocol="http://";
+if (lonhttpdport == 443) {
+    protocol="https://"
+}
 var imgpath=':'+lonhttpdport+'/res/adm/pages/';
 var fontpath=':'+lonhttpdport+'/adm/lonLCDfont/';
 var currentURL='';
@@ -60,7 +65,6 @@ var currentSymb='';
 var reloadSymb='';
 var currentStale=1;
 var menucltim;
-
 var clockdelta=0;
 
 var w_extdisp_flag=-1;
@@ -80,6 +84,7 @@ var w_bmquery_flag=-1;
 var w_BookmarkPal_flag=-1;
 var w_LONcatInfo_flag=-1;
 var w_LONchat_flag=-1;
+var w_loncapanav_flag=-1;
  // 1 means currently open
  // 0 means closed (but has been open)
  // -1 means never yet opened/defined
@@ -102,6 +107,7 @@ for (var i=1;i<=3;i++) {
 
 var clienthost=window.location.host;
 var clientwindow=opener;
+var navwindow;
 
 function syncclock(servertime) {
     var clientclock=new Date;
@@ -140,7 +146,7 @@ function advanceclock() {
 
 function windowcheck() {
    if (clientwindow==null || clientwindow.closed) {
-      clientwindow=window.open("http://"+clienthost+"/",'',
+      clientwindow=window.open(protocol+clienthost+"/",'',
       "height=400,width=440,"+
       "scrollbars=1,toolbar=1,status=1,resizable=1,location=1,menubar=1,"+
       "left=190,top=15,screenX=190,screenY=15"); 
@@ -149,6 +155,13 @@ function windowcheck() {
    extenddispclose();
 }
 
+function navwindowcheck() {
+   if (navwindow==null || navwindow.closed) {
+      navwindow=window.open(protocol+clienthost+"/adm/navmaps#curloc",
+                  "loncapanav","height=600,width=400,scrollbars=1"); 
+   }
+}
+
 function collapse() {
    if (autologout) {
        go('/adm/remote?action=collapse');
@@ -200,7 +213,7 @@ function defdis() {
 
 function switchbutton(row,col,imgsrc,texttop,textbot,action,desc) {
    var idx=10*row+col;
-   this.document['b'+idx].src="http://"+clienthost+imgpath+imgsrc;
+   this.document['b'+idx].src=protocol+clienthost+imgpath+imgsrc;
    hr[idx]=action;
    dt[idx]=texttop;
    db[idx]=textbot;
@@ -214,7 +227,7 @@ function switchbutton(row,col,imgsrc,tex
 
 function clearbut(row,col) {
    var idx=10*row+col;
-   this.document['b'+idx].src="http://"+clienthost+imgpath+'empty.gif';
+   this.document['b'+idx].src=protocol+clienthost+imgpath+'empty.gif';
    hr[idx]='javascript:defdis();';
    dt[idx]='';
    db[idx]='';
@@ -227,7 +240,7 @@ function clearbut(row,col) {
 }
 
 function setstatus(tp,bt) {
-   this.document['led'].src="http://"+clienthost+imgpath+"ledblink.gif";
+   this.document['led'].src=protocol+clienthost+imgpath+"ledblink.gif";
    statustop=tp;
    statusbot=bt;
    statuslocked=1;
@@ -237,11 +250,12 @@ function setstatus(tp,bt) {
 function go(url) {
    windowcheck();
    statuslocked=0;
-   this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
+   this.document['led'].src=protocol+clienthost+imgpath+"ledsend.gif";
    if (url!='' && url!= null) {
       currentURL = null;
       currentSymb= null;
-      this.document.server.action="http://"+clienthost+url;
+      this.document.server.target='loncapaclient';
+      this.document.server.action=protocol+clienthost+url;
       this.document.server.postdata.value='';
       this.document.server.command.value='';
       this.document.server.url.value='';
@@ -250,34 +264,55 @@ function go(url) {
    }
 }
 
+function gonav(url) {
+   if (w_loncapanav_flag == 1) {
+      navwindowcheck();
+      statuslocked=0;
+      this.document.server.target="loncapanav";
+   } else {
+      this.document.server.target="loncapaclient";
+   } 
+   this.document['led'].src=protocol+clienthost+imgpath+"ledsend.gif";
+   if (url!='' && url!= null) {
+       this.document.server.action=protocol+clienthost+url;
+       this.document.server.postdata.value=currentURL;
+       this.document.server.command.value='';
+       this.document.server.url.value='';
+       this.document.server.postsymb.value=currentSymb;
+       this.document.server.submit();
+   }
+}
+
 function gopost(url,postdata,makenewwin) {
    windowcheck();
    statuslocked=0;
-   this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
+   this.document['led'].src=protocol+clienthost+imgpath+"ledsend.gif";
    if (url!='') {
       if (makenewwin) {
-         var LONcomWin=window.open("http://"+clienthost+"/adm/rat/empty.html",
+         var LONcomWin=window.open(protocol+clienthost+"/adm/rat/empty.html",
                        'LONcom',
-                       "height=400,width=540,"+
+                       "height=600,width=600,"+
       "scrollbars=1,toolbar=0,status=0,resizable=1,location=0,menubar=0"); 
          this.document.server.target='LONcom';
+      } else {
+         this.document.server.target='loncapaclient';
       }
-      this.document.server.action="http://"+clienthost+url;
+      this.document.server.action=protocol+clienthost+url;
       this.document.server.postdata.value=postdata;
       this.document.server.command.value='';
       this.document.server.url.value='';
       this.document.server.postsymb.value='';
       this.document.server.submit();
-      this.document.server.target='loncapaclient';
    }
 }
 
 function gocmd(url,cmd) {
    windowcheck();
    statuslocked=0;
-   this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
+   this.document['led'].src=protocol+clienthost+imgpath+"ledsend.gif";
    if (url!='') {
-      this.document.server.action="http://"+clienthost+url;
+      this.document.server.target='loncapaclient';
+      this.document.server.action=protocol+clienthost+url;
       this.document.server.postdata.value='';
       this.document.server.command.value=cmd;
       this.document.server.url.value=currentURL;
@@ -293,7 +328,7 @@ 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='"+currentURL+"'>"
+  +"<input type='hidden' name='symbnew' value='"+currentSymb+"'>"
   +"</form></body></html>");
    annotator.document.close();
 }
@@ -335,7 +370,7 @@ function extenddispclose() {
 function extenddisp() {
    go('');
    w_extdisp_flag=1;
-   extdisp=window.open("http://"+clienthost+"/adm/rat/loading.html",
+   extdisp=window.open(protocol+clienthost+"/adm/rat/loading.html",
                "ExtDisp", "scrollbars=1,width=400,height=450");
 }
 
@@ -367,26 +402,26 @@ function drawwindow() {
 function edit_bookmarks() {
    go('');
    w_BookmarkPal_flag=1;
-   bookmarkpal=window.open("http://"+clienthost+"/adm/bookmarks",
+   bookmarkpal=window.open(protocol+clienthost+"/adm/bookmarks",
                "BookmarkPal", "width=400,height=505,scrollbars=0");
 }
 
 function catalog_info() {
    go('');
    w_LONcatInfo_flag=1;
-   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"cat",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"cat",'height=420,width=480,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }
 
 function chat_win() {
    go('');
    w_LONchat_flag=1;
-   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=420,width=480,resizable=yes,location=no,menubar=no,toolbar=no');
 }
 // -->
 </script>
-<block condition="&EXT('browser.textremote')!=1">
+<block condition="&EXT('request.browser.textremote')!=1">
 <script type="text/javascript">
-
+//<!--
 function bigdisplay(dt,db,i) {
              extdisp.document.writeln(
 '<table hspace="0" border="0" cellspacing="1" cellpadding="0"><tr>');
@@ -437,7 +472,7 @@ function showdisplay(utext,ltext) {
          if (ch==':') { ch='colon'; }
          if (ch=='/') { ch='slash'; }
       } else { ch='space'; }
-      this.document['i'+i].src="http://"+clienthost+fontpath+ch+'.gif';
+      this.document['i'+i].src=protocol+clienthost+fontpath+ch+'.gif';
    }
    for (i=0;i<=7;i++) {
       if (i<ltext.length) {
@@ -447,16 +482,21 @@ function showdisplay(utext,ltext) {
          if (ch==':') { ch='colon'; }
          if (ch=='/') { ch='slash'; }
       } else { ch='space'; }
-      this.document['j'+i].src="http://"+clienthost+fontpath+ch+'.gif';
+      this.document['j'+i].src=protocol+clienthost+fontpath+ch+'.gif';
    }
   }
 }
+//-->
 </script>
+<display>
+return '<script type="text/javascript">w_loncapanav_flag=\''.('on' eq &EXT('user.environment.remotenavmap')).'\';</script>';
+</display>
 </block>
-<block condition="&EXT('browser.textremote')">
+<block condition="&EXT('request.browser.textremote')">
 <script type="text/javascript">
+//<!--
 function bigdisplay(dt,db,i) {
-             extdisp.document.writeln(dt+'<br />'+db);
+  extdisp.document.writeln(dt[i]+'<br />'+db[i]);
 }
 
 function showdisplay(utext,ltext) {
@@ -472,10 +512,11 @@ function showdisplay(utext,ltext) {
      dislocked=0;
   }
   if (active) {
-   this.document.topdisplay.value=utext;
-   this.document.botdisplay.value=ltext;
+   self.document.forms.disp.topdisplay.value=utext;
+   self.document.forms.disp.botdisplay.value=ltext;
   }
 }
+//-->
 </script>
 </block>
 <center>
@@ -497,7 +538,7 @@ function showdisplay(utext,ltext) {
 </center>
 
 <center>
-<block condition="&EXT('browser.textremote')!=1">
+<block condition="&EXT('request.browser.textremote')!=1">
 <table hspace="1" border="0" cellspacing="0" cellpadding="1">
 <tr><td bgcolor="#666666">
 <table hspace="0" border="0" cellspacing="1" cellpadding="0"> 
@@ -525,10 +566,13 @@ function showdisplay(utext,ltext) {
 </td></tr>
 </table>
 </block>
-<block condition="&EXT('browser.textremote')">
+<block condition="&EXT('request.browser.textremote')">
 <font size="1">
-<input type="text" name="topdisplay" size="10" value="LON-CAPA" /><br />
-<input type="text" name="botdisplay" size="10" value="" />
+<form name="disp">
+<input type="text" name="topdisplay" size="14" value="LON-CAPA" /><br />
+<input type="text" name="botdisplay" size="14" value="" />
+</form>
+</font>
 </block>
 
 </center>
@@ -599,6 +643,11 @@ function showdisplay(utext,ltext) {
 <td><a name="link113" href="javascript:eval(hr[113]);" onmouseover="display(dt[113],db[113]);"><img width="43" height="20" border="0" name="b113" src="empty.gif" /></a></td>
 </tr>
 
+<tr>
+<td><a name="link121" href="javascript:eval(hr[121]);" onmouseover="display(dt[121],db[121]);"><img width="43" height="20" border="0" name="b121" src="empty.gif" /></a></td>
+<td><a name="link122" href="javascript:eval(hr[122]);" onmouseover="display(dt[122],db[122]);"><img width="43" height="20" border="0" name="b122" src="empty.gif" /></a></td>
+<td><a name="link123" href="javascript:eval(hr[123]);" onmouseover="display(dt[123],db[123]);"><img width="43" height="20" border="0" name="b123" src="empty.gif" /></a></td></tr>
+
 </table>
 </center>