--- loncom/interface/lonmenu.pm	2003/02/17 22:59:37	1.42
+++ loncom/interface/lonmenu.pm	2003/03/10 20:21:45	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.42 2003/02/17 22:59:37 www Exp $
+# $Id: lonmenu.pm,v 1.47 2003/03/10 20:21:45 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ package Apache::lonmenu;
 use strict;
 use Apache::lonnet;
 use Apache::Constants qw(:common);
+use Apache::lonhtmlcommon();
 use Apache::loncommon;
 use Apache::File;
 use vars qw(@desklines $readdesk);
@@ -49,7 +50,15 @@ sub menubuttons {
     my $registration=shift;
     unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
 # Textual display only
-    my $output='<a href="/adm/menu">Main Menu</a><br />';
+    my $output=(<<ENDMAINMENU);
+<script>
+// BEGIN LON-CAPA Internal
+</script>
+<a href="/adm/menu" target="_top">Main Menu</a><br />
+<script>
+// END LON-CAPA Internal
+</script>
+ENDMAINMENU
     if ($registration) { $output.=&innerregister($forcereg,$target); }
     return $output."<hr />";
 }
@@ -62,7 +71,7 @@ sub registerurl {
     my $result = '';
     
     if ($target eq 'edit') {
-        $result .="<script type=\"text/javascrtipt\">\n".
+        $result .="<script type=\"text/javascript\">\n".
             "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
             &Apache::loncommon::browser_and_searcher_javascript().
                 "\n</script>\n";
@@ -237,7 +246,7 @@ var swmenu=null;
           $newmail
           $buttons
 	  swmenu.currentURL=window.location.pathname;
-          swmenu.reloadURL=window.location.pathname;
+          swmenu.reloadURL=window.location.pathname+window.location.search;
           swmenu.currentSymb="$ENV{'request.symb'}";
           swmenu.reloadSymb="$ENV{'request.symb'}";
           swmenu.currentStale=0;
@@ -393,11 +402,10 @@ ENDMAINCALL
 # ================================================================= Reopen menu
 
 sub reopenmenu {
-   my $nothing='';
    if ($ENV{'browser.interface'} eq 'textual') { return ''; }
    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
-   if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
-   return('window.open("'.$nothing.'","'.$menuname.'","",false);');
+   my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+   return('window.open('.$nothing.',"'.$menuname.'","",false);');
 } 
 
 # =============================================================== Open the menu
@@ -449,7 +457,8 @@ sub switch {
        my $text=$top.' '.$bot;
        $text=~s/\- //;
        return "\n".($nobreak?' ':'<br />').
-        '<a href="javascript:'.$act.';">'.$text.'</a> '.($nobreak?'':$desc);
+        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
+        ($nobreak?'':$desc);
    }
 }
 
@@ -470,11 +479,8 @@ sub secondlevel {
 sub openmenu {
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     if ($ENV{'browser.interface'} eq 'textual') { return ''; }
-    if ($ENV{'browser.type'} eq 'explorer') {
-       return "window.open('javascript:void(0);','".$menuname."');";
-   } else {
-       return "window.open('','".$menuname."');";
-   }
+    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+    return "window.open(".$nothing.",'".$menuname."');";
 }
 
 sub rawconfig {