--- loncom/html/res/adm/pages/menu.html	2002/08/11 19:03:35	1.66
+++ loncom/html/res/adm/pages/menu.html	2002/10/11 20:52:13	1.71
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.66 2002/08/11 19:03:35 www Exp $
+// $Id: menu.html,v 1.71 2002/10/11 20:52:13 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -45,11 +45,14 @@ var statustop = '';
 var statusbot = '';
 var active = 0;
 var dislocked = 1;
+var statuslocked = 0;
 
 var imgpath='/res/adm/pages/';
 var fontpath='/adm/lonLCDfont/';
 var currentURL='';
 var reloadURL='';
+var currentSymb='';
+var reloadSymb='';
 var currentStale=1;
 var menucltim;
 
@@ -95,30 +98,30 @@ function syncclock(servertime) {
 function advanceclock() {
     var clock=new Date();
     clock.setTime(clock.getTime()+clockdelta);
+    if (!statuslocked) {
+       var days=""+clock.getDate();
+       if (days.length<2) { days="0"+days; }
+       var mons=""+(clock.getMonth()+1);
+       if (mons.length<2) { mons="0"+mons; }
+       var years=""+clock.getYear();
+
+       if (years>1000) {
+          years=years.substring(2,4);
+       } else {
+          years=years.substring(1,3);
+       }
+       statustop=mons+'/'+days+'/'+years;
+
+       var secs=""+clock.getSeconds();
+       if (secs.length<2) { secs="0"+secs; }
+       var mins=""+clock.getMinutes();
+       if (mins.length<2) { mins="0"+mins; }
+       var hours=""+clock.getHours();
+       if (hours.length<2) { hours=" "+hours; }
+       statusbot=hours+':'+mins+':'+secs;
 
-    var days=""+clock.getDate();
-    if (days.length<2) { days="0"+days; }
-    var mons=""+(clock.getMonth()+1);
-    if (mons.length<2) { mons="0"+mons; }
-    var years=""+clock.getYear();
-
-    if (years>1000) {
-       years=years.substring(2,4);
-    } else {
-       years=years.substring(1,3);
+       if (!dislocked) { showdisplay(); }
     }
-    statustop=mons+'/'+days+'/'+years;
-
-    var secs=""+clock.getSeconds();
-    if (secs.length<2) { secs="0"+secs; }
-    var mins=""+clock.getMinutes();
-    if (mins.length<2) { mins="0"+mins; }
-    var hours=""+clock.getHours();
-    if (hours.length<2) { hours=" "+hours; }
-    statusbot=hours+':'+mins+':'+secs;
-
-    if (!dislocked) { showdisplay(); }
-
     setTimeout('advanceclock();',1000);
 }
 
@@ -225,20 +228,25 @@ function clearbut(row,col) {
 }
 
 function setstatus(tp,bt) {
-   this.document['led'].src="ledblink.gif";
+   this.document['led'].src="http://"+clienthost+imgpath+"ledblink.gif";
    statustop=tp;
    statusbot=bt;
+   statuslocked=1;
    defdis();
    endsend();
 }
 
 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 +257,14 @@ function cstrgo(currenturl,defaulturl) {
        (! 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 != '') {
@@ -266,33 +274,39 @@ function cstrgo(currenturl,defaulturl) {
 
 function go(url) {
    windowcheck();
+   statuslocked=0;
    this.document['led'].src="ledsend.gif";
    if (url!='' && url!= null) {
        currentURL = null;
+       currentSymb= null;
        clientwindow.window.location.href="http://"+clienthost+url;
    }
 }
 
 function gopost(url,postdata) {
    windowcheck();
-   this.document['led'].src="ledsend.gif";
+   statuslocked=0;
+   this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
    if (url!='') {
       this.document.server.action="http://"+clienthost+url;
       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();
    }
 }
 
 function gocmd(url,cmd) {
    windowcheck();
-   this.document['led'].src="ledsend.gif";
+   statuslocked=0;
+   this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif";
    if (url!='') {
       this.document.server.action="http://"+clienthost+url;
       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();
    }
 }
@@ -344,7 +358,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>
@@ -474,6 +488,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();