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

add style on tx item

Browse source
This commit is contained in:
bechi 2014-12-12 01:05:59 -03:00
commit 61e72c7feb
3 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
views/homeWallet.html
View file

@ -58,7 +58,7 @@
<div class="last-transactions pr" ng-repeat="tx in $root.wallet.pendingTxProposals | orderBy:'-createdTs'" ng-include="'views/includes/transaction.html'" ng-if="$root.wallet.pendingTxProposals[0]">
</div>
<div class="text-right size-12 line-t m10t p10t" ng-show="$root.wallet.balanceInfo.lockedBalance && !$root.wallet.balanceInfo.updatingBalance">
<div class="text-right size-12 line-t p10t" ng-show="$root.wallet.balanceInfo.lockedBalance && !$root.wallet.balanceInfo.updatingBalance">
Total Locked Balance:
<b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b>
<span class="text-gray"> {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} </span>

45
views/includes/transaction.html
View file

@ -1,34 +1,31 @@
<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" 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"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
<div class="last-transactions-content" ng-class="{'line-b':!$last, 'active':pendingForUs}" ng-click="openTxModal(tx)">
<div ng-repeat="out in tx.outs">
<div class="ellipsis p10b size-16 m20r" ng-init="pendingForUs = !tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]">
<span class="tx-proposal size-12 m5r"> <i ng-class="{'active':pendingForUs}" class="fi-arrow-right"></i> </span>
<span class="text-gray">
To:
<span ng-if="tx.merchant">
<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>
<contact address="{{out.address}}" ng-hide="tx.merchant"> </contact>
</span>
</span>
<contact address="{{out.address}}" ng-hide="tx.merchant"> </contact>
</div>
</div>
<div class="large-6 medium-6 small-12 columns">
<div class="text-right">
<span class="size-21">
<span ng-if="!$root.updatingBalance">
{{out.value}}
</span>
{{$root.wallet.settings.unitName}}
</span>
<span class="size-14 db m5t text-gray">
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
</span>
<div class="p25l m10b" ng-class="{'text-gray':!pendingForUs}">
<div class="size-21 text-bold m10b">
<span ng-if="!$root.updatingBalance">
{{out.value}}
</span>
{{$root.wallet.settings.unitName}}
<i class="icon-arrow-right3 size-24 text-gray right"></i>
</div>
<span class="alt-currency black size-12" ng-class="{'gray':!pendingForUs}">
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
</span>
</div>
</div>
</div>