--- 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/06 15:18:23	1.68
@@ -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.68 2002/09/06 15:18:23 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -50,6 +50,8 @@ var imgpath='/res/adm/pages/';
 var fontpath='/adm/lonLCDfont/';
 var currentURL='';
 var reloadURL='';
+var currentSymb='';
+var reloadSymb='';
 var currentStale=1;
 var menucltim;
 
@@ -233,16 +235,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 +251,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 != '') {
@@ -273,6 +271,7 @@ function go(url) {
    this.document['led'].src="ledsend.gif";
    if (url!='' && url!= null) {
        currentURL = null;
+       currentSymb= null;
        clientwindow.window.location.href="http://"+clienthost+url;
    }
 }
@@ -285,6 +284,7 @@ function gopost(url,postdata) {
       this.document.server.postdata.value=postdata;
       this.document.server.command.value='';
       this.document.server.url.value='';
+      this.document.server.symb.value='';
       this.document.server.submit();
    }
 }
@@ -297,6 +297,7 @@ function gocmd(url,cmd) {
       this.document.server.postdata.value='';
       this.document.server.command.value=cmd;
       this.document.server.url.value=currentURL;
+      this.document.server.symb.value=currentSymb;
       this.document.server.submit();
    }
 }
@@ -348,7 +349,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>
@@ -478,6 +479,7 @@ function catalog_info() {
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />
+<input type="hidden" name="symb" value="none" />
 </form>
 <script>
 activate();