Skip to content

Change way browser and version found #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 13, 2015
Merged

Change way browser and version found #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01adb2d
change way browser and version found
squirrelo Feb 10, 2015
ebdb833
Fix indentation and add IE check
squirrelo Feb 11, 2015
5eaf3a1
Merge branch 'master' of https://github.com/biocore/qiita into fix-fi…
squirrelo Feb 12, 2015
a5a7c11
default to showing overlay, turn off if proper version
squirrelo Feb 12, 2015
9eceade
Move overlay div to bottom for text based browsers
squirrelo Feb 12, 2015
02e2ead
old-school onload check for browser compatability
squirrelo Feb 13, 2015
d86181f
remove whitespace
squirrelo Feb 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion qiita_pet/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
allowed_min_browser_versions = {
'chrome': 39,
'firefox': 34,
'safari': 7
'safari': 7,
'IE': 10
}

__version__ = "0.0.1-dev"
89 changes: 34 additions & 55 deletions qiita_pet/templates/sitebase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,69 +24,40 @@
<link rel="shortcut icon" href="/static/img/favicon.ico">

<script>
$(document).ready(function() {
function overlay() {
overlay = document.getElementById("overlay");
overlay.style.visibility = "visible";
function overlay_check() {
// from http://stackoverflow.com/q/5916900/379593
var ua=navigator.userAgent,tem,M=ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
if(/trident/i.test(M[1])){
tem=/\brv[ :]+(\d+)/g.exec(ua) || [];
return 'IE '+(tem[1]||'');
}
if(M[1]==='Chrome'){
tem=ua.match(/\bOPR\/(\d+)/)
if(tem!=null) {return 'Opera '+tem[1];}
}
M=M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?'];
if((tem=ua.match(/version\/(\d+)/i))!=null) {M.splice(1,1,tem[1]);}
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']}})) {
// Show overlay because too old a browser
ol = document.getElementById("overlay");
ol.style.visibility = "visible";
navbar = document.getElementById("navigation-bar");
navbar.style.visibility = "hidden";
jumbotron = document.getElementById("jumbotron");
jumbotron.style.visibility = "hidden";
}

// from http://mrbool.com/how-to-detect-different-browsers-and-their-versions-using-javascript/25424
var objappVersion = navigator.appVersion;
var objAgent = navigator.userAgent;
var objbrowserName = navigator.appName;
var objfullVersion = ''+parseFloat(navigator.appVersion);
var objBrMajorVersion = parseInt(navigator.appVersion,10);
var objOffsetName,objOffsetVersion,ix;
// In Chrome
if ((objOffsetVersion=objAgent.indexOf("Chrome"))!=-1) {
objbrowserName = "Chrome";
objfullVersion = objAgent.substring(objOffsetVersion+7);
} // In Firefox
else if ((objOffsetVersion=objAgent.indexOf("Firefox"))!=-1) {
objbrowserName = "Firefox";
} // In Safari
else if ((objOffsetVersion=objAgent.indexOf("Safari"))!=-1) {
objbrowserName = "Safari";
objfullVersion = objAgent.substring(objOffsetVersion+7);
if ((objOffsetVersion=objAgent.indexOf("Version"))!=-1)
objfullVersion = objAgent.substring(objOffsetVersion+8);
}
// trimming the fullVersion string at semicolon/space if present
if ((ix=objfullVersion.indexOf(";"))!=-1)
objfullVersion=objfullVersion.substring(0,ix);
if ((ix=objfullVersion.indexOf(" "))!=-1)
objfullVersion=objfullVersion.substring(0,ix);
objBrMajorVersion = parseInt(''+objfullVersion,10);
if (isNaN(objBrMajorVersion)) {
objfullVersion = ''+parseFloat(navigator.appVersion);
objBrMajorVersion = parseInt(navigator.appVersion,10);
}

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']}})) {
overlay();
}

});
</script>
}
</script>
{% block head %}{% end %}
</head>

<body style="padding-top: 65px; height: 100%">
<div id="overlay" class="navbar-brand" style="visibility: hidden; position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; font-size: 13px; text-align: center; z-index: 1000; background-color: #333333; color: #FFFFFF;">
<div>
<img src="/static/img/logo-clear.png" alt="Emperor" id="small-logo"/>
<h1>This site only works on newer 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>
</div>
</div>
<body style="padding-top: 65px; height: 100%" onload='overlay_check();'>
{% set level = globals().get('level', '') %}
{% set message = globals().get('message', '') %}
{% if maintenance is not None %}
Expand Down Expand Up @@ -246,5 +217,13 @@ <h4 class="modal-title" id="myModalLabel">Create new meta-analysis</h4>

<div id="footer">
</div>
<div id="overlay" class="navbar-brand" style="visibility: hidden; position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; font-size: 13px; text-align: center; z-index: 1000; background-color: #333333; color: #FFFFFF;">
<img src="/static/img/logo-clear.png" 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>
</div>
</body>
</html>