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

put copayers on setting & fix avatar wallet

Browse source
This commit is contained in:
bechi 2015-02-02 16:54:38 -03:00
commit 3a230e2763
6 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

11
views/copayers.html
View file

@ -6,7 +6,7 @@
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-8 columns">
<div ng-if="!$root.wallet.isComplete()">
<div class="panel oh">
@ -35,18 +35,21 @@
</div>
</div>
</div>
</div>
<div class="large-4 columns">
<div class="panel oh">
<h3>Waiting for copayers</h3>
<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">
<div ng-if="!$root.wallet.isComplete()" class="m15t">
<div class="left m10r" ng-include="'views/includes/photo.html'"></div>
<p class="size-12 m0 m5t left mv">
<i class="fi-loop icon-rotate spinner"></i>
<span translate>Waiting...</span>
</p>
</div>
</div>
</div>
</div>
<!-- end of row -->
<div class="row">

9
views/homeWallet.html
View file

@ -70,14 +70,5 @@
</div>
</div>
<div class="row" ng-if="$root.wallet.isShared()">
<!-- List of copayers -->
<div class="large-12 columns">
<div class="panel oh">
<h2 class="line-b" translate>Copayers</h2>
<div ng-include="'views/includes/copayers.html'"></div>
</div>
</div>
</div>
</div>
<div class="extra-margin-bottom"></div>

19
views/includes/copayers.html
View file

@ -1,12 +1,11 @@
<div>
<div class="copay-box" ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
<div class="photo-container">
<img gravatar-src="'{{copayer.nick}}'" gravatar-size="35">
<ul class="no-bullet m0">
<li class="oh m15t" ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
<div class="left m10r" >
<div class="photo-container">
<img gravatar-src="'{{copayer.nick}}'" gravatar-size="35">
</div>
</div>
<div
class="ellipsis"
tooltip="ID: {{copayer.peerId}}"
tooltip-placement="bottom">
<div class="left" tooltip="ID: {{copayer.peerId}}" tooltip-placement="bottom">
<small class="text-gray" ng-show="copayer.index == 0">
<i class="fi-check m5r"></i> {{'Me'|translate}}
</small>
@ -14,5 +13,5 @@
<i class="fi-check m5r"></i> {{copayer.nick}}
</small>
</div>
</div>
</div>
</li>
</ul>

13
views/more.html
View file

@ -22,9 +22,8 @@
</div>
</div>
</form>
<div class="row" ng-init="isComplete = wallet.isComplete(); networkName = wallet.getNetworkName()">
<div class="large-12 columns">
<div class="row">
<div class="large-8 columns" ng-init="isComplete = wallet.isComplete(); networkName = wallet.getNetworkName()">
<h4>Wallet info</h4>
<table>
<tr>
@ -49,10 +48,16 @@
</tr>
</table>
</div>
<div class="large-4 columns" ng-if="$root.wallet.isShared()">
<h4>Copayers</h4>
<div class="panel oh">
<div ng-include="'views/includes/copayers.html'"></div>
</div>
</div>
</div>
<div class="row" ng-show="!backupWalletPlainText && !error">
<div class="large-12 medium-12 small-12 columns">
<div class="large-8 medium-12 small-12 columns">
<button class="primary expand" ng-click="downloadWalletBackup()" ng-disabled="loading"
ng-show="!isSafari && !isCordova"><i class="fi-download"></i> Download backup</button>
<button class="primary expand" ng-click="viewWalletBackup()" ng-disabled="loading"