--- loncom/interface/lonmenu.pm	2004/07/02 07:58:01	1.109
+++ loncom/interface/lonmenu.pm	2004/08/13 20:12:11	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.109 2004/07/02 07:58:01 albertel Exp $
+# $Id: lonmenu.pm,v 1.113 2004/08/13 20:12:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,6 +68,11 @@ sub menubuttons {
     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 ''; }
+
     my $navmaps='';
     my $reloadlink='';
     my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'});
@@ -339,7 +344,6 @@ sub innerregister {
                 }
             }        
             # Finally, turn the button on or off
-	    &Apache::lonnet::logthis("cfile is $cfile");
             if ($cfile) {
                 $editbutton=&switch
                     ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
@@ -416,6 +420,7 @@ ENDREGTEXT
         } else {
 	    my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];
 	    $requri=&Apache::lonnet::unescape($requri);
+	    my $navstatus=&get_nav_status();
 	    $result = (<<ENDREGTHIS);
      
 <script language="JavaScript">
@@ -433,6 +438,7 @@ var swmenu=null;
           swmenu.currentSymb="$ENV{'request.symb'}";
           swmenu.reloadSymb="$ENV{'request.symb'}";
           swmenu.currentStale=0;
+	  $navstatus
           $hwkadd
           $editbutton
     }
@@ -605,7 +611,9 @@ sub reopenmenu {
 sub open {
     my $returnval='';
     if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+        ($ENV{'environment.remote'} eq 'off')) { 
+	return '<script type="text/javascript">self.name="loncapaclient";</script>';
+    }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     unless (shift eq 'unix') {
 # resizing does not work on linux because of virtual desktop sizes
@@ -923,6 +931,17 @@ sub serverform {
 </form>
 ENDSERVERFORM
 }
+
+sub get_nav_status {
+    my $navstatus="swmenu.w_loncapanav_flag=";
+    if ($ENV{'environment.remotenavmap'} eq 'on') {
+	$navstatus.="1";
+    } else {
+	$navstatus.="-1";
+    }
+    return $navstatus;
+}
+
 # ================================================ Handler when called directly