[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm

[banghart]

banghart		Tue Jul 17 19:10:16 2007 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  	Make popup help a default, even with remote control off.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.551 loncom/interface/loncommon.pm:1.552
--- loncom/interface/loncommon.pm:1.551	Tue Jul 17 17:11:49 2007
+++ loncom/interface/loncommon.pm	Tue Jul 17 19:10:14 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.551 2007/07/17 21:11:49 albertel Exp $
+# $Id: loncommon.pm,v 1.552 2007/07/17 23:10:14 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -709,8 +709,7 @@
     my ($topic, $text, $stayOnPage, $width, $height) = @_;
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual' ||
-	$env{'environment.remote'} eq 'off' ) {
+    if ($env{'browser.interface'} eq 'textual') {
 	$stayOnPage=1;
     }
     $width = 350 if (not defined $width);
@@ -802,12 +801,18 @@
 # now just updates the help link and generates a blue icon
 sub help_open_menu {
     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) 
-	= @_;
-    
+	= @_;    
+    &Apache::lonnet::logthis("stayonpage is $stayOnPage");
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual' ||
-	$env{'environment.remote'} eq 'off' ) {
-	$stayOnPage=1;
+    # formerly only used pop-up help (stayOnPage = 0)
+    # if environment.remote is on (using remote control UI)
+    # if ($env{'browser.interface'} eq 'textual' ||
+    #	$env{'environment.remote'} eq 'off' ) {
+    #   $stayOnPage=1;
+    #}
+    # Now making pop-up help the default even with remote control
+    if ($env{'browser.interface'} eq 'textual') {
+        $stayOnPage=1;
     }
     my $output;
     if ($component_help) {