--- loncom/auth/lonlogout.pm	2008/11/20 15:19:22	1.35
+++ loncom/auth/lonlogout.pm	2010/03/10 21:25:29	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.35 2008/11/20 15:19:22 jms Exp $
+# $Id: lonlogout.pm,v 1.39 2010/03/10 21:25:29 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,19 @@
 # http://www.lon-capa.org/
 #
 
+=head1 NAME
+
+Apache::lonlogout
+
+=head1 SYNOPSIS
+
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=cut
+
 package Apache::lonlogout;
 
 use strict;
@@ -76,8 +89,7 @@ sub handler {
     return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info
 
-    my $windowinfo=&Apache::lonmenu::close();
-    $windowinfo.=&Apache::lonnavmaps::close();
+    my $windowinfo=&Apache::lonnavmaps::close();
 # ---------------------------------------------------------------- Get handover
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
     my $switch='';
@@ -85,12 +97,13 @@ sub handler {
     my $relogmessage='';
     if ($env{'form.handover'}) {
 	$switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.
-	    $env{'form.handover'}.'">';
+	    $env{'form.handover'}.'" />';
 	$start_page=&Apache::loncommon::start_page('Switching Server ...',
 						   $switch);
     } else {
 	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
-						   {'no_inline_link' => 1,});
+                           {'no_inline_link' => 1,
+                            'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
@@ -154,21 +167,6 @@ sub flush_course_logs {
 __END__
 
 
-=head1 NAME
-
-Apache::lonlogout
-
-=head1 SYNOPSIS
-
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-
-=cut
-