--- loncom/html/res/adm/pages/menu.html	2002/07/24 19:48:58	1.62
+++ loncom/html/res/adm/pages/menu.html	2002/09/06 17:05:27	1.69
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.62 2002/07/24 19:48:58 www Exp $
+// $Id: menu.html,v 1.69 2002/09/06 17:05:27 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -47,9 +47,11 @@ var active = 0;
 var dislocked = 1;
 
 var imgpath='/res/adm/pages/';
-
+var fontpath='/adm/lonLCDfont/';
 var currentURL='';
 var reloadURL='';
+var currentSymb='';
+var reloadSymb='';
 var currentStale=1;
 var menucltim;
 
@@ -101,7 +103,12 @@ function advanceclock() {
     var mons=""+(clock.getMonth()+1);
     if (mons.length<2) { mons="0"+mons; }
     var years=""+clock.getYear();
-    years=years.substring(1,3);
+
+    if (years>1000) {
+       years=years.substring(2,4);
+    } else {
+       years=years.substring(1,3);
+    }
     statustop=mons+'/'+days+'/'+years;
 
     var secs=""+clock.getSeconds();
@@ -183,7 +190,7 @@ function showdisplay(utext,ltext) {
          if (ch==':') { ch='colon'; }
          if (ch=='/') { ch='slash'; }
       } else { ch='space'; }
-      this.document['i'+i].src=imgpath+ch+'.gif';
+      this.document['i'+i].src=fontpath+ch+'.gif';
    }
    for (i=0;i<=7;i++) {
       if (i<ltext.length) {
@@ -193,7 +200,7 @@ function showdisplay(utext,ltext) {
          if (ch==':') { ch='colon'; }
          if (ch=='/') { ch='slash'; }
       } else { ch='space'; }
-      this.document['j'+i].src=imgpath+ch+'.gif';
+      this.document['j'+i].src=fontpath+ch+'.gif';
    }
   }
 }
@@ -228,12 +235,16 @@ 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 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) {
@@ -244,14 +255,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 != '') {
@@ -264,6 +275,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;
    }
 }
@@ -276,6 +288,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();
    }
 }
@@ -288,6 +301,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();
    }
 }
@@ -339,7 +353,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>
@@ -366,24 +380,24 @@ function catalog_info() {
 <tr><td bgcolor="#666666">
 <table hspace="0" border="0" cellspacing="1" cellpadding="0"> 
 <tr>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i0" width="15" height="19" src="l.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i1" width="15" height="19" src="o.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i2" width="15" height="19" src="n.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i3" width="15" height="19" src="hyphen.gif"></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i4" width="15" height="19" src="c.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i5" width="15" height="19" src="a.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i6" width="15" height="19" src="p.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i7" width="15" height="19" src="a.gif" /></a></td>
-</tr>
-<tr>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j0" width="15" height="19" src="space.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j1" width="15" height="19" src="space.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j2" width="15" height="19" src="space.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j3" width="15" height="19" src="space.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j4" width="15" height="19" src="space.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j5" width="15" height="19" src="space.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j6" width="15" height="19" src="space.gif" /></a></td>
-<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j7" width="15" height="19" src="space.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i0" width="15" height="19" src="/adm/lonLCDfont/l.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i1" width="15" height="19" src="/adm/lonLCDfont/o.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i2" width="15" height="19" src="/adm/lonLCDfont/n.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i3" width="15" height="19" src="/adm/lonLCDfont/hyphen.gif"></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i4" width="15" height="19" src="/adm/lonLCDfont/c.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i5" width="15" height="19" src="/adm/lonLCDfont/a.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i6" width="15" height="19" src="/adm/lonLCDfont/p.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0"  name="i7" width="15" height="19" src="/adm/lonLCDfont/a.gif" /></a></td>
+</tr>
+<tr>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j0" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j1" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j2" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j3" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j4" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j5" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j6" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onMouseOver="defdis();"><img border="0" name="j7" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
 </tr>
 </table>
 </td></tr>
@@ -462,13 +476,14 @@ function catalog_info() {
 <center>
 <a href="javascript:defdis();"
    onMouseOver="defdis();"
-><img width="103" height="7" border="0" src="spacer.gif" /></a>
+><img width="103" height="3" border="0" src="spacer.gif" /></a>
 </center>
 
 <form name="server" action="/adm/logout" method="post" target="loncapaclient">
 <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();