--- loncom/interface/lonhtmlcommon.pm	2013/07/10 22:07:37	1.349
+++ loncom/interface/lonhtmlcommon.pm	2013/12/28 23:16:11	1.354
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.349 2013/07/10 22:07:37 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.354 2013/12/28 23:16:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,9 +64,15 @@ use HTML::Entities();
 use LONCAPA qw(:DEFAULT :match);
 
 sub java_not_enabled {
-   return "\n".'<span class="LC_error">'.
-          &mt('The required Java applet could not be started. Please make sure to have Java installed and active in your browser.').
-          "</span>\n";
+    if (($env{'browser.mobile'}) && ($env{'browser.mobile'} =~ /^ipad|ipod|iphone$/i)) {
+        return "\n".'<span class="LC_error">'.
+               &mt('The required Java applet could not be started, because Java is not supported by your mobile device.').
+               "</span>\n";
+    } else {
+        return "\n".'<span class="LC_error">'.
+               &mt('The required Java applet could not be started. Please make sure to have Java installed and active in your browser.').
+               "</span>\n";
+    }
 }
 
 sub coursepreflink {
@@ -170,7 +176,7 @@ sub dragmath_js {
                   function mathedit(textarea, doc) {
                      targetEntry = textarea;
                      targetDoc   = doc;
-                     newwin  = window.open("/adm/dragmath/applet/$popup.html","","width=565,height=500,resizable");
+                     newwin  = window.open("/adm/dragmath/$popup.html","","width=565,height=500,resizable");
                   }
                 // ]]>
                 </script>
@@ -2234,7 +2240,7 @@ sub course_selection {
             $output .= '<label><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').'</label><br />';
             $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
                '<select name="'.$standardnames->[0].
-               '" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".
+               '" onchange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".
                ' <option value="-1" />Select'."\n";
             my @items = ();
             my @longitems = ();
@@ -2264,7 +2270,7 @@ sub course_selection {
             for (my $i=1; $i<$numtitles; $i++) {
                 $output .= '<td>'.$$codetitles[$i].'<br />'."\n".
                           '<select name="'.$standardnames->[$i].
-                          '" onChange="courseSet('."'$$codetitles[$i]'".')">'."\n".
+                          '" onchange="courseSet('."'$$codetitles[$i]'".')">'."\n".
                           '<option value="-1">&lt;-Pick '.$$codetitles[$i-1].'</option>'."\n".
                           '</select>'."\n".
                           '</td>';
@@ -2932,7 +2938,7 @@ ENDSCRIPT
 ##############################################
 
 sub resize_scrollbox_js {
-    my ($context,$tabidstr) = @_;
+    my ($context,$tabidstr,$tid) = @_;
     my (%names,$paddingwfrac,$offsetwfrac,$offsetv,$minw,$minv);
     if ($context eq 'docs') {
         %names = (
@@ -2942,10 +2948,7 @@ sub resize_scrollbox_js {
                    scroll => 'contentscroll',
                    boxh   => 'contenteditor',
                  );
-        $paddingwfrac = 0; 
-        unless ($env{'browser.mobile'}) {
-            $paddingwfrac = 0.09;
-        }
+        $paddingwfrac = 0.09;
         $offsetwfrac = 0.015;
         $offsetv = 20;
         $minw = 250;
@@ -2971,9 +2974,11 @@ window.onresize=callResize;
 
 ';
     if ($context eq 'docs') {
-        $output .= '
-var activeTab;
-';
+        if ($env{'form.active'}) {
+            $output .= "\nvar activeTab = '$env{'form.active'}$tid';\n";
+        } else {
+            $output .= "\nvar activeTab = '';\n";
+        }
     }
     $output .=  <<"FIRST";
 
@@ -2984,6 +2989,7 @@ function resize_scrollbox(scrollboxname,
     var scrolltableid = 'table_'+scrollboxname;
     var scrollbox;
     var scrolltable;
+    var ismobile = '$env{'browser.mobile'}';
 
     if (document.getElementById("$names{'boxw'}") == null) {
         return;
@@ -3020,6 +3026,7 @@ FIRST
     }
     $output .= <<"SECOND";
     var listwchange;
+    var scrollchange;
     if (chkw == 1) {
         var boxw = document.getElementById("$names{'boxw'}").offsetWidth;
         var itemw;
@@ -3031,6 +3038,7 @@ FIRST
 
         var scrollboxw = scrollbox.offsetWidth;
         var scrollboxscrollw = scrollbox.scrollWidth;
+        var scrollstart = scrollboxw;
 
         var offsetw = parseInt(vpw * $offsetwfrac);
         var paddingw = parseInt(vpw * $paddingwfrac);
@@ -3105,11 +3113,19 @@ PARAMSONE
             }
         }
 
+        if (newscrollboxw != scrollboxw) {
+            scrollchange = 1;
+        }
+
         if (itemid.offsetWidth != itemwstart) {
             listwchange = 1;
         }
     }
     if ((chkh == 1) || (listwchange)) {
+        var itemid = document.getElementById("$names{'item'}");
+        if (itemid != null) {
+            itemh = itemid.offsetHeight;
+        }
         var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
         var secondaryheight;
         if (document.getElementById('LC_secondary_menu') != null) { 
@@ -3130,6 +3146,7 @@ PARAMSONE
 
         var scrollboxheight = scrollbox.offsetHeight;
         var scrollboxscrollheight = scrollbox.scrollHeight;
+        var scrollboxh = scrollboxheight;
 
         var minvscrollbox = $minv;
         var offsetv = $offsetv;
@@ -3160,6 +3177,13 @@ PARAMSONE
                 scrollbox.style.height = newscrollheight+"px";
             }
         }
+        var newscrollboxh = scrollbox.offsetHeight;
+        if (scrollboxh != newscrollboxh) {
+            scrollchange = 1;
+        }
+    }
+    if (ismobile && scrollchange) {
+        \$("#div_$names{'scroll'}").getNiceScroll().onResize();
     }
     return;
 }