[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm

www lon-capa-cvs@mail.lon-capa.org
Fri, 23 May 2003 23:18:37 -0000


www		Fri May 23 19:18:37 2003 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  Pretty amazing how the Remote itself is parsed on the way out ...
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.68 loncom/interface/lonmenu.pm:1.69
--- loncom/interface/lonmenu.pm:1.68	Fri May 23 17:47:27 2003
+++ loncom/interface/lonmenu.pm	Fri May 23 19:18:37 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.68 2003/05/23 21:47:27 www Exp $
+# $Id: lonmenu.pm,v 1.69 2003/05/23 23:18:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -182,13 +182,13 @@
         (!$forcereg))) {
         my $loadfunction='';
         my $unloadfunction='';
-        unless (1 || ($ENV{'browser.interface'} eq 'textual') ||
+        unless (($ENV{'browser.interface'} eq 'textual') ||
                 ($ENV{'environment.remote'} eq 'off') ||
-                ($ENV{'request.publicaccess'})) {
+                ($ENV{'request.publicaccess'}) ||
+                ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html')) {
 	    my $reopen=&Apache::lonmenu::reopenmenu();
-	    $loadfunction='swmenu='.$reopen.'swmenu.noclient=0;';
-	    $unloadfunction='swmenu='.$reopen.'swmenu.noclient=1;';
-
+ 	    $loadfunction='swmenu='.$reopen.'swmenu.noclient=0;';
+ 	    $unloadfunction='swmenu='.$reopen.'swmenu.noclient=1;';
         } 
 	return $result.(<<ENDFUNCTIONS);
 <script type="text/javascript">