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

replace outputs list at bottom with expandable list at top

Browse source
This commit is contained in:
Gregg Zigler 2015-07-02 11:06:37 -07:00
commit d61ba54899
5 changed files with 73 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,20 +1,23 @@
<div class="ng-animate-disabled row collapse line-b" ng-class="text-gray'">
<ul class="no-bullet size-14 m0">
<li class="line-b p10 oh">
</li>
<li 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}}</span>
</li>
<li class="line-b p10">
<span class="text-gray" translate>Amount</span>:
<span class="right">{{output.amountStr}}
<span class="label gray radius">{{output.alternativeAmountStr}}</span>
</span>
</li>
<li class="line-b p10 oh">
<span class="text-gray" translate>Note</span>:
<span class="right">{{output.message}}</span>
</li>
</ul>
<div class="ng-animate-disabled row collapse line-b" ng-class="text-gray">
<li ng-if="output.summary" class="line-b p10 oh" ng-click="expand(output.parent)">
<span class="text-gray" translate>To</span>:
<span class="right enable_text_select">{{output.summary.length}}
<span class="enable_text_select" translate>recipients</span>
<i class="icon-arrow-down size-24"></i>
</span>
</li>
<li ng-if="!output.summary" 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}}</span>
</li>
<li class="line-b p10" ng-click="expand(output.parent)">
<span class="text-gray" translate>Amount</span>:
<span class="right">{{output.amountStr}}
<span class="label gray radius enable_text_select">{{output.alternativeAmountStr}}</span>
</span>
</li>
<li class="line-b p10 oh" ng-click="expand(output.parent)">
<span class="text-gray" translate>Note</span>:
<span class="right enable_text_select">{{output.message}}</span>
</li>
</div>

6
public/views/includes/transaction.html
View file

@ -17,10 +17,8 @@
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
</span>
<span ng-if="tx.outputs">
{{tx.outputs[0].toAddress.substring(0, 16)+'...'}}
<span translate>and </span>
{{tx.outputs.length - 1}}
<span translate> more</span>
<span>{{tx.outputs[0].summary.length}}</span>
<span translate>recipients</span>
</span>
<span ng-if="!tx.outputs">
<contact address="{{tx.toAddress}}" ng-hide="tx.merchant"> </contact>

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

@ -14,17 +14,24 @@
<div class="modal-content fix-modals-touch" ng-init="updateCopayerList()">
<h4 class="title m0" translate>Details</h4>
<ul class="no-bullet size-14 m0">
<li class="line-b p10 oh" ng-click="copyAddress(tx.toAddress)">
<div ng-if="tx.outputs"
ng-repeat="output in tx.outputs"
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" translate ng-if="tx.outputs">See details below</span>
<span class="right enable_text_select" ng-if="!tx.outputs">{{tx.toAddress}}</span>
<span class="right enable_text_select">{{tx.toAddress}}</span>
</li>
<li class="line-b p10">
<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>
@ -39,10 +46,6 @@
<span class="text-gray" translate>Created by</span>:
<span class="right">{{tx.creatorName}}</span>
</li>
<li class="line-b p10 oh">
<span class="text-gray" translate>Note</span>:
<span class="right">{{tx.message}}</span>
</li>
</ul>
<div ng-if="tx.paypro">
<h4 class="title m0" translate>Payment details</h4>
@ -148,11 +151,5 @@
</button>
</div>
<div ng-if="tx.outputs">
<div ng-repeat="output in tx.outputs"
ng-include="'views/includes/output.html'">
</div>
</div>
<div class="extra-margin-bottom"></div>
</div>