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

change confirmation and alert modal for confirmation ionic popup

Browse source
This commit is contained in:
Gabriel Bazán 2016-06-04 15:19:42 -03:00 • committed by Javier
commit 8c16460d29
8 changed files with 108 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/index.html
View file

@ -27,8 +27,6 @@
<ion-side-menu-content>
<div notifications="right top"></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"

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

@ -1,14 +1,9 @@
<div class="modalMask">
</div>
<div class="alertModal">
<div class="columns m20t">
<div class="m20t size-14 text-center">
<i class="fi-alert"></i>
{{index.showAlert.msg|translate}}
</div>
<div class="text-center m20t" ng-click="index.showAlert.close()">
<a class="button outline light-gray round tiny small-4">OK</a>
</div>
<div class="columns m20t">
<div class="m20t size-14 text-center">
<i class="fi-alert"></i>
{{msg|translate}}
</div>
</div>
<div class="text-center m20t" ng-click="close()">
<a class="button outline light-gray round tiny small-4">OK</a>
</div>
</div>

74
public/views/includes/confirm-tx.html
View file

@ -1,47 +1,39 @@
<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>Send bitcoin</h1>
<div class="m20t">
<label class="size-14 text-center">
<span translate>Send bitcoin</span>
</label>
</div>
<div class="text-center">
<div class="size-36">{{tx.amountStr}}</div>
<div class="size-12 label gray radius" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
<i class="db fi-arrow-down size-24 m10v"></i>
<div class="payment-proposal-to" ng-click="copyToClipboard(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="p10">
<div class="size-36">{{tx.amountStr}}</div>
<div class="size-12 label gray radius" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
<i class="db fi-arrow-down size-24 m10v"></i>
<div class="payment-proposal-to" ng-click="copyToClipboard(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 class="m10t size-12" ng-init="processFee(tx.amount, tx.fee)">
<div ng-show="!showPercentage" ng-click="showPercentage = true">
<span translate>Fee</span> <span class="tl">({{feeLevel|translate}})</span>:
<span class="text-bold">{{tx.feeStr}}</span>
<span class="label gray radius">{{feeAlternativeStr}}</span>
</div>
<div class="m10t size-12" ng-init="confirm.processFee(tx.amount, tx.fee)">
<div ng-show="!showPercentage" ng-click="showPercentage = true">
<span translate>Fee</span> <span class="tl">({{confirm.feeLevel|translate}})</span>:
<span class="text-bold">{{tx.feeStr}}</span>
<span class="label gray radius">{{confirm.feeAlternativeStr}}</span>
</div>
<div ng-show="showPercentage" ng-click="showPercentage = false" translate>
{{confirm.feeRateStr}} of the transaction
</div>
<div ng-show="showPercentage" ng-click="showPercentage = false" translate>
{{feeRateStr}} of the transaction
</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>
Confirm
</button>
</div>
</div>
<div class="row m20t dib">
<div class="half-row left">
<button ng-click="cancel()" class="round outline dark-gray expand">
<span class="size-12" translate>Cancel</span>
</button>
</div>
<div class="half-row left">
<button ng-click="accept()" class="round expand" ng-style="{'background-color':index.backgroundColor}" translate>
<span class="size-12" translate>Confirm</span>
</button>
</div>
</div>
</div>

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

@ -10,7 +10,7 @@
<div class="input m20t">
<input type="password" placeholder="{{'Your spending password'|translate}}"
id="passwordInput" name="password" ng-model="data.password">
id="passwordInput" name="password" ng-model="data.password" autofocus>
</div>
</div>
<div class="row">
@ -18,8 +18,8 @@
<button
class="round small-6 columns outline dark-gray expand"
ng-click="cancel()"
ng-disabled="loading" translate>
CANCEL
ng-disabled="loading">
<span class="size-12" translate>CANCEL</span>
</button>
</div>
@ -28,8 +28,8 @@
ng-click="set()"
ng-disabled="!data.password || loading"
ng-style="{'background-color':index.backgroundColor}">
<span ng-if="isSetup" translate>SET</span>
<span ng-if="!isSetup">OK</span>
<span ng-if="isSetup" class="size-12" translate>SET</span>
<span ng-if="!isSetup" class="size-12">OK</span>
</button>
</div>
</div>