--- loncom/html/res/adm/pages/menu.html	2002/09/09 18:30:19	1.66.2.1
+++ loncom/html/res/adm/pages/menu.html	2002/09/02 19:58:51	1.67
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.66.2.1 2002/09/09 18:30:19 albertel Exp $
+// $Id: menu.html,v 1.67 2002/09/02 19:58:51 bowersj2 Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -233,16 +233,12 @@ function setstatus(tp,bt) {
 }
 
 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;
+       return true;
+   } 
+   return false;
 }
 
 function cstrgo(currenturl,defaulturl) {
@@ -253,14 +249,14 @@ function cstrgo(currenturl,defaulturl) {
        (! 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];
+      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;
       }
-      SlashChunks.length--;
-      url=SlashChunks.join('/');
    }
    this.document['led'].src="ledsend.gif";
    if (url != '') {
@@ -348,7 +344,7 @@ function edit_bookmarks() {
 function catalog_info() {
    go('');
    w_LONcatInfo_flag=1;
-   loncatinfo=window.open(clientwindow.window.location.href+'.meta',"LONcatInfo");
+   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"LONcatInfo");
 }
 // -->
 </script>