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

[raeburn]

raeburn		Tue Apr  7 15:13:36 2015 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    Backport 1.1213, 1.1214, 1.1215.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.91 loncom/interface/loncommon.pm:1.1075.2.92
--- loncom/interface/loncommon.pm:1.1075.2.91	Mon Apr  6 19:06:45 2015
+++ loncom/interface/loncommon.pm	Tue Apr  7 15:13:35 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.91 2015/04/06 19:06:45 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.92 2015/04/07 15:13:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7483,20 +7483,22 @@
                                 $result.=<<OFFLOAD
 <meta http-equiv="pragma" content="no-cache" />
 <script type="text/javascript">
+// <![CDATA[
 function LC_Offload_Now() {
     var dest = "$newurl";
     if (dest != '') {
         window.location.href="$newurl";
     }
 }
-window.alert('$msg');
-if ($disable_submit) {
-    \$(document).ready(function () {
+\$(document).ready(function () {
+    window.alert('$msg');
+    if ($disable_submit) {
         \$(".LC_hwk_submit").prop("disabled", true);
         \$( ".LC_textline" ).prop( "readonly", "readonly");
-    });
-}
-setTimeout('LC_Offload_Now()', $timeout);
+    }
+    setTimeout('LC_Offload_Now()', $timeout);
+});
+// ]]>
 </script>
 OFFLOAD
                             }
@@ -15959,7 +15961,7 @@
     my $captcha = Captcha::reCAPTCHA->new;
     return $captcha->get_options_setter({theme => 'white'})."\n".
            $captcha->get_html($pubkey,undef,$use_ssl).
-           &mt('If either word is hard to read, [_1] will replace them.',
+           &mt('If the text is hard to read, [_1] will replace them.',
                '<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').
            '<br /><br />';
 }