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

fix repeat tx-outs. fix iden name

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-12 12:07:46 -03:00
commit 44d97ed163
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
views/includes/transaction.html
View file

@ -12,7 +12,6 @@
</span>
<contact address="{{out.address}}" ng-hide="tx.merchant"> </contact>
</span>
</span>
</div>
<div class="p25l m10b" ng-class="{'text-gray':!pendingForUs}">

39
views/modals/txp-details.html
View file

@ -1,32 +1,33 @@
<div class="txp-popup">
<div class="header">
<div class="ellipsis p10b size-16 m20r">
<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>
<div ng-repeat="out in tx.outs">
<div class="ellipsis p10b size-16 m20r">
<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>
</div>
<div class="p25l" ng-class="{'text-gray':!pendingForUs}">
<div class="size-21 text-bold m5b">
{{out.value}} {{$root.wallet.settings.unitName}}
</div>
<span class="alt-currency black size-12" ng-class="{'gray':!pendingForUs}">
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
</span>
<contact address="{{out.address}}" ng-hide="tx.merchant"></contact>
</span>
</span>
</div>
<div class="p25l" ng-class="{'text-gray':!pendingForUs}" ng-repeat="out in tx.outs">
<div class="size-21 text-bold m5b">
{{out.value}} {{$root.wallet.settings.unitName}}
</div>
<span class="alt-currency black size-12" ng-class="{'gray':!pendingForUs}">
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
</span>
</div>
<a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
</div>
<div class="m10v line-b size-14" ng-show="tx.comment">
<div class="oh" ng-if="tx.ts || tx.createdTs ">
<p class="left m5b">Bechilandia@gmail.com</p>
<p class="left m5b">{{$root.iden.getName()}}</p>
<div class="text-gray text-right m5t size-12">
<time>{{ (tx.ts || tx.createdTs ) | amTimeAgo}}</time>
</div>