Skip to content

yotta / pictogram

Go to a project
Commit cbe864ae by Sebastián Collado Montañez
Options

issue #270 fixed, safari 10 added to configuration

parent 9af2cee6
Inline Side-by-side
Showing with 14 additions and 12 deletions
sails/src/assets/app/browserNotCompatible.html
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Pictogram Web</title> <title>Pictogram Web</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="css/main.css"> <link rel="stylesheet" href="css/main.css">
<link rel="icon" href="img/logo_pictogram.png" type='image/png'> <link rel="icon" href="img/logo_pictogram.png" type='image/png'>
</head> </head>
<body> <body>
<div class="header-image"> <div class="header-image">
<div class="row"> <div class="row">
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
...@@ -16,6 +15,7 @@ ...@@ -16,6 +15,7 @@
</div> </div>
</div> </div>
<!-- Spanish view -->
<div id="es"> <div id="es">
<div class="container vertical-center"> <div class="container vertical-center">
<div class="row"> <div class="row">
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="languages"> <div class="languages">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
...@@ -38,7 +37,9 @@ ...@@ -38,7 +37,9 @@
</div> </div>
</div> </div>
</div> </div>
<!--.END Spanish view -->
<!-- English view -->
<div id="en"> <div id="en">
<div class="container vertical-center"> <div class="container vertical-center">
<div class="row"> <div class="row">
...@@ -50,7 +51,6 @@ ...@@ -50,7 +51,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="languages"> <div class="languages">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
...@@ -60,9 +60,10 @@ ...@@ -60,9 +60,10 @@
</div> </div>
</div> </div>
</div> </div>
</div> <!--.END English view -->
<script> </div>
<script>
/* SIMPLY DOCUMENT TRANSLATION */ /* SIMPLY DOCUMENT TRANSLATION */
// Browser default language // Browser default language
...@@ -76,7 +77,6 @@ ...@@ -76,7 +77,6 @@
// Show div acording to language // Show div acording to language
document.getElementById('en').style.display = (lang=='en')? 'inline' : 'none'; document.getElementById('en').style.display = (lang=='en')? 'inline' : 'none';
document.getElementById('es').style.display = (lang=='es')? 'inline' : 'none'; document.getElementById('es').style.display = (lang=='es')? 'inline' : 'none';
</script> </script>
</body>
</body>
</html> </html>
sails/src/assets/scripts/check_browser.js
...@@ -18,7 +18,7 @@ var clientBrowser = (function(){ ...@@ -18,7 +18,7 @@ var clientBrowser = (function(){
// Return if client browser valid or not // Return if client browser valid or not
var validBrowser = false; var validBrowser = false;
//Browser filter // Browser whitelist
if(clientBrowser[0] == "Firefox" && parseInt(clientBrowser[1]) >= 35 ) if(clientBrowser[0] == "Firefox" && parseInt(clientBrowser[1]) >= 35 )
validBrowser = true; validBrowser = true;
if(clientBrowser[0] == "Chrome" && parseInt(clientBrowser[1]) >= 45 ) if(clientBrowser[0] == "Chrome" && parseInt(clientBrowser[1]) >= 45 )
...@@ -27,6 +27,8 @@ if(clientBrowser[0] == "Opera" && parseInt(clientBrowser[1]) >= 35 ) ...@@ -27,6 +27,8 @@ if(clientBrowser[0] == "Opera" && parseInt(clientBrowser[1]) >= 35 )
validBrowser = true; validBrowser = true;
if(clientBrowser[0] == "Edge" ) if(clientBrowser[0] == "Edge" )
validBrowser = true; validBrowser = true;
if(clientBrowser[0] == "Safari" && parseInt(clientBrowser[1]) >= 10 )
validBrowser = true;
// Redirect to view // Redirect to view
if(!validBrowser) window.location = "browserNotCompatible.html"; if(!validBrowser) window.location = "browserNotCompatible.html";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment