--- loncom/interface/lonmenu.pm	2003/02/17 19:28:54	1.41
+++ loncom/interface/lonmenu.pm	2003/02/20 22:04:18	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.41 2003/02/17 19:28:54 www Exp $
+# $Id: lonmenu.pm,v 1.44 2003/02/20 22:04:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,7 +49,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 />";
 }
@@ -204,12 +212,23 @@ ENDMENUITEMS
         }
         if ($textual) {
 # Registered, textual output
+            my $utility=&utilityfunctions();
+            my $form=&serverform();
 	    $result =(<<ENDREGTEXT);
+<script>
+// BEGIN LON-CAPA Internal
+$utility
+</script>
 $timesync
 $newmail
 $buttons
 $hwkadd
 $editbutton
+$form
+<script>
+//END LON-CAPA Internal
+</script>
+
 ENDREGTEXT
 # Registered, graphical output
         } else {
@@ -217,6 +236,7 @@ ENDREGTEXT
      
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
+var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen;
@@ -267,6 +287,7 @@ ENDDONOTREGTEXT
 
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
+var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen
@@ -435,8 +456,9 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\- //;
-       return ($nobreak?'':'<br />').
-        '<a href="javascript:'.$act.';">'.$text.'</a> '.($nobreak?'':$desc);
+       return "\n".($nobreak?' ':'<br />').
+        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
+        ($nobreak?'':$desc);
    }
 }
 
@@ -572,6 +594,59 @@ sub footer {
 
 }
 
+sub utilityfunctions {
+    unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
+    my $currenturl=$ENV{'REQUEST_URI'};
+    my $currentsymb=$ENV{'request.symb'};
+return (<<ENDUTILITY)
+
+    var currentURL="$currenturl";
+    var reloadURL="$currenturl";
+    var currentSymb="$currentsymb";
+
+function go(url) {
+   if (url!='' && url!= null) {
+       currentURL = null;
+       currentSymb= null;
+       window.location.href=url;
+   }
+}
+
+function gopost(url,postdata) {
+   if (url!='') {
+      this.document.server.action=url;
+      this.document.server.postdata.value=postdata;
+      this.document.server.command.value='';
+      this.document.server.url.value='';
+      this.document.server.symb.value='';
+      this.document.server.submit();
+   }
+}
+
+function gocmd(url,cmd) {
+   if (url!='') {
+      this.document.server.action=url;
+      this.document.server.postdata.value='';
+      this.document.server.command.value=cmd;
+      this.document.server.url.value=currentURL;
+      this.document.server.symb.value=currentSymb;
+      this.document.server.submit();
+   }
+}
+ENDUTILITY
+}
+
+sub serverform {
+    return(<<ENDSERVERFORM);
+
+<form name="server" action="/adm/logout" method="post">
+<input type="hidden" name="postdata" value="none" />
+<input type="hidden" name="command" value="none" />
+<input type="hidden" name="url" value="none" />
+<input type="hidden" name="symb" value="none" />
+</form>
+ENDSERVERFORM
+}
 # ================================================ Handler when called directly
 
 
@@ -581,23 +656,20 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
+    my $utility=&utilityfunctions();
+    my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
 # ------------------------------------------------------------ Print the screen
     $r->print(<<ENDHEADER);
 <html><head>
 <title>LON-CAPA Main Menu</title>
 <script>
-function go(url) {
-    window.location=url;
-}
-function gopost(url) {
-    window.location=url;
-}
+$utility
 </script>
 </head>
 $bodytag
 ENDHEADER
-    $r->print(&rawconfig(1));
+    $r->print(&rawconfig(1).$form);
     $r->print('</body></html>');
     return OK;
 }
