fix all unloggead forms

This commit is contained in:
Matias Alejo Garcia 2015-01-03 17:22:06 -03:00
parent ce4eade276
commit 6055164412
3 changed files with 25 additions and 17 deletions

View File

@ -22,6 +22,8 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
pinService.makePinInput($scope, 'newpin', function(newValue) {
_firstpin = newValue;
$scope.askForPin = 2;
$scope.hideForWP = 0;
});
pinService.makePinInput($scope, 'repeatpin', function(newValue) {
@ -29,7 +31,9 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
_firstpin = null;
$scope.createPin(newValue);
} else {
$scope.askForPin = 1;
$scope.askForPin = 1;
$scope.hideForWP = 0;
_firstpin = null;
$scope.setPinForm.newpin.$setViewValue('');
@ -156,6 +160,8 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
password: password,
};
$scope.askForPin = 1;
$scope.hideForWP = 0;
$rootScope.hideNavigation = true;
$timeout(function() {
$rootScope.$digest();

View File

@ -20,8 +20,8 @@
<div class="clipo" ng-if="!useLocalstorage && !hideForWP">
<img src="img/clipo-signup2.png" alt="clipo" width="373">
</div>
<h2 ng-if="!useLocalstorage"> Creating in the cloud </h2>
<h2 ng-if="useLocalstorage"> Creating on this device </h2>
<h2 ng-if="!useLocalstorage" ng-hide="hideForWP"> Creating in the cloud </h2>
<h2 ng-if="useLocalstorage" ng-hide="hideForWP"> Creating on this device </h2>
</div>
<div ng-show="createStep == 'pass'">
@ -29,9 +29,9 @@
<img src="img/clipo-signup3.png" alt="clipo" width="380">
</div>
<h2 ng-if="useLocalstorage"> Creating on this device </h2>
<h2 ng-if="!useLocalstorage"> Creating in the cloud </h2>
<div class="text-gray text-center m20b">{{userOrEmail}}</div>
<h2 ng-if="useLocalstorage" ng-hide="hideForWP"> Creating on this device </h2>
<h2 ng-if="!useLocalstorage" ng-hide="hideForWP"> Creating in the cloud </h2>
<div class="text-gray text-center m20b" ng-hide="hideForWP">{{userOrEmail}}</div>
</div>
<div class="box-notification" ng-show="error && !passwordStrength">
@ -149,10 +149,12 @@
<form ng-show="createStep == 'pass'" name="passForm" ng-submit="createProfile(passForm)" novalidate>
<div class="box-notification" ng-show="passwordStrength">
<div class="box-icon" style="background-color:{{passwordStrength.color}}">
<i class="fi-x size-24" ng-if="passwordStrength.strength< minPasswordStrength"></i>
<i class="fi-check size-24" ng-if="passwordStrength.strength >= minPasswordStrength"></i>
</div>
<div class="box-icon" ng-if="passwordStrength.strength< minPasswordStrength" style="background-color:#dd514c">
<i class="fi-x size-24"></i>
</div>
<div class="box-icon" ng-if="passwordStrength.strength >= minPasswordStrength" style="background-color:#16A085">
<i class="fi-check size-24"></i>
</div>
<span class="size-14" >
Password Strength: {{passwordStrength.message}}
</span>
@ -213,11 +215,11 @@
<form name="setPinForm" novalidate>
<div class="input" ng-show="askForPin == 1">
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1" ng-focus="formFocus()">
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1 && !isWindowsPhoneApp" ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>
<div class="input" ng-show="askForPin == 2">
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2" ng-focus="formFocus()">
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2 && !isWindowsPhoneApp" ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>

View File

@ -38,11 +38,11 @@
<form name="setPinForm" ng-model="setPinForm" novalidate>
<div class="input" ng-show="askForPin == 1">
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1">
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1 && !isWindowsPhoneApp" ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>
<div class="input" ng-show="askForPin == 2">
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2">
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2 && !isWindowsPhoneApp" ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>
@ -65,7 +65,7 @@
</div>
<div ng-if='$root.hasPin && !$root.iden'>
<div class="clipo">
<div class="clipo" ng-hide="hideForWP">
<img src="img/clipo-pin-enter.png" alt="clipo" width="300">
</div>
<form name="pinForm" novalidate>
@ -79,7 +79,7 @@
</div>
<div class="input">
<input id="pin" type="tel" ng-model="pin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Pin number" name="pin" required>
<input id="pin" type="tel" ng-model="pin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Pin number" name="pin" required ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>
@ -131,7 +131,7 @@
</div>
<div class="input" ng-if="!usingLocalStorage">
<input type="email" ng-model="email" class="form-control" name="email" placeholder="Email" required show-focus="!isMobile">
<input type="email" ng-model="email" class="form-control" name="email" placeholder="Email" required show-focus="!isMobile" ng-focus="formFocus()">
<i class="icon-email"></i>
</div>