[LON-CAPA-cvs] cvs: loncom /auth lonlogout.pm /interface lonnavmaps.pm

[albertel]

albertel		Wed Jul 21 16:19:02 2004 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
    /loncom/auth	lonlogout.pm 
  Log:
  - closes nav window when logging out
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.268 loncom/interface/lonnavmaps.pm:1.269
--- loncom/interface/lonnavmaps.pm:1.268	Wed Jul 21 15:54:43 2004
+++ loncom/interface/lonnavmaps.pm	Wed Jul 21 16:19:01 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.268 2004/07/21 19:54:43 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.269 2004/07/21 20:19:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,6 +105,19 @@
     return $result;
 }
 
+sub close {
+    if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }
+    return(<<ENDCLOSE);
+<script type="text/javascript">
+window.status='Accessing Nav Control';
+menu=window.open("/adm/rat/empty.html","loncapanav",
+                 "height=600,width=400,scrollbars=1");
+window.status='Closing Nav Control';
+menu.close();
+window.status='Done.';
+</script>
+ENDCLOSE
+}
 
 
 sub handler {
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.12 loncom/auth/lonlogout.pm:1.13
--- loncom/auth/lonlogout.pm:1.12	Mon Sep 22 20:26:10 2003
+++ loncom/auth/lonlogout.pm	Wed Jul 21 16:19:01 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.12 2003/09/23 00:26:10 www Exp $
+# $Id: lonlogout.pm,v 1.13 2004/07/21 20:19:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -77,6 +77,7 @@
 # -------------------------------------------------------- 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='';