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

txp and txhistory share outputs.html for all amount/address/message

Browse source
This commit is contained in:
Gregg Zigler 2015-07-28 10:22:46 -07:00
commit 43bca75728
5 changed files with 75 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

24
public/views/includes/output.html
View file

@ -1,24 +1,24 @@
<div class="ng-animate-disabled row collapse line-b" ng-class="text-gray">
<li ng-if="output.parent.isSummarized" class="line-b p10 oh" ng-click="toggleOutputSummary(output)">
<li ng-if="output.isSummary" class="line-b p10 oh" ng-click="toggleOutputDetails(output)">
<span class="text-gray" translate>Recipients</span>:
<span class="right enable_text_select">{{output.parent.length}}
<i class="icon-arrow-down size-24"></i>
<span class="right enable_text_select">{{output.recipientCount}}
<i ng-show="output.showDetails" class="icon-arrow-up3 size-24"></i>
<i ng-show="!output.showDetails" class="icon-arrow-down3 size-24"></i>
</span>
</li>
<li ng-if="!output.parent.isSummarized" class="line-b p10 oh" ng-click="toggleOutputSummary(output)">
<li ng-if="!output.isSummary" class="line-b p10 oh" ng-click="copyAddress(output.toAddress)">
<span class="text-gray" translate>To</span>:
<span class="right enable_text_select">{{output.toAddress}}
<i class="icon-arrow-up size-24"></i>
</span>
<span class="right enable_text_select">{{output.toAddress || output.address}}</span>
</li>
<li class="line-b p10" ng-click="toggleOutputSummary(output)">
<span class="text-gray" translate>Amount</span>:
<li class="line-b p10">
<span ng-show="output.isSummary" class="text-gray" translate>Total</span>
<span ng-show="!output.isSummary" class="text-gray" translate>Amount</span>:
<span class="right">{{output.amountStr}}
<span class="label gray radius enable_text_select">{{output.alternativeAmountStr}}</span>
<span ng-show="output.alternativeAmountStr" class="label gray radius">{{output.alternativeAmountStr}}</span>
</span>
</li>
<li class="line-b p10 oh" ng-click="toggleOutputSummary(output)">
<li class="line-b p10 oh">
<span class="text-gray" translate>Note</span>:
<span class="right enable_text_select">{{output.message}}</span>
<span class="right">{{output.message}}</span>
</li>
</div>

17
public/views/modals/tx-details.html
View file

@ -27,8 +27,17 @@
</div>
<h4 class="title m0" translate>Details</h4>
<ul class="no-bullet size-14 m0">
<li ng-if="btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)">
<div ng-if="!btx.showSingle"
ng-repeat="output in [ btx.outputs.summary ]"
ng-include="'views/includes/output.html'">
</div>
<div ng-if="!btx.showSingle && btx.outputs.summary.showDetails"
ng-repeat="output in btx.outputs.details"
ng-include="'views/includes/output.html'">
</div>
<li ng-if="btx.showSingle && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)">
<span class="text-gray" translate>To</span>:
<span class="right">
<span ng-if="btx.merchant">
@ -54,12 +63,6 @@
<span class="text-gray" translate>Fee</span>:
<span class="right">{{feeStr}}</span>
</li>
<li ng-if="btx.message" class="line-b p10 oh">
<span class="text-gray" translate>Note</span>:
<span class="right">
{{btx.message}}
</span>
</li>
<li ng-if="btx.merchant" class="line-b p10 oh">
<span class="text-gray" translate>Merchant message</span>:
<span class="right">

26
public/views/modals/txp-details.html
View file

@ -14,24 +14,18 @@
<div class="modal-content fix-modals-touch" ng-init="updateCopayerList()">
<h4 class="title m0" translate>Details</h4>
<ul class="no-bullet size-14 m0">
<div ng-if="tx.outputs"
ng-repeat="output in tx.outputs.list"
<div ng-if="!tx.showSingle"
ng-repeat="output in [ tx.outputs.summary ]"
ng-include="'views/includes/output.html'">
</div>
<div ng-if="!tx.showSingle && tx.outputs.summary.showDetails"
ng-repeat="output in tx.outputs.details"
ng-include="'views/includes/output.html'">
</div>
<div ng-if="tx.showSingle"
ng-repeat="output in [ tx ]"
ng-include="'views/includes/output.html'">
</div>
<li ng-if="!tx.outputs" class="line-b p10 oh" ng-click="copyAddress(tx.toAddress)">
<span class="text-gray" translate>To</span>:
<span class="right enable_text_select">{{tx.toAddress}}</span>
</li>
<li ng-if="!tx.outputs" class="line-b p10">
<span class="text-gray" translate>Amount</span>:
<span class="right">{{amountStr}}
<span class="label gray radius">{{alternativeAmountStr}}</span>
</span>
</li>
<li ng-if="!tx.outputs" class="line-b p10 oh">
<span class="text-gray" translate>Note</span>:
<span class="right">{{tx.message}}</span>
</li>
<li class="line-b p10">
<span class="text-gray" translate>Fee</span>:
<span class="right">{{feeStr}}</span>