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

Merge pull request #3833 from cmgustavo/ref/waiting-for-copayes

Browse source 
Ref. Waiting for Copayers
This commit is contained in:
Matias Alejo Garcia 2016-02-01 09:35:20 -03:00
commit 0875b7dd5b
6 changed files with 69 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

83
public/views/copayers.html
View file

@ -4,57 +4,66 @@
ng-init="">
</div>
<div class="content p20v" ng-controller="copayersController as copayers" ng-init="copayers.init()">
<div class="copayers p20v" ng-controller="copayersController as copayers" ng-init="copayers.init()">
<div ng-show="!index.notAuthorized">
<div class="row m10t text-center">
<div class="large-12 columns">
<h1 translate>Share this invitation with your copayers</h1>
</div>
</div>
<h1 class="text-center" translate>Share this invitation with your copayers</h1>
<div ng-click="copayers.copySecret(index.walletSecret)" ng-class="{'enable_text_select': !index.isCordoba}">
<div ng-click="copayers.copySecret(index.walletSecret)" ng-class="{'enable_text_select': !index.isCordova}">
<div class="text-center">
<qrcode size="220" error-correction-level="L" data="{{index.walletSecret}}"></qrcode>
<div class="secret columns m10t m20b">
<div ng-show="!index.walletSecret" style="position:relative; top:-226px; height:0px">
<div style="height:220px; width:220px; margin:auto; background: white">
<div class="spinner" style="margin-top:85px">
<div class="rect1"></div>
<div class="rect2"></div>
<div class="rect3"></div>
<div class="rect4"></div>
<div class="rect5"></div>
</div>
</div>
</div>
<div class="secret">
{{index.walletSecret || ('Loading...'|translate)}}
</div>
</div>
</div>
<div class="text-center m10t" ng-if="index.isCordova">
<span class="button outline round dark-gray tiny"
ng-click="copayers.shareSecret(index.walletSecret)">
<i class="fi-share"></i>
<span translate>Share invitation</span>
</span>
</div>
<h4 class="title oh m0">
<span translate>Waiting for copayers</span>
<span class="text-gray right">
[ <span translate>{{index.m}}-of-{{index.n}}</span> ]
</span>
</h4>
<div class="p10 line-b" ng-include="'views/includes/copayers.html'"></div>
<div ng-if="!index.isComplete" class="p10 line-b m20b">
<p class="size-12 m0">
<i class="fi-loop"></i>
<span translate>Waiting...</span>
</p>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="m20tp text-center" ng-show="index.notAuthorized">
<div ng-show="index.walletSecret">
<div class="text-center m10t" ng-if="index.isCordova">
<span class="button outline round dark-gray tiny m0"
ng-click="copayers.shareSecret(index.walletSecret)">
<i class="fi-share"></i>
<span translate>Share invitation</span>
</span>
</div>
<div class="m30v line-t">
<h4 class="size-14 p10h m10t">
<span translate>Waiting for copayers</span>
<span class="text-gray right">
[ <span translate>{{index.m}}-of-{{index.n}}</span> ]
</span>
</h4>
<div class="white line-b p10" ng-include="'views/includes/copayers.html'"></div>
<div ng-if="!index.isComplete" class="line-b p10 white size-12">
<i class="fi-loop m5r p10l"></i>
<span translate>Waiting...</span>
</div>
</div>
<div class="m20b text-center" ng-show="index.notAuthorized">
<h1 translate>Wallet incomplete and broken</h1>
<h4 translate>Delete it and create a new one</h4>
</div>
<button class="small warning expand round" ng-click="copayers.deleteWallet()">
<i class="fi-trash"></i> <span translate>Cancel</span>
</button>
<div class="text-center">
<button class="tiny round outline dark-gray warning" ng-click="copayers.deleteWallet()">
<i class="fi-trash"></i> <span translate>Cancel and delete the wallet</span>
</button>
</div>
</div>
</div>
<div class="extra-margin-bottom"></div>
</div>
<div class="extra-margin-bottom"></div>

2
public/views/modals/confirmation.html
View file

@ -1,6 +1,6 @@
<div class="m20tp text-center">
<div class="row">
<h1 class="text-center m20b">{{title|translate}}</h1>
<h1 class="text-center m20b p20">{{title|translate}}</h1>
<div class="large-6 medium-6 small-6 columns">
<button class="button warning expand round" ng-disabled="loading" ng-click="ok()">
<i class="fi-trash"></i> <span translate>Yes</span>

2
public/views/walletHome.html
View file

@ -351,7 +351,7 @@
</div>
<div ng-show="home.addr[index.walletId]">
<div class="line-t size-10 text-gray m10b" translate>
<div class="line-t size-10 text-gray m10b p10t" translate>
Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.
</div>
</div>