--- loncom/homework/functionplotresponse.pm	2016/09/14 18:14:48	1.105.2.3
+++ loncom/homework/functionplotresponse.pm	2014/08/14 14:49:49	1.106
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.105.2.3 2016/09/14 18:14:48 raeburn Exp $
+# $Id: functionplotresponse.pm,v 1.106 2014/08/14 14:49:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,8 +56,11 @@ sub useHTML5 {
     } elsif ($env{'browser.type'} eq 'safari') {
         if ($env{'browser.os'} eq 'mac') {
             my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./); 
-            if ($version >= 536) {
-                return 1;
+            if ((!$env{'browser.mobile'}) || 
+                (($env{'browser.mobile'}) && length($prefix))) {
+                if ($version >= 536) {
+                    return 1;
+                }
             }
         }
     } elsif ($env{'browser.type'} eq 'mozilla') {
@@ -70,11 +73,7 @@ sub useHTML5 {
             }
         }
     } elsif ($env{'browser.type'} eq 'explorer') { 
-        if (($env{'browser.os'} eq 'win') && ($env{'browser.version'} >= 10)) {
-            return 1;
-        }
-    } elsif ($env{'browser.type'} eq 'opera') {
-        if ($env{'browser.version'} >= 18) {
+        if (($env{'browser.os'} eq 'win') && ($env{'browser.version'} == 10)) {
             return 1;
         }
     }
@@ -1457,7 +1456,7 @@ sub start_functionplotresponse {
   my $ylabel=&Apache::lonxml::get_param('ylabel',$parstack,$safeeval);
   if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token)
-       .'<tr><td><span class="LC_nobreak">'.&Apache::loncommon::insert_folding_button().&mt('Function Plot Question').'</span></td>'
+       .'<tr><td><span class="LC_nobreak">'.&mt('Function Plot Question').'</span></td>'
        .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
        .&Apache::edit::deletelist($target,$token).'&nbsp;&nbsp;&nbsp;'
        .&Apache::edit::insertlist($target,$token).'&nbsp;&nbsp;&nbsp;'
@@ -2044,7 +2043,7 @@ sub start_functionplotruleset {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    if ($target eq 'edit') {
       return &Apache::edit::start_table($token).
-        '<tr><td><span class="LC_nobreak">'.&Apache::loncommon::insert_folding_button().&mt('Function Plot Rule Set').'</span></td>'
+        '<tr><td><span class="LC_nobreak">'.&mt('Function Plot Rule Set').'</span></td>'
        .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
        .&Apache::edit::deletelist($target,$token).'&nbsp;&nbsp;&nbsp;'.
         &Apache::edit::insertlist($target,$token).'&nbsp;&nbsp;&nbsp;'
@@ -2237,8 +2236,7 @@ sub start_functionplotelements {
 
    if ($target eq 'edit') {
       return &Apache::edit::start_table($token).
-        '<tr><td><span class="LC_nobreak">'.&Apache::loncommon::insert_folding_button()
-       .&mt('Function Plot Elements').'</span></td>'
+        '<tr><td><span class="LC_nobreak">'.&mt('Function Plot Elements').'</span></td>'
        .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
        .&Apache::edit::deletelist($target,$token).'&nbsp;&nbsp;&nbsp;'.
         &Apache::edit::insertlist($target,$token).'&nbsp;&nbsp;&nbsp;'