--- loncom/auth/lonlogout.pm 2011/06/13 17:41:01 1.42 +++ loncom/auth/lonlogout.pm 2011/11/19 19:10:34 1.42.2.2 @@ -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.2 2011/11/19 19:10:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -89,6 +89,8 @@ sub handler { 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 @@ sub handler { $switch); } else { $start_page=&Apache::loncommon::start_page('Logged Out',undef, - {'no_nav_bar' => 1,}); + {'no_inline_link' => 1, + 'no_nav_bar' => 1,}); $relogmessage.='

'.&mt('Goodbye').'

' .'

'.&mt('Thank you for using LON-CAPA.').'

'; @@ -122,6 +125,9 @@ sub handler { if ($server && $lonhost) { $login_url = $Apache::lonnet::protocol{$lonhost}. '://'.$server.$path; + if ($path eq '/adm/login' && $domain ne '') { + $login_url .= '?domain='.$domain; + } } } } @@ -162,6 +168,7 @@ Due to security reasons in new web brows # --------------------------------------------------------------- Screen Output $r->print(<