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

Merge pull request #3795 from cmgustavo/feat/send-confirmation-popup

Browse source 
Send confirmation popup
This commit is contained in:
Matias Alejo Garcia 2016-02-11 14:14:42 -05:00
commit bcde97727e
14 changed files with 237 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

1
public/index.html
View file

@ -27,6 +27,7 @@
<div notifications="right top"></div>
<div ng-include="'views/includes/password.html'" ng-if="index.askPassword"></div>
<div ng-include="'views/includes/alert.html'" ng-if="index.showAlert"></div>
<div ng-include="'views/includes/confirm-tx.html'" ng-if="index.confirmTx"></div>
<div id="sectionContainer">
<div id="mainSection">
<section ui-view="main"

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

@ -1,4 +1,4 @@
<div class="passModalMask">
<div class="modalMask">
</div>
<div class="alertModal">

40
public/views/includes/confirm-tx.html Normal file
View file

@ -0,0 +1,40 @@
<div class="modalMask"></div>
<div class="confirmTxModal" ng-controller="confirmTxController as confirm" ng-init="tx = index.confirmTx.txp">
<div class="confirmHead" ng-style="{'background-color':index.backgroundColor}">
<h1 class="m0 text-center text-white size-18" translate>Confirm transaction</h1>
</div>
<div class="p10">
<div class="size-36">{{tx.amountStr}}</div>
<div class="size-14 text-light" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
<i class="db fi-arrow-down size-24 m10v"></i>
<div class="payment-proposal-to" ng-click="copyAddress(tx.toAddress)">
<i class="fi-bitcoin left m10l"></i>
<contact ng-if="!tx.hasMultiplesOutputs" class="dib enable_text_select ellipsis m5t m5b m15l size-14" address="{{tx.toAddress}}"></contact>
<span ng-if="tx.hasMultiplesOutputs" translate>
Multiple recipients
</span>
</div>
<div class="text-bold m10t size-12">
<span translate>Fee</span>: {{tx.feeStr}}
</div>
<div class="row m20t">
<div class="large-6 medium-6 small-6 columns">
<button
ng-click="confirm.close(index.confirmTx.callback)"
class="small m10b round outline dark-gray expand" translate>
Cancel
</button>
</div>
<div class="large-6 medium-6 small-6 columns">
<button
ng-click="confirm.accept(index.confirmTx.callback)"
class="small m10b round expand"
ng-style="{'background-color':index.backgroundColor}" translate>
Accept
</button>
</div>
</div>
</div>
</div>

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

@ -1,5 +1,5 @@
<div class="passModalMask">
<div class="modalMask">
</div>
<div ng-controller="passwordController as pass" class="passModal"

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

@ -31,17 +31,19 @@
</div>
<div class="oh">
<div class="box-notification m20t" ng-show="error">
<div class="box-notification" ng-show="error">
<span class="text-warning size-14">
{{error|translate}}
</span>
</div>
<div class="row column m20t text-center text-warning size-12" ng-if="tx.removed" translate>
The payment was removed by creator
<div class="row" ng-if="tx.removed">
<div class="column m20t text-center text-warning size-12" translate>
The payment was removed by creator
</div>
</div>
<div class="oh p20t white" ng-if="tx.pendingForUs">
<div class="row p20t white" ng-if="tx.pendingForUs">
<div class="large-6 medium-6 small-6 columns" ng-show="isShared">
<button class="button outline round dark-gray expand" ng-click="reject(tx);"
ng-disabled="loading">