[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /auth lonlogout.pm

[raeburn]

raeburn		Sun Oct  2 12:09:57 2011 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/auth	lonlogout.pm 
  Log:
  - Reverse changes in 1.38, 1.40, 1.41 for 2.10 branch.
    - Remote Control remains available in 2.10.
  
  
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.42 loncom/auth/lonlogout.pm:1.42.2.1
--- loncom/auth/lonlogout.pm:1.42	Mon Jun 13 17:41:01 2011
+++ loncom/auth/lonlogout.pm	Sun Oct  2 12:09:57 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.42 2011/06/13 17:41:01 raeburn Exp $
+# $Id: lonlogout.pm,v 1.42.2.1 2011/10/02 12:09:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,6 +89,8 @@
     return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info
 
+    my $windowinfo=&Apache::lonmenu::close();
+    $windowinfo.=&Apache::lonnavmaps::close();
 # ---------------------------------------------------------------- Get handover
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
     my $switch='';
@@ -101,7 +103,8 @@
 						   $switch);
     } else {
 	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
-                           {'no_nav_bar'     => 1,});
+                           {'no_inline_link' => 1,
+                            'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
@@ -162,6 +165,7 @@
 # --------------------------------------------------------------- Screen Output
     $r->print(<<ENDDOCUMENT);
 $start_page
+$windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT