[LON-CAPA-cvs] cvs: loncom /html/res/adm/pages menu.html /xml lonxml.pm

[www]

www		Wed May 29 12:22:10 2002 EDT

  Modified files:              
    /loncom/html/res/adm/pages	menu.html 
    /loncom/xml	lonxml.pm 
  Log:
  Bug 461.
  Introduce explicit reloadURL.
  
  
Index: loncom/html/res/adm/pages/menu.html
diff -u loncom/html/res/adm/pages/menu.html:1.58 loncom/html/res/adm/pages/menu.html:1.59
--- loncom/html/res/adm/pages/menu.html:1.58	Sat May 25 16:41:12 2002
+++ loncom/html/res/adm/pages/menu.html	Wed May 29 12:22:09 2002
@@ -4,7 +4,7 @@
 Remote Control
 
 //
-// $Id: menu.html,v 1.58 2002/05/25 20:41:12 www Exp $
+// $Id: menu.html,v 1.59 2002/05/29 16:22:09 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -66,6 +66,7 @@
 var imgpath='/res/adm/pages/';
 
 var currentURL='';
+var reloadURL='';
 var currentStale=1;
 var menucltim;
 
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.174 loncom/xml/lonxml.pm:1.175
--- loncom/xml/lonxml.pm:1.174	Fri May 24 16:51:55 2002
+++ loncom/xml/lonxml.pm	Wed May 29 12:22:09 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.174 2002/05/24 20:51:55 www Exp $
+# $Id: lonxml.pm,v 1.175 2002/05/29 16:22:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -370,6 +370,7 @@
           menu.clearTimeout(menu.menucltim);
           $timesync
 	  menu.currentURL=window.location.pathname;
+          menu.reloadURL=window.location.pathname;
           menu.currentStale=0;
           menu.clearbut(3,1);
           menu.switchbutton
@@ -396,8 +397,10 @@
     function LONCAPAstale() {
 	  menu=window.open("$nothing","LONCAPAmenu","",false);
           menu.currentStale=1;
-          menu.switchbutton
-             (3,1,'reload.gif','return','location','go(currentURL)');
+          if (menu.reloadURL!='' && menu.reloadURL!= null) { 
+             menu.switchbutton
+             (3,1,'reload.gif','return','location','go(reloadURL)');
+	  }
           menu.clearbut(7,1);
           menu.clearbut(7,2);
           menu.clearbut(7,3);