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

Sat, 18 Sep 2004 16:28:35 -0000

albertel		Sat Sep 18 12:28:35 2004 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - need the utility fucntions basically always
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.115 loncom/interface/lonmenu.pm:1.116

--- loncom/interface/lonmenu.pm:1.115	Fri Aug 27 13:03:45 2004
+++ loncom/interface/lonmenu.pm	Sat Sep 18 12:28:35 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.115 2004/08/27 17:03:45 albertel Exp $
+# $Id: lonmenu.pm,v 1.116 2004/09/18 16:28:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,7 +69,6 @@
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
-    
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['inhibitmenu']);
     if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }
@@ -97,9 +96,11 @@
 ENDRELOAD
             }
         }
+        my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
 <script>
 // BEGIN LON-CAPA Internal
+$utility
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps<br />
@@ -134,12 +135,8 @@
         my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
 # Do we have a NAV link?
         if ($ENV{'request.course.id'}) {
-	    my $navcontrol=&Apache::lonnavmaps::nav_control_js();
-	    $navmaps=(<<ENDNAV);
+        	    $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">
-<script type="text/javascript">
-$navcontrol
-</script>
 <a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV
 	    if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
@@ -156,9 +153,11 @@
         if ($registration) {
            $reg=&innerregister($forcereg,$target);
         }
+	my $utility=&utilityfunctions();
 	return (<<ENDINLINEMENU);
 <script>
 // BEGIN LON-CAPA Internal
+$utility
 </script>
 <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
@@ -168,7 +167,7 @@
 $reloadlink
 $navmaps
 <td bgcolor="$tabbg">
-<a href="/adm/remote?action=launch&url=$escurl" target="_top">
+<a href="/adm/remote?action=launch&url=$escurl">
 <font color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
 <img align="right" src="/adm/lonIcons/minilogo.gif" />
@@ -389,7 +388,6 @@
         }
         if ($textual) {
 # Registered, textual output
-            my $utility=&utilityfunctions();
             my $form=&serverform();
 	    my $inlinebuttons='';
 
@@ -408,7 +406,6 @@
 	    $result =(<<ENDREGTEXT);
 <script>
 // BEGIN LON-CAPA Internal
-$utility
 </script>
 $timesync
 $newmail
@@ -981,13 +978,9 @@
 	$ENV{'browser.interface'}='faketextual';
 	$ENV{'environment.remote'}='off';
     }
-    my $utility=&utilityfunctions();
     $r->print(<<ENDHEADER);
 <html><head>
 <title>LON-CAPA Main Menu</title>
-<script>
-$utility
-</script>
 </head>
 $bodytag
 ENDHEADER



