--- loncom/html/res/adm/pages/menu.html	2002/11/12 20:11:10	1.76
+++ loncom/html/res/adm/pages/menu.html	2003/02/13 20:35:39	1.86
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.76 2002/11/12 20:11:10 www Exp $
+// $Id: menu.html,v 1.86 2003/02/13 20:35:39 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -37,6 +37,7 @@ Remote Control
 <body bgcolor="#BBBBBB" 
       background="remotebg.gif"
       onUnload="logout();"
+      onLoad="activate();"
       >
 <font size="1">
 <script type="text/javascript">
@@ -58,6 +59,11 @@ var menucltim;
 
 var clockdelta=0;
 
+var w_extdisp_flag=-1;
+var extdisp;
+
+var autologout=1;
+
 // not used (yet)
 // var w_Annotator;
 // var w_bmquery;
@@ -136,6 +142,7 @@ function windowcheck() {
    }
    clientwindow.name='loncapaclient';
    clientwindow.menuwindow=self;
+   extenddispclose();
 }
 
 function logout () {
@@ -153,13 +160,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();
 }
 
@@ -220,6 +228,11 @@ function switchbutton(row,col,imgsrc,tex
    dt[idx]=texttop;
    db[idx]=textbot;
    ds[idx]=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) {
@@ -229,6 +242,11 @@ function clearbut(row,col) {
    dt[idx]='';
    db[idx]='';
    ds[idx]='';
+   for (var k=0;k<document.links.length;k++) {
+       if (document.links[k].name=='link'+idx) {
+          document.links[k].title='';
+       }
+   }
 }
 
 function setstatus(tp,bt) {
@@ -239,46 +257,10 @@ function setstatus(tp,bt) {
    defdis();
 }
 
-function is_editable_resource (url) {
-// figure out if this a specific resource version
-   var Chunks = url.split('.');
-   var tmp = Chunks[Chunks.length-1];
-   if ((Chunks.length > 1) && (Math.floor(tmp) == tmp)) {
-       return false;
-   }
-// see if this is actually in resource space
-   var SlashChunks=url.split('/');
-   if (SlashChunks[1]!='res') { return false; } 
-   return true;
-}
-
-function cstrgo(currenturl,defaulturl) {
-   windowcheck();
-   var url;
-   if ((currenturl == null) || 
-       (currenturl == '')   || 
-       (! is_editable_resource(currenturl))) {
-      url = defaulturl;
-   } else {
-      var SlashChunks=currenturl.split('/');
-      SlashChunks[1]='priv';
-      var i;
-      for (i=2;i<SlashChunks.length;i++) {
-          SlashChunks[i]=SlashChunks[i+1];
-      }
-      SlashChunks.length--;
-      url=SlashChunks.join('/');
-   }
-   this.document['led'].src="ledsend.gif";
-   if (url != '') {
-       clientwindow.window.location.href="http://"+clienthost+url;
-   }
-}
-
 function go(url) {
    windowcheck();
    statuslocked=0;
-   this.document['led'].src="ledsend.gif";
+   this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
    if (url!='' && url!= null) {
        currentURL = null;
        currentSymb= null;
@@ -351,13 +333,24 @@ function set_bookmark() {
    bmquery.document.close();
 }
 
+function extenddispclose() {
+   if (w_extdisp_flag>0) {
+      if (extdisp!=null && !extdisp.closed) {
+         extdisp.close();
+      }
+      w_extdisp_flag=-1;
+   }
+}
+
 function extenddisp() {
    go('');
+   w_extdisp_flag=1;
    extdisp=window.open("http://"+clienthost+"/adm/rat/empty.html",
-               "ExtDisp", "width=400,height=450");
+               "ExtDisp", "scrollbars=1,width=400,height=450");
    extdisp.document.clear();
    extdisp.document.writeln(
-  '<html><body bgcolor="#666666" text="#DDDDDD" link="#666666">'+
+  '<html><body bgcolor="#666666" text="#DDDDDD" link="#EEEEEE" '+
+         'onUnload="opener.w_extdisp_flag=-1;">'+
   '<h2>LON-CAPA Extended Display Remote Control</h2>'+
   '<script>var currentURL="'+currentURL+'";self.focus();</script>'+
   '<table border="2"><tr><th>Select Functionality from Below</th>'+
@@ -366,9 +359,9 @@ function extenddisp() {
        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+'" /></a><br />'+
+                '<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 />'+
   '<table hspace="0" border="0" cellspacing="1" cellpadding="0"><tr>');
              for (var j=0;j<=7;j++) {
                 if (j<dt[i].length) {
@@ -420,9 +413,9 @@ function catalog_info() {
 <tr><td>
 <a href="javascript:defdis();"
    onMouseOver="defdis();"
-><img border="0" width="80" height="50" src="title.gif"></a>
+><img border="0" width="80" height="50" src="title.gif" /></a>
 </td><td>
-<img border="0" width="50" height="50" name="led" src="ledoff.gif">
+<img border="0" width="50" height="50" name="led" src="ledoff.gif" />
 </td></tr>
 </table>
 </center>
@@ -441,7 +434,7 @@ function catalog_info() {
 <td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i0" width="15" height="19" src="/adm/lonLCDfont/l.gif" /></a></td>
 <td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i1" width="15" height="19" src="/adm/lonLCDfont/o.gif" /></a></td>
 <td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i2" width="15" height="19" src="/adm/lonLCDfont/n.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i3" width="15" height="19" src="/adm/lonLCDfont/hyphen.gif"></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i3" width="15" height="19" src="/adm/lonLCDfont/hyphen.gif" /></a></td>
 <td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i4" width="15" height="19" src="/adm/lonLCDfont/c.gif" /></a></td>
 <td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i5" width="15" height="19" src="/adm/lonLCDfont/a.gif" /></a></td>
 <td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i6" width="15" height="19" src="/adm/lonLCDfont/p.gif" /></a></td>
@@ -466,66 +459,66 @@ function catalog_info() {
 <table hspace="0" border="0" cellspacing="0" cellpadding="0">
 
 <tr>
-<td colspan="2"><a href="javascript:eval(hr[11]);" onMouseOver="display(dt[11],db[11]);"><img width="86" height="20" border="0" name="b11" src="dempty.gif" /></a></td>
-<td><a href="javascript:eval(hr[12]);" onMouseOver="display(dt[12],db[12]);"><img width="43" height="20" border="0" name="b12" src="empty.gif" /></a></td>
+<td colspan="2"><a name="link11" href="javascript:eval(hr[11]);" onMouseOver="display(dt[11],db[11]);"><img width="86" height="20" border="0" name="b11" src="dempty.gif" /></a></td>
+<td><a name="link12" href="javascript:eval(hr[12]);" onMouseOver="display(dt[12],db[12]);"><img width="43" height="20" border="0" name="b12" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td rowspan="2"><a href="javascript:eval(hr[21]);" onMouseOver="display(dt[21],db[21]);"><img width="43" height="40" border="0" name="b21" src="qempty.gif" /></a></td>
-<td><a href="javascript:eval(hr[22]);" onMouseOver="display(dt[22],db[22]);"><img width="43" height="20" border="0" name="b22" src="empty.gif" /></a></td>
-<td rowspan="2"><a href="javascript:eval(hr[23]);" onMouseOver="display(dt[23],db[23]);"><img width="43" height="40" border="0" name="b23" src="qempty.gif" /></a></td>
+<td rowspan="2"><a name="link21" href="javascript:eval(hr[21]);" onMouseOver="display(dt[21],db[21]);"><img width="43" height="40" border="0" name="b21" src="qempty.gif" /></a></td>
+<td><a name="link22" href="javascript:eval(hr[22]);" onMouseOver="display(dt[22],db[22]);"><img width="43" height="20" border="0" name="b22" src="empty.gif" /></a></td>
+<td rowspan="2"><a name="link23" href="javascript:eval(hr[23]);" onMouseOver="display(dt[23],db[23]);"><img width="43" height="40" border="0" name="b23" src="qempty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[31]);" onMouseOver="display(dt[31],db[31]);"><img width="43" height="20" border="0" name="b31" src="empty.gif" /></a></td>
+<td><a name="link31" href="javascript:eval(hr[31]);" onMouseOver="display(dt[31],db[31]);"><img width="43" height="20" border="0" name="b31" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[41]);" onMouseOver="display(dt[41],db[41]);"><img width="43" height="20" border="0" name="b41" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[42]);" onMouseOver="display(dt[42],db[42]);"><img width="43" height="20" border="0" name="b42" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[43]);" onMouseOver="display(dt[43],db[43]);"><img width="43" height="20" border="0" name="b43" src="empty.gif" /></a></td>
+<td><a name="link41" href="javascript:eval(hr[41]);" onMouseOver="display(dt[41],db[41]);"><img width="43" height="20" border="0" name="b41" src="empty.gif" /></a></td>
+<td><a name="link42" href="javascript:eval(hr[42]);" onMouseOver="display(dt[42],db[42]);"><img width="43" height="20" border="0" name="b42" src="empty.gif" /></a></td>
+<td><a name="link43" href="javascript:eval(hr[43]);" onMouseOver="display(dt[43],db[43]);"><img width="43" height="20" border="0" name="b43" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[51]);" onMouseOver="display(dt[51],db[51]);"><img width="43" height="20" border="0" name="b51" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[52]);" onMouseOver="display(dt[52],db[52]);"><img width="43" height="20" border="0" name="b52" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[53]);" onMouseOver="display(dt[53],db[53]);"><img width="43" height="20" border="0" name="b53" src="empty.gif" /></a></td>
+<td><a name="link51" href="javascript:eval(hr[51]);" onMouseOver="display(dt[51],db[51]);"><img width="43" height="20" border="0" name="b51" src="empty.gif" /></a></td>
+<td><a name="link52" href="javascript:eval(hr[52]);" onMouseOver="display(dt[52],db[52]);"><img width="43" height="20" border="0" name="b52" src="empty.gif" /></a></td>
+<td><a name="link53" href="javascript:eval(hr[53]);" onMouseOver="display(dt[53],db[53]);"><img width="43" height="20" border="0" name="b53" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[61]);" onMouseOver="display(dt[61],db[61]);"><img width="43" height="20" border="0" name="b61" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[62]);" onMouseOver="display(dt[62],db[62]);"><img width="43" height="20" border="0" name="b62" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[63]);" onMouseOver="display(dt[63],db[63]);"><img width="43" height="20" border="0" name="b63" src="empty.gif" /></a></td>
+<td><a name="link61" href="javascript:eval(hr[61]);" onMouseOver="display(dt[61],db[61]);"><img width="43" height="20" border="0" name="b61" src="empty.gif" /></a></td>
+<td><a name="link62" href="javascript:eval(hr[62]);" onMouseOver="display(dt[62],db[62]);"><img width="43" height="20" border="0" name="b62" src="empty.gif" /></a></td>
+<td><a name="link63" href="javascript:eval(hr[63]);" onMouseOver="display(dt[63],db[63]);"><img width="43" height="20" border="0" name="b63" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[71]);" onMouseOver="display(dt[71],db[71]);"><img width="43" height="20" border="0" name="b71" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[72]);" onMouseOver="display(dt[72],db[72]);"><img width="43" height="20" border="0" name="b72" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[73]);" onMouseOver="display(dt[73],db[73]);"><img width="43" height="20" border="0" name="b73" src="empty.gif" /></a></td>
+<td><a name="link71" href="javascript:eval(hr[71]);" onMouseOver="display(dt[71],db[71]);"><img width="43" height="20" border="0" name="b71" src="empty.gif" /></a></td>
+<td><a name="link72" href="javascript:eval(hr[72]);" onMouseOver="display(dt[72],db[72]);"><img width="43" height="20" border="0" name="b72" src="empty.gif" /></a></td>
+<td><a name="link73" href="javascript:eval(hr[73]);" onMouseOver="display(dt[73],db[73]);"><img width="43" height="20" border="0" name="b73" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[81]);" onMouseOver="display(dt[81],db[81]);"><img width="43" height="20" border="0" name="b81" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[82]);" onMouseOver="display(dt[82],db[82]);"><img width="43" height="20" border="0" name="b82" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[83]);" onMouseOver="display(dt[83],db[83]);"><img width="43" height="20" border="0" name="b83" src="empty.gif" /></a></td>
+<td><a name="link81" href="javascript:eval(hr[81]);" onMouseOver="display(dt[81],db[81]);"><img width="43" height="20" border="0" name="b81" src="empty.gif" /></a></td>
+<td><a name="link82" href="javascript:eval(hr[82]);" onMouseOver="display(dt[82],db[82]);"><img width="43" height="20" border="0" name="b82" src="empty.gif" /></a></td>
+<td><a name="link83" href="javascript:eval(hr[83]);" onMouseOver="display(dt[83],db[83]);"><img width="43" height="20" border="0" name="b83" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[91]);" onMouseOver="display(dt[91],db[91]);"><img width="43" height="20" border="0" name="b91" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[92]);" onMouseOver="display(dt[92],db[92]);"><img width="43" height="20" border="0" name="b92" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[93]);" onMouseOver="display(dt[93],db[93]);"><img width="43" height="20" border="0" name="b93" src="empty.gif" /></a></td>
+<td><a name="link91" href="javascript:eval(hr[91]);" onMouseOver="display(dt[91],db[91]);"><img width="43" height="20" border="0" name="b91" src="empty.gif" /></a></td>
+<td><a name="link92" href="javascript:eval(hr[92]);" onMouseOver="display(dt[92],db[92]);"><img width="43" height="20" border="0" name="b92" src="empty.gif" /></a></td>
+<td><a name="link93" href="javascript:eval(hr[93]);" onMouseOver="display(dt[93],db[93]);"><img width="43" height="20" border="0" name="b93" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[101]);" onMouseOver="display(dt[101],db[101]);"><img width="43" height="20" border="0" name="b101" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[102]);" onMouseOver="display(dt[102],db[102]);"><img width="43" height="20" border="0" name="b102" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[103]);" onMouseOver="display(dt[103],db[103]);"><img width="43" height="20" border="0" name="b103" src="empty.gif" /></a></td>
+<td><a name="link101" href="javascript:eval(hr[101]);" onMouseOver="display(dt[101],db[101]);"><img width="43" height="20" border="0" name="b101" src="empty.gif" /></a></td>
+<td><a name="link102" href="javascript:eval(hr[102]);" onMouseOver="display(dt[102],db[102]);"><img width="43" height="20" border="0" name="b102" src="empty.gif" /></a></td>
+<td><a name="link103" href="javascript:eval(hr[103]);" onMouseOver="display(dt[103],db[103]);"><img width="43" height="20" border="0" name="b103" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[111]);" onMouseOver="display(dt[111],db[111]);"><img width="43" height="20" border="0" name="b111" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[112]);" onMouseOver="display(dt[112],db[112]);"><img width="43" height="20" border="0" name="b112" src="empty.gif" /></a></td>
-<td><a 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>
+<td><a name="link111" href="javascript:eval(hr[111]);" onMouseOver="display(dt[111],db[111]);"><img width="43" height="20" border="0" name="b111" src="empty.gif" /></a></td>
+<td><a name="link112" href="javascript:eval(hr[112]);" onMouseOver="display(dt[112],db[112]);"><img width="43" height="20" border="0" name="b112" src="empty.gif" /></a></td>
+<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>
 
 </table>
@@ -537,9 +530,6 @@ function catalog_info() {
 <input type="hidden" name="url" value="none" />
 <input type="hidden" name="symb" value="none" />
 </form>
-<script>
-activate();
-</script>
 </font>
 </body>
 </html>
