Merge pull request #121 from matiu/feature/ux13

Feature/ux13
This commit is contained in:
Manuel Aráoz 2014-04-21 13:18:16 -03:00
commit 5f66a179c9
9 changed files with 84 additions and 43 deletions

View file

@ -18,8 +18,10 @@
</figure>
<div class="text-right" ng-show="$root.wallet">
<h5 ng-show="$root.wallet.id">Wallet ID: {{$root.wallet.id}}</h5>
<p ng-show="totalBalance">{{totalBalance}} <i class="fi-bitcoin"></i></p>
<p ng-show="!totalBalance">0 <i class="fi-bitcoin"></i></p>
<p>
Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
Available to Spend:{{availableBalance || 0}} <i class="fi-bitcoin"></i>
</p>
</div>
</div>
@ -214,13 +216,13 @@
<script type="text/ng-template" id="addresses.html">
<div class="addresses" data-ng-controller="AddressesController">
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
<h3>Address</h3>
<h3>Addresses (available to spend)</h3>
<div class="row">
<div class="large-6 columns">
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
<span ng-if="!isMain[addr]">(change)</span>
<span class="right">{{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i></span></a>
<span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
</div>
<div class="large-3 columns line-dashed-v text-center">