--- loncom/interface/lonmenu.pm	2004/12/06 19:37:46	1.139
+++ loncom/interface/lonmenu.pm	2005/02/02 19:24:45	1.143
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.139 2004/12/06 19:37:46 albertel Exp $
+# $Id: lonmenu.pm,v 1.143 2005/02/02 19:24:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,9 +145,14 @@ ENDMAINMENU
         my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
 # Do we have a NAV link?
         if ($ENV{'request.course.id'}) {
-        	    $navmaps=(<<ENDNAV);
+	    my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
+		$escsymb;
+	    if ($ENV{'environment.remotenavmap'} eq 'on') {
+		$link="javascript:gonav('".$link."')";
+	    }
+	    $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">
-<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&amp;postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
+<a href="$link"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV
 	    if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
                 ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
@@ -464,6 +469,8 @@ ENDREGTEXT
 	    $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri));
 	    my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
 	    my $navstatus=&get_nav_status();
+	    my $clearcstr;
+	    if ($ENV{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
@@ -498,7 +505,7 @@ var swmenu=null;
           swmenu.clearbut(7,3);
           swmenu.menucltim=swmenu.setTimeout(
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
+ 'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr',
 			  2000);
       }
 
@@ -972,7 +979,8 @@ sub utilityfunctions {
     my $caller = shift;
     unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
-    my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'});
+    my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$ENV{'request.noversionuri'}))[0]));
+    $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl));
     
     my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
     my $nav_control=&nav_control_js();
@@ -1140,7 +1148,7 @@ sub handler {
     $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
     $font=&Apache::loncommon::designparm($function.'.font',$domain);
     my $script_tag;
-    if ($ENV{'environment.remote'} eq 'on') {
+    if ($ENV{'environment.remote'} ne 'off') {
         my $utility=&utilityfunctions('/adm/menu');
         $script_tag=(<<ENDSCRIPT);
 <script type="text/javascript">