--- loncom/xml/lonxml.pm	2001/06/02 19:55:46	1.85
+++ loncom/xml/lonxml.pm	2001/06/03 18:33:54	1.86
@@ -9,7 +9,7 @@
 # 5/10 Scott Harrison
 # 5/26 Gerd Kortemeyer
 # 5/27 H. K. Ng
-# 6/2 Gerd Kortemeyer
+# 6/2,6/3 Gerd Kortemeyer
 
 package Apache::lonxml; 
 use vars 
@@ -99,12 +99,15 @@ sub fontsettings() {
 }
 
 sub registerurl {
-  return (<<ENDSCRIPT);
+    if ($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) {
+	return (<<ENDREGTHIS);
+
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
+
     function LONCAPAreg() {
-       if (window.location.pathname!="/res/adm/pages/menu.html") {
 	  menu=window.open("","LONCAPAmenu");
+          menu.clearTimeout(menu.menucltim);
 	  menu.currentURL=window.location.pathname;
           menu.currentStale=0;
           menu.clearbut(3,1);
@@ -118,11 +121,30 @@ sub registerurl {
        (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
           menu.switchbutton
      (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
-       }
     }
-  
+
     function LONCAPAstale() {
-       if (window.location.pathname!="/res/adm/pages/menu.html") {
+	  menu=window.open("","LONCAPAmenu");
+          menu.currentStale=1;
+          menu.switchbutton
+            (3,1,'reload.gif','return','location','go(currentURL)');
+          menu.menucltim=menu.setTimeout(
+ 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);',
+			  2000);
+
+    }
+
+// END LON-CAPA Internal
+</script>
+ENDREGTHIS
+
+    } else {
+        return (<<ENDDONOTREGTHIS);
+
+<script language="JavaScript">
+// BEGIN LON-CAPA Internal
+
+    function LONCAPAreg() {
 	  menu=window.open("","LONCAPAmenu");
           menu.currentStale=1;
           menu.clearbut(2,1);
@@ -130,13 +152,22 @@ sub registerurl {
           menu.clearbut(8,1);
           menu.clearbut(8,2);
           menu.clearbut(8,3);
-          menu.switchbutton
-            (3,1,'reload.gif','return','location','go(currentURL)');
-       }
+          if (menu.currentURL) {
+             menu.switchbutton
+              (3,1,'reload.gif','return','location','go(currentURL)');
+ 	  } else {
+	      menu.clearbut(3,1);
+          }
     }
+
+    function LONCAPAstale() {
+    }
+
 // END LON-CAPA Internal
 </script>
-ENDSCRIPT
+ENDDONOTREGTHIS
+
+    }
 }
 
 sub loadevents() {