anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1509 from cmgustavo/bug/01-angularjs-validation

Browse source 
Fixes validation when joining or creating a wallet
This commit is contained in:
Ivan Socolsky 2014-10-06 11:56:13 -03:00
commit 6c1feb8525
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
views/create.html
View file

@ -21,7 +21,8 @@
<div class="row" ng-show="isSetupWalletPage">
<div ng-if="totalCopayers > 1">
<label translate for="Name">Your name</label>
<input id="Name" type="text" placeholder="{{'Name'|translate}}" class="form-control" ng-model="$parent.myNickname">
<input id="Name" type="text" placeholder="{{'Your name'|translate}}"
class="form-control" ng-model="$parent.myNickname" required>
</div>
<div>
<label translate for="walletPassword">
@ -33,8 +34,9 @@
symbols</span>" tooltip-trigger="focus" required tooltip-placement="top">
<div class="pr">
<input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
<small class="icon-input" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid"><i class="fi-x"></i></small>
<p class="m15b text-gray size-12" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">
<small class="icon-input"
ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.walletPasswordConfirm.$invalid"><i class="fi-x"></i></small>
<p class="m15b text-gray size-12" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.walletPasswordConfirm.$invalid">
<i class="fi-x m5r"></i>
{{'Passwords must match'|translate}}
</p>

3
views/join.html
View file

@ -57,7 +57,8 @@
<label translate for="joinPassword">User information</label>
<input id="joinPassword" type="text" class="form-control"
placeholder="{{'Your name (optional)'|translate}}" name="nickname" ng-model="nickname">
placeholder="{{'Your name'|translate}}" name="nickname"
ng-model="nickname" required>
<input type="password" class="form-control"
placeholder="{{'Choose your password'|translate}}" name="joinPassword"
ng-model="$parent.joinPassword"