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

Merge pull request #2179 from matiu/wallet-creator-message

Browse source 
Wallet creator message
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-17 11:25:53 -03:00
commit 3cc3a07bb9
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
views/copayers.html
View file

@ -4,15 +4,27 @@
<h1 class="hide-for-large-up size-18">{{$root.title}}</h1>
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div ng-if="!$root.wallet.isComplete()">
<div class="panel oh">
<div class="box-notification">
<div class="box-icon error">
<i class="fi-alert size-24"></i>
</div>
<span class="text-warning size-14">
Please note the wallet creator <b>must be online</b> until all copayers have joined.
</span>
</div>
<div class="text-center">
<qrcode size="250" data="{{secret}}"></qrcode>
</div>
<div class="secret m10v">
{{secret}}
{{secret}}
</div>
<div class="size-10 line-t text-center">
<h2 class="m10t">{{$root.wallet.getName()}}</h2>
@ -25,16 +37,17 @@
</div>
<div class="panel oh">
<h3>Waiting for copayers</h3>
<div ng-include="'views/includes/copayers.html'"></div>
<div ng-include="'views/includes/copayers.html'"></div>
<div class="copay-box" ng-if="!$root.wallet.isComplete()">
<span ng-include="'views/includes/photo.html'"></span>
<p class="size-12 text-white text-light m0">
<i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span>
<i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span>
</p>
</div>
</div>
</div>
</div> <!-- end of row -->
</div>
<!-- end of row -->
</div>

3
views/create.html
View file

@ -35,7 +35,7 @@
</label>
</div>
<div class="large-6 medium-6 columns">
<label><span translate>Select required signatures (*)</span>
<label><span translate>Select required signatures</span>
<select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues" ng-disabled="totalCopayers == 1">
</select>
</label>
@ -48,7 +48,6 @@
</div>
</div>
</div>
<p translate class="comment" ng-show="totalCopayers>1">(*) The limits are imposed by the bitcoin network.</p>
<div class="line-dashed-h m20b"></div>