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

[albertel]

albertel		Tue Nov  2 16:02:01 2004 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm lonmenu.pm 
  Log:
  - reducing interdependencies
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.301 loncom/interface/lonnavmaps.pm:1.302
--- loncom/interface/lonnavmaps.pm:1.301	Wed Oct 27 14:15:31 2004
+++ loncom/interface/lonnavmaps.pm	Tue Nov  2 16:02:01 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.301 2004/10/27 18:15:31 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.302 2004/11/02 21:02:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -119,23 +119,6 @@
 ENDCLOSE
 }
 
-sub nav_control_js {
-    my $nav=($ENV{'environment.remotenavmap'} eq 'on');
-    return (<<NAVCONTROL);
-    var w_loncapanav_flag="$nav";
-
-
-function gonav(url) {
-   if (w_loncapanav_flag != 1) {
-      gopost(url,'');
-   }  else {
-      navwindow=window.open(url,
-                  "loncapanav","height=600,width=400,scrollbars=1"); 
-   }
-}
-NAVCONTROL
-}
-
 sub update {
     if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }
     if (!$ENV{'request.course.id'}) { return ''; }
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.121 loncom/interface/lonmenu.pm:1.122
--- loncom/interface/lonmenu.pm:1.121	Sun Oct 31 23:31:03 2004
+++ loncom/interface/lonmenu.pm	Tue Nov  2 16:02:01 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.121 2004/11/01 04:31:03 raeburn Exp $
+# $Id: lonmenu.pm,v 1.122 2004/11/02 21:02:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,6 @@
 use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
-use Apache::lonnavmaps();
 use Apache::lonlocal;
 
 use vars qw(@desklines $readdesk);
@@ -952,12 +951,29 @@
 
 }
 
+sub nav_control_js {
+    my $nav=($ENV{'environment.remotenavmap'} eq 'on');
+    return (<<NAVCONTROL);
+    var w_loncapanav_flag="$nav";
+
+
+function gonav(url) {
+   if (w_loncapanav_flag != 1) {
+      gopost(url,'');
+   }  else {
+      navwindow=window.open(url,
+                  "loncapanav","height=600,width=400,scrollbars=1"); 
+   }
+}
+NAVCONTROL
+}
+
 sub utilityfunctions {
     unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $currenturl=$ENV{'request.noversionuri'};
     my $currentsymb=$ENV{'request.symb'};
-    my $nav_control=&Apache::lonnavmaps::nav_control_js();
+    my $nav_control=&nav_control_js();
 return (<<ENDUTILITY)
 
     var currentURL="$currenturl";