--- loncom/interface/lonmenu.pm	2004/12/07 23:59:52	1.140
+++ loncom/interface/lonmenu.pm	2005/02/07 23:37:45	1.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.140 2004/12/07 23:59:52 albertel Exp $
+# $Id: lonmenu.pm,v 1.144 2005/02/07 23:37:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,13 +145,25 @@ 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\//) &&
-         ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+	    if (
+		($ENV{'request.noversionuri'}=~m[^/(res|public)/] &&
+		 $ENV{'request.symb'} ne '')
+		||
+		(($ENV{'request.noversionuri'}=~/^\/adm\//) &&
+		 ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+		 ($ENV{'request.noversionuri'}!~
+		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+		  )
+		 ) {
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <td bgcolor="$tabbg">
@@ -974,7 +986,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();
@@ -1142,7 +1155,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">