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

@cmgustavos awesome design ideas

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-11 02:01:12 -03:00
commit 2b24c443e7
11 changed files with 166 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

7
views/includes/sidebar.html
View file

@ -36,18 +36,13 @@
</header>
<div class="locked" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<span class="text-gray">
<i class="fi-lock"></i> {{'Locked'|translate}} &nbsp;
{{'Locked'|translate}} &nbsp;
</span>
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<span ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance" class="text-gray">
<b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b>
- {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}
</span>
<i class="fi-info medium right text-gray size-14"
tooltip="{{'Balance locked in pending transaction proposals'|translate}}"
tooltip-placement="left"
data-options="disable_for_touch:true"
tooltip-popup-delay='500'></i>
</div>

9
views/includes/transaction.html
View file

@ -3,11 +3,14 @@
<div class="last-transactions-content" ng-class="{'line-b':!$last}" ng-click="openTxModal(tx)">
<div class="row" ng-repeat="out in tx.outs">
<div class="large-6 medium-6 small-12 columns size-16">
<div class="ellipsis m10b">
<div class="ellipsis m10b" ng-init="pendingForUs = !tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]">
<span ng-class="{'color-alert':pendingForUs, 'hidden':!pendingForUs} "> ● </span>
To:
<span ng-if="tx.merchant">
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{tx.merchant.domain}}</span>
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
</span>
</span>
<contact address="{{out.address}}" ng-hide="tx.merchant"> </contact>