--- loncom/html/res/adm/pages/menu.html	2004/08/13 20:30:01	1.113
+++ loncom/html/res/adm/pages/menu.html	2007/10/30 23:40:49	1.123
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.113 2004/08/13 20:30:01 albertel Exp $
+// $Id: menu.html,v 1.123 2007/10/30 23:40:49 albertel Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -53,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='';
@@ -142,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"); 
@@ -153,14 +157,15 @@ function windowcheck() {
 
 function navwindowcheck() {
    if (navwindow==null || navwindow.closed) {
-      navwindow=window.open("http://"+clienthost+"/adm/navmaps#curloc",
+      navwindow=window.open(protocol+clienthost+"/adm/navmaps#curloc",
                   "loncapanav","height=600,width=400,scrollbars=1"); 
    }
 }
 
 function collapse() {
    if (autologout) {
-       go('/adm/remote?action=collapse');
+       windowcheck();
+       clientwindow.location='/adm/remote?action=collapse';
    }
 }
  
@@ -209,7 +214,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;
@@ -223,7 +228,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]='';
@@ -236,7 +241,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;
@@ -246,12 +251,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.target='loncapaclient';
-      this.document.server.action="http://"+clienthost+url;
+      this.document.server.action=protocol+clienthost+url;
       this.document.server.postdata.value='';
       this.document.server.command.value='';
       this.document.server.url.value='';
@@ -261,39 +266,39 @@ function go(url) {
 }
 
 function gonav(url) {
-   if (w_loncapanav_flag != 1) {
-      go(url);
-   }  else {
+   if (w_loncapanav_flag == 1) {
       navwindowcheck();
       statuslocked=0;
-      this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
-      if (url!='' && url!= null) {
-         this.document.server.action="http://"+clienthost+url;
-         this.document.server.target="loncapanav";
-         this.document.server.postdata.value='';
-         this.document.server.command.value='';
-         this.document.server.url.value='';
-         this.document.server.postsymb.value='';
-         this.document.server.submit();
-      }
+      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='';
@@ -305,10 +310,10 @@ function gopost(url,postdata,makenewwin)
 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.target='loncapaclient';
-      this.document.server.action="http://"+clienthost+url;
+      this.document.server.action=protocol+clienthost+url;
       this.document.server.postdata.value='';
       this.document.server.command.value=cmd;
       this.document.server.url.value=currentURL;
@@ -324,8 +329,8 @@ 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+"'>"
-  +"</form></body></html>");
+  +"<input type='hidden' name='symbnew' value='"+currentSymb+"' />"
+  +"<\/form><\/body><\/html>");
    annotator.document.close();
 }
 
@@ -344,13 +349,13 @@ function set_bookmark() {
    "<html><body bgcolor='bbbbbb'><center><form method='post'"
    +" name='newlink' action='/adm/bookmarks' target='bmquery' "
    +">\n <table width=340 height=150 "
-   +"bgcolor='ffffff' align=center><tr><td>Link Name:<br><input "
+   +"bgcolor='ffffff' align=center><tr><td>Link Name:<br /><input "
    +"type='text' name='title' size=45 value='"+clienttitle+"'>"
-   +"<br>Address:<br><input type='text' name='address' size='45' "
-   +"value='"+clienthref+"'><br><center><input type='submit' "
-   +"value='Save'> <input type='button' value='Close (no save)' "
-   +"onclick='javascript:window.close();'></center></td>"
-   +"</tr></table></form></center></body></html>");
+   +"<br />Address:<br /><input type='text' name='address' size='45' "
+   +"value='"+clienthref+"' /><br /><center><input type='submit' "
+   +"value='Save' /> <input type='button' value='Close (no save)' "
+   +"onclick='javascript:window.close();' /><\/center><\/td>"
+   +"<\/tr><\/table><\/form><\/center><\/body><\/html>");
    bmquery.document.close();
 }
 
@@ -366,7 +371,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");
 }
 
@@ -375,45 +380,45 @@ function drawwindow() {
    extdisp.document.writeln(
   '<html><body bgcolor="#666666" text="#DDDDDD" link="#EEEEEE" '+
          'onUnload="opener.w_extdisp_flag=-1;">'+
-  '<h2>LON-CAPA Extended Display Remote Control</h2>'+
-  '<script type="text/javascript">var currentURL="'+currentURL+'";self.focus();</s'+'cript>'+
-  '<table border="2"><tr><th>Select Functionality from Below</th>'+
-  '<th>Description</th></tr>');
+  '<h2>LON-CAPA Extended Display Remote Control<\/h2>'+
+  '<script type="text/javascript">var currentURL="'+currentURL+'";self.focus();<\/s'+'cript>'+
+  '<table border="2"><tr><th>Select Functionality from Below<\/th>'+
+  '<th>Description<\/th><\/tr>');
    for (var i=0; i<=ds.length; i++) {
        if (typeof(ds[i])!='undefined') {
           if (ds[i]!='') {
              extdisp.document.writeln(
                 '<tr><td align="center"><a href="javascript:opener.'+
                hr[i]+';">&gt;&gt;&gt;<img align="absmiddle" border="0" src="'+
-            this.document['b'+i].src+'" />&lt;&lt;&lt;</a><br />&nbsp;<br />');
+            this.document['b'+i].src+'" />&lt;&lt;&lt;<\/a><br />&nbsp;<br />');
              bigdisplay(dt,db,i);
-             extdisp.document.writeln('</td><td>'+ds[i]+'</td></tr>');
+             extdisp.document.writeln('<\/td><td>'+ds[i]+'<\/td><\/tr>');
           }
        }
    }
-   extdisp.document.writeln('</table></body></html>');
+   extdisp.document.writeln('<\/table><\/body><\/html>');
    extdisp.document.close();
 }
 
 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('request.browser.textremote')!=1">
 <script type="text/javascript">
@@ -430,9 +435,9 @@ function bigdisplay(dt,db,i) {
                    if (ch=='/') { ch='slash'; }
                 } else { ch='space'; }
                 extdisp.document.writeln('<td><img border="0" src="http://'
-                                    +clienthost+fontpath+ch+'.gif" /></td>');
+                                    +clienthost+fontpath+ch+'.gif" /><\/td>');
              }
-             extdisp.document.writeln('</tr><tr>');
+             extdisp.document.writeln('<\/tr><tr>');
              for (var j=0;j<=7;j++) {
                 if (j<db[i].length) {
                    ch=db[i].charAt(j);
@@ -442,9 +447,9 @@ function bigdisplay(dt,db,i) {
                    if (ch=='/') { ch='slash'; }
                 } else { ch='space'; }
                 extdisp.document.writeln('<td><img border="0" src="http://'
-                                    +clienthost+fontpath+ch+'.gif" /></td>');
+                                    +clienthost+fontpath+ch+'.gif" /><\/td>');
             }
-            extdisp.document.writeln('</tr></table>');
+            extdisp.document.writeln('<\/tr><\/table>');
 }
 
 function showdisplay(utext,ltext) {
@@ -468,7 +473,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) {
@@ -478,12 +483,15 @@ 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('request.browser.textremote')">
 <script type="text/javascript">
@@ -636,6 +644,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>