Merge pull request #1881 from antgonza/fix-1868

fix #1868
qiita-spots · Jul 7, 2016 · 87aae82 · 87aae82
2 parents 6b89f42 + b3efee1
commit 87aae82
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/qiita_pet/__init__.py b/qiita_pet/__init__.py
@@ -7,10 +7,7 @@
 # -----------------------------------------------------------------------------
 
 allowed_min_browser_versions = {
-    'chrome': 39,
-    'firefox': 34,
-    'safari': 7,
-    'IE': 10
+    'chrome': 51,
 }
 
 __version__ = "0.2.0-dev"
diff --git a/qiita_pet/templates/sitebase.html b/qiita_pet/templates/sitebase.html
@@ -49,10 +49,23 @@
         objbrowserName = M[0];
         objBrMajorVersion = M[1];
 
-        if ((objbrowserName == "Chrome"  && objBrMajorVersion < {{allowed_min_browser_versions['chrome']}}) ||
-            (objbrowserName == "Firefox" && objBrMajorVersion < {{allowed_min_browser_versions['firefox']}}) ||
-            (objbrowserName == "Safari"  && objBrMajorVersion < {{allowed_min_browser_versions['safari']}}) ||
-            ((objbrowserName == "IE" || objbrowserName == "MSIE") && objBrMajorVersion < {{allowed_min_browser_versions['IE']}})) {
+        if ((objbrowserName == "Chrome"  && objBrMajorVersion < {{allowed_min_browser_versions['chrome']}})
+            {% if 'firefox' in allowed_min_browser_versions %}
+              || (objbrowserName == "Firefox" && objBrMajorVersion < {{allowed_min_browser_versions['firefox']}})
+            {% else %}
+              || (objbrowserName == "Firefox")
+            {% end %}
+            {% if 'safari' in allowed_min_browser_versions %}
+              || (objbrowserName == "Safari"  && objBrMajorVersion < {{allowed_min_browser_versions['safari']}})
+            {% else %}
+              || (objbrowserName == "Safari")
+            {% end %}
+            {% if 'IE' in allowed_min_browser_versions %}
+              || ((objbrowserName == "IE" || objbrowserName == "MSIE") && objBrMajorVersion < {{allowed_min_browser_versions['IE']}})
+            {% else %}
+              || (objbrowserName == "IE" || objbrowserName == "MSIE")
+            {% end %}
+          ) {
           // Show overlay because too old a browser
           ol = document.getElementById("overlay");
           ol.style.visibility = "visible";
@@ -284,9 +297,15 @@ <h6>
         <img src="{% raw qiita_config.portal_dir %}{{portal_styling.logo}}" alt="Qiita logo" id="small-logo"/>
         <h1>This site only works with the following browsers</h1>
         <p id="explanation"><strong>Chrome >= {{allowed_min_browser_versions['chrome']}}:</strong> You can download Chrome from <a href="https://www.google.com/chrome/browser/">here</a> or you can find instructions on how to update it <a href="https://support.google.com/chrome/answer/95414?hl=en">here</a></p>
-        <p id="explanation"><strong>Safari >= {{allowed_min_browser_versions['safari']}}:</strong> You can update Safari following <a href="http://support.apple.com/en-us/HT6104">these</a> instructions.</p>
-        <p id="explanation"><strong>Firefox >= {{allowed_min_browser_versions['firefox']}}:</strong> For instructions on how to install or update Firefox go <a href="https://support.mozilla.org/en-US/kb/update-firefox-latest-version">here.</a></p>
-        <p id="explanation"><strong>Internet Explorer >= {{allowed_min_browser_versions['IE']}}:</strong> For instructions on how to update IE go <a href="http://windows.microsoft.com/en-us/internet-explorer">here.</a></p>
+        {% if 'safari' in allowed_min_browser_versions %}
+          <p id="explanation"><strong>Safari >= {{allowed_min_browser_versions['safari']}}:</strong> You can update Safari following <a href="http://support.apple.com/en-us/HT6104">these</a> instructions.</p>
+        {% end %}
+        {% if 'firefox' in allowed_min_browser_versions %}
+          <p id="explanation"><strong>Firefox >= {{allowed_min_browser_versions['firefox']}}:</strong> For instructions on how to install or update Firefox go <a href="https://support.mozilla.org/en-US/kb/update-firefox-latest-version">here.</a></p>
+        {% end %}
+        {% if 'IE' in allowed_min_browser_versions %}
+          <p id="explanation"><strong>Internet Explorer >= {{allowed_min_browser_versions['IE']}}:</strong> For instructions on how to update IE go <a href="http://windows.microsoft.com/en-us/internet-explorer">here.</a></p>
+        {% end %}
     </div>
   </body>
 </html>