Skip to content

yotta / pictogram

Go to a project
Commit 34c610d3 by Jose Antonio
Options

Merge remote-tracking branch 'refs/remotes/origin/develop' 

Conflicts:
	sails/src/assets/styles/main.css
parents 5d10a0d9 c65df187
Inline Side-by-side
Showing with 55 additions and 14 deletions
sails/src/assets/app/browserNotCompatible.html 0 → 100644
<html>
<head>
<meta charset="utf-8">
<title>Pictogram Web</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="css/main.css">
<link rel="icon" href="img/logo_pictogram.png" type='image/png'>
<script>
var lang = (navigator.language || navigator.userLanguage).split("-")[0];
</script>
</head>
<body>
<div class="header-image">
<div class="row">
<div class="col-md-12 text-center">
<img ng-src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" src="img/logo_pictogram.png">
</div>
</div>
</div>
<div class="container vertical-center">
<div class="row">
<div class="col-md-12 text-center">
<br>
<h1>Navegador no compatible con Pictogram <i class="fa fa-frown-o" aria-hidden="true"></i></h1>
<br>
<h4>Le recomendamos utilizar la última versión de <a href="https://www.google.com/chrome/" target="_blank">Google Chrome</a> o <a href="https://www.mozilla.org/firefox/new/" target="_blank">Mozilla Firefox</a>.</h4>
</div>
</div>
</div>
<div class="languages">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="languages-margin text-muted text-center">Si los problemas persisten, contacte con <a href="mailto:soporte@yottacode.com" translate="" class="ng-scope">atención al cliente</a>.</div>
</div>
</div>
</div>
</div>
</body>
</html>
sails/src/assets/scripts/check_browser.js
...@@ -18,9 +18,10 @@ var clientBrowser = (function(){ ...@@ -18,9 +18,10 @@ var clientBrowser = (function(){
// Return if client browser valid or not // Return if client browser valid or not
var validBrowser = false; var validBrowser = false;
if(clientBrowser[0] == "Firefox" && parseInt(clientBrowser[1]) >= 51 ) if(clientBrowser[0] == "Firefox" && parseInt(clientBrowser[1]) >= 45 )
validBrowser = true; validBrowser = true;
if(clientBrowser[0] == "Chrome" && parseInt(clientBrowser[1]) >= 51 ) if(clientBrowser[0] == "Chrome" && parseInt(clientBrowser[1]) >= 51 )
validBrowser = true; validBrowser = true;
if(!validBrowser) alert("Su navegador no es compatible con Pictogram Web. Actualice a la última versión de Mozilla Firefox o Google Chrome."); // Redirect to view
if(!validBrowser) window.location = "browserNotCompatible.html";
sails/src/assets/scripts/modules/login/controllers/login.js
...@@ -17,9 +17,6 @@ function LoginCtrl( ...@@ -17,9 +17,6 @@ function LoginCtrl(
$stateParams, $stateParams,
ngToast) { ngToast) {
// Valid browser into scope (from assets/scripts/check_browser.js)
$scope.validBrowser = validBrowser;
$scope.credentials = { $scope.credentials = {
email: '', email: '',
password: '', password: '',
......
sails/src/assets/scripts/modules/login/views/login.html
...@@ -14,15 +14,6 @@ ...@@ -14,15 +14,6 @@
</div> </div>
<!--/. Office image --> <!--/. Office image -->
<!-- Valid browser -->
<div class="row" ng-if="!validBrowser">
<div class="container">
<div class="alert alert-warning">
<strong>{{ 'warning' | translate}}!</strong> {{ 'warning_browser_incompatible' | translate}} <a href="https://www.mozilla.org/es-ES/firefox/new/" target="_blank">Mozilla Firefox</a> {{ 'or' | translate}} <a href="https://www.google.com/chrome/" target="_blank">Google Chrome</a>.
</div>
</div>
</div>
<!-- Main row --> <!-- Main row -->
<div class="row"> <div class="row">
......
sails/src/assets/styles/main.css
...@@ -1023,3 +1023,11 @@ form .progress { ...@@ -1023,3 +1023,11 @@ form .progress {
.method-opt{ .method-opt{
font-weight: 600; font-weight: 600;
} }
.header-image {
width: 100%;
background-color: #f8f8f8;
padding-top: 20px;
padding-bottom: 20px;
border-bottom: 1px solid #e7e7e7;
}
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