--- loncom/homework/functionplotresponse.pm	2012/08/17 13:08:11	1.98
+++ loncom/homework/functionplotresponse.pm	2013/07/22 11:46:26	1.103
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.98 2012/08/17 13:08:11 www Exp $
+# $Id: functionplotresponse.pm,v 1.103 2013/07/22 11:46:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,7 +49,35 @@ BEGIN {
 # Return a true value if HTML5 should be used.
 
 sub useHTML5 {
-    return 1;
+    if ($env{'browser.type'} eq 'chrome') {
+        if ($env{'browser.version'} >= 14) {
+            return 1;
+        }
+    } elsif ($env{'browser.type'} eq 'safari') {
+        if ($env{'browser.os'} eq 'mac') {
+            my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./); 
+            if ((!$env{'browser.mobile'}) || 
+                (($env{'browser.mobile'}) && length($prefix))) {
+                if ($version >= 536) {
+                    return 1;
+                }
+            }
+        }
+    } elsif ($env{'browser.type'} eq 'mozilla') {
+        if ($env{'browser.info'} =~ /^firefox\-(\d+)/) {
+            my $firefox = $1;
+            if ((($env{'browser.os'} eq 'mac') && ($firefox >= 20)) ||
+                (($env{'browser.os'} eq 'unix') && ($firefox >= 17)) ||
+                (($env{'browser.os'} eq 'win') && ($firefox >= 14))) {
+                return 1;
+            }
+        }
+    } elsif ($env{'browser.type'} eq 'explorer') { 
+        if (($env{'browser.os'} eq 'win') && ($env{'browser.version'} >= 10)) {
+            return 1;
+        }
+    }
+    return 0;
 }
 
 #
@@ -193,7 +221,7 @@ sub init_script {
       my $html5init='';
       if (&useHTML5()) {
           $html5init=
-           '<script type="text/javascript" language="javascript" src="/adm/geogebra/html5/web/test42/web/web.nocache.js"></script>';
+           '<script type="text/javascript" language="javascript" src="/adm/geogebra/web/web.nocache.js"></script>';
       }
       return (<<ENDGGBINIT);
 $html5init
@@ -807,7 +835,7 @@ sub start_backgroundplot {
              &Apache::edit::text_arg('Label on Plot:','label',
                                      $token,'8').
              &Apache::edit::text_arg('Color (hex code):','color',
-                                     $token,'8').
+                                     $token,'8', 'colorchooser').
              &Apache::edit::select_arg('Fixed location:','fixed',
                                   ['yes','no'],$token).
              &Apache::edit::end_row();
@@ -1482,7 +1510,7 @@ sub start_functionplotresponse {
                      $env{'form.counter'},$Apache::lonxml::curdepth);
       &Apache::lonxml::add_script_result(
           &Apache::loncommon::modal_adhoc_window($function_name,700,500,
-             '<pre>'.$Apache::functionplotresponse::ruleslog.'</pre>',
+             '<pre style="background-color:#ffffff;">'.$Apache::functionplotresponse::ruleslog.'</pre>',
               &mt('Rules Log'))."<br />");
   }
   return $result;