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

Fix Conflicts:

Browse source 
index.html
This commit is contained in:
Gustavo Cortez 2014-06-02 22:10:27 -03:00
commit 5cbfeef163
3 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
index.html
View file

@ -73,6 +73,15 @@
</div>
<div class="row" ng-if="updateVersion">
<div class="small-9 large-centered columns">
<div data-alert class="alert-box radius {{updateVersion}}">
A newer version of Copay is now available, please update your wallet to a latest version.
Please check <a href="http://www.copay.io">Copay.io</a>.
</div>
</div>
</div>
<div class="row" ng-if='$root.$flashMessage.message' notification>
<div class="small-8 large-centered columns">
<div data-alert class="alert-box radius {{$root.$flashMessage.type}}">
@ -206,7 +215,7 @@
<h3>Join a Wallet in Creation</h3>
<form name="joinForm" ng-submit="join(joinForm)" novalidate>
<input type="text" class="form-control" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required>
<input type="password" class="form-control" placeholder="Choose your password" name="joinPassword" ng-model="joinPassword" check-strength="joinPassword" required>
<input type="password" class="form-control" placeholder="Choose your password" name="joinPassword" ng-model="joinPassword" check-strength="passwordStrength" tooltip="Password strength: {{passwordStrength}}" tooltip-trigger="focus" required>
<input type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
<button type="submit" class="button primary radius" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button>
</form>
@ -292,7 +301,7 @@
<div class="small-12 medium-6 large-6 columns">
<label>Your Wallet Password <small class="has-tip" tooltip="doesn't need to be shared">Required</small>
<input type="password" placeholder="Choose your password" class="form-control"
ng-model="walletPassword" check-strength="walletPassword" required>
ng-model="walletPassword" check-strength="passwordStrength" required>
</label>
</div>
</div>