[LON-CAPA-cvs] cvs: rat / lonpageflip.pm loncom/interface lonnavmaps.pm

[albertel]

albertel		Tue Aug  2 17:15:54 2005 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
    /rat	lonpageflip.pm 
  Log:
  - make sure "What's New" shows up if it is supposed to
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.335 loncom/interface/lonnavmaps.pm:1.336
--- loncom/interface/lonnavmaps.pm:1.335	Tue Aug  2 16:51:18 2005
+++ loncom/interface/lonnavmaps.pm	Tue Aug  2 17:15:51 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.335 2005/08/02 20:51:18 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.336 2005/08/02 21:15:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,14 +90,20 @@
 my $hurryUpColor = "#FF0000";
 
 sub launch_win {
-    my ($mode,$script,$toplinkitems)=@_;
+    my ($mode,$script,$toplinkitems,$firsttime)=@_;
     my $result;
     if ($script ne 'no') {
 	$result.='<script type="text/javascript">';
     }
-    $result.='function launch_navmapwin() {
+    if ($firsttime) {
+	$result.='function launch_navmapwin() {
+                 newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
+               }';
+    } else {
+	$result.='function launch_navmapwin() {
                  newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
                }';
+    }
     if ($mode eq 'now') {
 	$result.="\nlaunch_navmapwin();\n";
     }
@@ -205,7 +211,7 @@
 ENDSUBM
         return;
     }
-    if ($ENV{QUERY_STRING} eq 'launchExternal') {
+    if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
 	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
 	&Apache::lonnet::appenv('environment.remotenavmap' => 'on');
  	my $menu=&Apache::lonmenu::reopenmenu();
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.54 rat/lonpageflip.pm:1.55
--- rat/lonpageflip.pm:1.54	Tue Aug  2 16:51:18 2005
+++ rat/lonpageflip.pm	Tue Aug  2 17:15:52 2005
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.54 2005/08/02 20:51:18 albertel Exp $
+# $Id: lonpageflip.pm,v 1.55 2005/08/02 21:15:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -189,7 +189,7 @@
 	    this.document.location='/adm/navmaps?turningOffExternal';
 	}
     </script>
-    <p><a href="javascript:collapse();">Collapse External Navigation Window</a></p>
+    <p><a href="javascript:collapse();">Collapse external navigation window</a></p>
 ENDNAV
     $r->print(&Apache::loncommon::endbodytag().'</html>');
 }