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

Fix layout. Adds spend unconfirmed to txp details

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-08-05 12:56:25 -03:00
commit 4a79dbd01f
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
<div class="ng-animate-disabled row collapse line-b" ng-class="text-gray"> <div class="ng-animate-disabled row collapse">
<li ng-if="output.isSummary" class="line-b p10 oh" ng-click="toggleOutputDetails(output)"> <li ng-if="output.isSummary" class="line-b p10 oh" ng-click="toggleOutputDetails(output)">
<span class="text-gray" translate>Recipients</span>: <span class="text-gray" translate>Recipients</span>:
<span class="right enable_text_select">{{output.recipientCount}} <span class="right enable_text_select">{{output.recipientCount}}

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

@ -30,6 +30,10 @@
<span class="text-gray" translate>Fee</span>: <span class="text-gray" translate>Fee</span>:
<span class="right">{{feeStr}}</span> <span class="right">{{feeStr}}</span>
</li> </li>
<li class="line-b p10">
<span class="text-gray" translate>Spend Unconfirmed Transactions</span>:
<span class="right">{{(tx.excludeUnconfirmedUtxos ? 'No' : 'Yes')|translate}}</span>
</li>
<li class="line-b p10"> <li class="line-b p10">
<span class="text-gray" translate>Time</span>: <span class="text-gray" translate>Time</span>:
<span class="right"> <span class="right">

34
public/views/walletHome.html
View file

@ -418,29 +418,29 @@
</div> </div>
</div> </div>
<div ng-init="home.hideAdvSend=true"> <div class="m20b" ng-init="home.hideAdvSend=true">
<a class="button outline light-gray expand tiny" ng-click="home.hideAdvSend=!home.hideAdvSend"> <a class="button outline light-gray expand tiny m0" ng-click="home.hideAdvSend=!home.hideAdvSend">
<i class="fi-widget m3r"></i> <i class="fi-widget m3r"></i>
<span translate ng-hide="!home.hideAdvSend">Show Advanced options</span> <span translate ng-hide="!home.hideAdvSend">Show Advanced options</span>
<span translate ng-hide="home.hideAdvSend">Hide Advanced options</span> <span translate ng-hide="home.hideAdvSend">Hide Advanced options</span>
<i ng-if="home.hideAdvSend" class="icon-arrow-down4"></i> <i ng-if="home.hideAdvSend" class="icon-arrow-down4"></i>
<i ng-if="!home.hideAdvSend" class="icon-arrow-up4"></i> <i ng-if="!home.hideAdvSend" class="icon-arrow-up4"></i>
</a> </a>
</div> <div class="m10t" ng-hide="home.hideAdvSend">
<div class="m20b" ng-hide="home.hideAdvSend"> <h4 class="title m0" translate>Fee policy for this transaction</h4>
<h4 class="title m0" translate>Fee policy for this transaction</h4> <ul class="no-bullet m0 size-14">
<ul class="no-bullet m0 size-14"> <li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
<li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)" ng-click="home.currentSendFeeLevel = fee.level" class="line-b p20">
ng-click="home.currentSendFeeLevel = fee.level" class="line-b p20"> {{index.feeOpts[fee.level]|translate}}
{{index.feeOpts[fee.level]|translate}} <i class="fi-check size-16 right"
<i class="fi-check size-16 right" ng-show="(home.currentSendFeeLevel || index.currentFeeLevel) == fee.level"></i>
ng-show="(home.currentSendFeeLevel || index.currentFeeLevel) == fee.level"></i> </li>
</li> </ul>
</ul> <h4 class="title m0" translate>Unconfirmed transactions for this transaction</h4>
<h4 class="title m0" translate>Spend unconfirmed transaction</h4> <div class="p20 line-b">
<div class="p20 line-b"> <span class="size-14" translate>Spend Unconfirmed Transactions</span>
<span class="size-14" translate>Use unconfirmed in this transaction</span> <switch id="spend-unconfirmed" name="currentSpendUnconfirmed" ng-model="currentSpendUnconfirmed" class="green right"></switch>
<switch id="spend-unconfirmed" name="currentSpendUnconfirmed" ng-model="currentSpendUnconfirmed" class="green right"></switch> </div>
</div> </div>
</div> </div>