#37 valid browser before angular

sails/src/assets/scripts/check_browser.js

+// Return client browser. ex: $scope.clientBrowser == [ "Firefox", "51"]
+var clientBrowser = (function(){
+  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(/\b(OPR|Edge)\/(\d+)/);
+      if(tem!= null) return tem.slice(1).join(' ').replace('OPR', 'Opera');
+  }
+  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]);
+  return M.join(' ');
+})().split(" ");
+
+// Return if client browser valid or not
+var validBrowser = false;
+if(clientBrowser[0] == "Firefox" && parseInt(clientBrowser[1]) >= 52 )
+  validBrowser = true;
+if(clientBrowser[0] == "Chrome" && parseInt(clientBrowser[1]) >= 51 )
+  validBrowser = true;

sails/src/assets/scripts/modules/login/controllers/login.js

@@ -17,30 +17,8 @@ function LoginCtrl(
   $stateParams,
   ngToast) {
 
-  // Return client browser. ex: $scope.clientBrowser == [ "Firefox", "51"]
-  $scope.clientBrowser = (function(){
-    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(/\b(OPR|Edge)\/(\d+)/);
-        if(tem!= null) return tem.slice(1).join(' ').replace('OPR', 'Opera');
-    }
-    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]);
-    return M.join(' ');
-  })().split(" ");
-  console.log($scope.clientBrowser);
-
-  // Return if client browser valid or not
-  $scope.validBrowser = false;
-  if($scope.clientBrowser[0] == "Firefox" && parseInt($scope.clientBrowser[1]) >= 52 )
-    $scope.validBrowser = true;
-  if($scope.clientBrowser[0] == "Chrome" && parseInt($scope.clientBrowser[1]) >= 51 )
-    $scope.validBrowser = true;
+  // Valid browser into scope (from assets/scripts/check_browser.js)
+  $scope.validBrowser = validBrowser;
 
   $scope.credentials = {
     email: '',

sails/src/assets/scripts/modules/login/views/login.html

+<!-- Office image -->
 <div class="row">
   <div class="col-md-12 text-center">
     <!-- Logo Pictogram
@@ -11,7 +12,9 @@
     </p>
   </div>
 </div>
+<!--/. Office image -->
 
+<!-- Valid browser -->
 <div class="row" ng-if="!validBrowser">
   <div class="container">
     <div class="alert alert-warning">
@@ -20,24 +23,26 @@
   </div>
 </div>
 
+<!-- Main row -->
 <div class="row">
 
-      <!-- Rejilla 3 elementos de igual ancho -->
-      <div class="col-md-2">&nbsp;</div>
-      <div class="col-md-4">
+  <!-- Form column and offset -->
+  <div class="col-md-4 col-md-offset-2">
     <div id="login">
       <!-- Formulario -->
       <!-- LoginCtrl controls here, see app.js -->
       <form name="loginForm" ng-submit="login()" novalidate>
-
+        <!-- Email -->
         <div class="form-group">
           <label translate>email</label>:
           <input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" />
         </div>
+        <!-- Password -->
         <div class="form-group">
           <label translate>password</label>:
           <input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" />
         </div>
+        <!-- Remember -->
         <div class="checkbox">
           <label>
             <input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }}
@@ -45,31 +50,38 @@
         </div>
         <div class="row">
           <div class="col-md-12">
+            <!-- Login -->
             <div class="pull-left">
               <button type="submit" class="btn btn-primary" translate>login</button>
             </div>
+            <!-- Spinner -->
             <div class="pull-left">
               <i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i>
             </div>
+            <!-- Create account -->
             <div class="pull-right margin-top7">
               <a href="/app/#/signin" translate>create_an_account</a>
             </div>
           </div>
         </div>
-
+        <!-- Remember password -->
         <div class="text-center margin-top15">
-	      <br/>
+          <br>
           <a href="/app/#/changepass" translate>password_forgotten</a>
         </div>
       </form>
     </div>
-        <!-- Fin login -->
+    <!--/. login -->
   </div>
+  <!--/. form column -->
+
+  <!-- Image column -->
   <div class="col-md-4">
      <img src="img/login.png" alt="Pictogram" title="Pictogram" />
   </div>
-      <div class="col-md-2">&nbsp;</div>
-    </div>
-    <!-- Fin de row -->
+  <!--/. image column -->
+
+</div>
+<!--/. main row -->
 
-    <footer-translate></footer-translate>
+<footer-translate></footer-translate>

sails/src/tasks/config/concat.js

@@ -3,6 +3,7 @@ module.exports = function (grunt) {
   var jsLibs = [
     // JQuery is added because ng-file-upload produces errors if not
     'assets/app/bower_components/jquery/dist/jquery.min.js',
+    'assets/scripts/check_browser.js',
     'assets/app/bower_components/angular/angular.js',
     'assets/app/bower_components/angular-bootstrap/ui-bootstrap.min.js',
     'assets/app/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',