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

refactor tx proposal events

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-10 18:18:28 -03:00
commit 6ce2667274
11 changed files with 201 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

25
views/homeWallet.html
View file

@ -20,14 +20,14 @@
<span class="size-21">
<strong>
<span ng-if="!$root.updatingBalance">{{$root.wallet.balanceInfo.totalBalance || 0}}</span>
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
{{$root.wallet.settings.unitName}}
</strong>
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
{{$root.wallet.settings.unitName}}
</strong>
</span>
<span class="size-14 db m5t text-gray">
<span ng-if="!$root.wallet.balanceInfo.updatingBalance && $root.wallet.balanceInfo.alternativeBalanceAvailable">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
<span ng-if="!$root.wallet.balanceInfo.updatingBalance && !$root.wallet.balanceInfo.alternativeBalanceAvailable">N/A</span>
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<span ng-if="!$root.wallet.balanceInfo.updatingBalance && !$root.wallet.balanceInfo.alternativeBalanceAvailable">N/A</span>
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
</span>
</div>
</div>
@ -47,13 +47,18 @@
</div>
</div>
<div ng-show="$root.wallet.isShared() && txps.length != 0">
<div ng-show="$root.wallet.isShared()">
<div class="row">
<div class="large-12 columns">
<h2 translate>Pending Transactions Proposals</h2>
<div class="panel last-transactions pr"
ng-repeat="tx in txps | paged"
ng-include="'views/includes/transaction.html'"></div>
<div class="panel oh">
<h2 class="line-b" translate>Spend proposals</h2>
<div class="last-transactions pr" ng-repeat="tx in $root.wallet.pendingTxProposals | paged" ng-include="'views/includes/transaction.html'" ng-if="$root.wallet.pendingTxProposals[0]">
</div>
<div class="pr" ng-if="!$root.wallet.pendingTxProposals[0]">
<p> No pending spend proposals at the moment.
</div>
</div>
</div>
</div>
</div>