Merge remote-tracking branch 'ogresce/MAGETWO-33443-password-strength' into develop

Conflicts:
	setup/pub/magento/setup/css/setup.css

Author: mazhalai

setup/pub/magento/setup/create-admin-account.js

@@ -18,21 +18,21 @@ angular.module('create-admin-account', ['ngStorage'])
                 return;
             }
             var p = $scope.admin.password;
-            if (p.length > 6 && p.match(/[\d]+/) && p.match(/[a-z]+/) && p.match(/[A-Z]+/) && p.match(/[!@#$%^*()_\/\\\-\+=]+/)) {
+            if (p.length >= 6 && p.match(/[\d]+/) && p.match(/[a-z]+/) && p.match(/[A-Z]+/) && p.match(/[!@#$%^*()_\/\\\-\+=]+/)) {
                 $scope.admin.passwordStatus.class = 'strong';
                 $scope.admin.passwordStatus.label = 'Strong';
-            } else if (p.length > 6 && p.match(/[\d]+/) && p.match(/[a-z]+/) && p.match(/[A-Z]+/)) {
+            } else if (p.length >= 6 && p.match(/[\d]+/) && p.match(/[a-z]+/) && p.match(/[A-Z]+/)) {
                 $scope.admin.passwordStatus.class = 'good';
                 $scope.admin.passwordStatus.label = 'Good';
-            } else if (p.length > 6 && p.match(/[\d]+/) && p.match(/[a-zA-Z]+/)) {
+            } else if (p.length >= 6 && p.match(/[\d]+/) && p.match(/[a-zA-Z]+/)) {
+                $scope.admin.passwordStatus.class = 'fair';
+                $scope.admin.passwordStatus.label = 'Fair';
+            } else if (p.length >= 6) {
                 $scope.admin.passwordStatus.class = 'weak';
                 $scope.admin.passwordStatus.label = 'Weak';
-            } else if (p.length > 6) {
-                $scope.admin.passwordStatus.class = 'to-short';
-                $scope.admin.passwordStatus.label = 'Too Short';
             } else {
-                $scope.admin.passwordStatus.class = 'none';
-                $scope.admin.passwordStatus.label = 'None';
+                $scope.admin.passwordStatus.class = 'too-short';
+                $scope.admin.passwordStatus.label = 'Too Short';
             }
         };
 
@@ -71,7 +71,7 @@ angular.module('create-admin-account', ['ngStorage'])
             require: "ngModel",
             link: function(scope, elm, attrs, ctrl){
                 var validator = function(value){
-                    var minReg = /^(?=.*\d)(?=.*[a-zA-Z])[a-zA-Z0-9]{6,}$/,
+                    var minReg = /^(?=.*\d)(?=.*[a-zA-Z]).{6,}$/,
                         isValid = typeof value === 'string' && minReg.test(value);
 
                     ctrl.$setValidity('checkPassword', isValid);

setup/view/magento/setup/create-admin-account.phtml

@@ -15,10 +15,11 @@ $passwordWizard = sprintf(
             <div class=\'password-strength-item\'></div>
             <div class=\'password-strength-item\'></div>
             <div class=\'password-strength-item\'></div>
+            <div class=\'password-strength-item\'></div>
         </div>
     <p>%s</p>',
     'Password Strength:',
-    'Must be a mix of at least 7 alpha and numeric characters.(Ex.: BuyIt54).'
+    'Enter a mix of 6 or more numbers and letters. For a stronger password, include at least one small letter, big letter, and symbol (Ex: BuyIt$54).'
 );
 ?>
 
@@ -144,7 +145,7 @@ $passwordWizard = sprintf(
                 >
             <div class="error-container">
                 <span ng-show="account.adminPassword.$error.checkPassword">
-                    Please enter at least 7 alpha-numeric characters.
+                    Please enter a mix of at least 6 alpha-numeric characters.
                 </span>
                 <span ng-show="account.adminPassword.$error.required">
                     Please enter your new password.

setup/view/styles/components/tooltips/_password-strength.less

@@ -7,7 +7,7 @@
     display: block;
     margin: 0 -.3rem 1em;
     white-space: nowrap;
-    &.password-strength-to-short {
+    &.password-strength-too-short {
         .password-strength-item {
             &:first-child {
                 background-color: @color-failed;
@@ -17,13 +17,22 @@
     &.password-strength-weak {
         .password-strength-item:first-child,
         .password-strength-item:first-child + .password-strength-item {
+            background-color: @color-failed;
+        }
+    }
+    &.password-strength-fair {
+        .password-strength-item:first-child,
+        .password-strength-item:first-child + .password-strength-item,
+        .password-strength-item:first-child + .password-strength-item + .password-strength-item {
             background-color: @color-warning;
         }
     }
     &.password-strength-good {
         .password-strength-item:first-child,
         .password-strength-item:first-child + .password-strength-item,
-        .password-strength-item:first-child + .password-strength-item + .password-strength-item {
+        .password-strength-item:first-child + .password-strength-item + .password-strength-item,
+        .password-strength-item:first-child + .password-strength-item + .password-strength-item
+            + .password-strength-item {
             background-color: @color-success;
         }
     }
@@ -38,6 +47,6 @@
         font-size: 0;
         height: 1.4rem;
         margin-right: .3rem;
-        width: ~'calc(25% - .6rem)';
+        width: ~'calc(20% - .6rem)';
     }
 }