[LON-CAPA-cvs] cvs: loncom(version_0_5_1) /html/res/adm/pages menu.html

[albertel]

albertel		Mon Sep  9 14:30:19 2002 EDT

  Modified files:              (Branch: version_0_5_1)
    /loncom/html/res/adm/pages	menu.html 
  Log:
  - picking up 1.69 and backporting it.
  
  
Index: loncom/html/res/adm/pages/menu.html
diff -u loncom/html/res/adm/pages/menu.html:1.66 loncom/html/res/adm/pages/menu.html:1.66.2.1
--- loncom/html/res/adm/pages/menu.html:1.66	Sun Aug 11 15:03:35 2002
+++ loncom/html/res/adm/pages/menu.html	Mon Sep  9 14:30:19 2002
@@ -4,7 +4,7 @@
 Remote Control
 
 //
-// $Id: menu.html,v 1.66 2002/08/11 19:03:35 www Exp $
+// $Id: menu.html,v 1.66.2.1 2002/09/09 18:30:19 albertel Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -233,12 +233,16 @@
 }
 
 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 true;
-   } 
-   return false;
+       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) {
@@ -249,14 +253,14 @@
        (! is_editable_resource(currenturl))) {
       url = defaulturl;
    } else {
-      url = currenturl;
-      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;
+      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 != '') {