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

[raeburn]

raeburn		Sun Mar 26 23:47:29 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1277, 1.1278
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.125 loncom/interface/loncommon.pm:1.1075.2.126
--- loncom/interface/loncommon.pm:1.1075.2.125	Wed Mar 15 03:39:49 2017
+++ loncom/interface/loncommon.pm	Sun Mar 26 23:47:28 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.125 2017/03/15 03:39:49 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.126 2017/03/26 23:47:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7897,6 +7897,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
 <meta name="apple-mobile-web-app-capable" content="yes" />';
     }
+    $result .= '<meta name="google" content="notranslate" />'."\n";
     return $result.'</head>';
 }
 
@@ -9639,10 +9640,12 @@
     &html_escape(\%html_lt);
     &js_escape(\%js_lt);
     my $domform;
+    my $allow_blank = 1;
     if ($fixeddom) {
-        $domform = &select_dom_form($currdom,'srchdomain',1,1,undef,[$currdom]);
+        $allow_blank = 0;
+        $domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1,undef,[$currdom]);
     } else {
-        $domform = &select_dom_form($currdom,'srchdomain',1,1);
+        $domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1);
     }
     my $srchinsel = ' <select name="srchin">';