--- loncom/html/res/adm/pages/menu.html	2002/04/04 17:35:57	1.47
+++ loncom/html/res/adm/pages/menu.html	2002/05/15 20:44:24	1.52
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.47 2002/04/04 17:35:57 matthew Exp $
+// $Id: menu.html,v 1.52 2002/05/15 20:44:24 matthew Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -44,6 +44,11 @@ Jan Guy Albertelli
 YEAR=2002
 March 2002 Matthew Hall
 3/19 Gerd Kortemeyer
+5/6/02 Matthew Hall
+
+// Note: use of style="background-image: url(remotebg.gif)"
+// in body tag causes trouble for NS4.x on multiple platforms. 
+
 -->
 <head>
 <title>LON-CAPA Remote</title>
@@ -52,7 +57,10 @@ March 2002 Matthew Hall
 
 <body bgcolor="#BBBBBB" 
       background="remotebg.gif"
-      onUnload="logout();">
+      onUnload="logout();"
+      >
+<style type="text/css">
+</style>
 <basefont size="1" />
 
 <script type="text/javascript">
@@ -90,9 +98,9 @@ var dt = new Array;
 for (var i=1;i<=3;i++) {
    for (var j=1;j<=10;j++) {
       var index = 10*j+i;
-      hr[index]=null;
-      db[index]=null;
-      dt[index]=null;
+      hr[index]='';
+      db[index]='';
+      dt[index]='';
    }
 }
 
@@ -143,8 +151,8 @@ function display(utext,ltext) {
   this.window.focus();
   if (utext == null) { utext = '';}
   if (ltext == null) { ltext = '';}
-  if (typeof(utext)=="undefined") { utext=''; }
-  if (typeof(ltext)=="undefined") { ltext=''; }
+  if (typeof(utext)!="string") { utext=''; }
+  if (typeof(ltext)!="string") { ltext=''; }
   if ((utext=='') && (ltext=='')) {
      utext=statustop;
      ltext=statusbot;
@@ -198,21 +206,31 @@ function setstatus(tp,bt) {
    endsend();
 }
 
+function is_editable_resource (url) {
+   var Chunks = url.split('.');
+   var tmp = Chunks[Chunks.length-1];
+   if ((Chunks.length > 1) && (Math.floor(tmp) == tmp)) {
+       return true;
+   } 
+   return false;
+}
+
 function cstrgo(currenturl,defaulturl) {
    windowcheck();
    var url;
-   if (currenturl != null && currenturl != '') {
+   if ((currenturl == null) || 
+       (currenturl == '')   || 
+       (! is_editable_resource(currenturl))) {
+      url = defaulturl;
+   } else {
       url = currenturl;
-      var priv_pattern  = /^\/priv/;
-      var tilda_pattern = /^\/~/;
-      if (priv_pattern.test(url) || tilda_pattern.test(url)) {
-         url = defaulturl;
-      } else {
-         // map /res/103/turtle -> /priv/turtle
+      var res_pattern     = /^\/res\/[A-z0-p]+\//;
+      if (res_pattern.test(url)) {
+         // map /res/103/turtle to /priv/turtle
          url = url.replace(/^\/res\/[A-z0-9]+\//,'/priv/');
+      } else {
+         url = defaulturl;
       }
-   } else {
-      url = defaulturl;
    }
    this.document['led'].src="ledsend.gif";
    if (url != '') {
