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

Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into feature/new-qrscanner-permissions

Browse source
This commit is contained in:
Jason Dreyzehner 2016-10-11 03:15:07 -04:00
commit f1a849c5d8
36 changed files with 344 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

15
www/views/modals/receive-tips.html
View file

@ -1,15 +0,0 @@
<ion-modal-view ng-style="{opacity: '0.9'}" ng-controller="receiveTipsController">
<ion-nav-bar class="bar-ligt">
<ion-nav-buttons side="secondary">
<button class="button" ng-click="close()">
X
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div class="text-center">
<h2>Receive bitcoin by sharing your address</h2>
<h3>Other bitcoin users can scan this code to send you money</h3>
</div>
</ion-content>
</ion-modal-view>

15
www/views/modals/scan-tips.html
View file

@ -1,15 +0,0 @@
<ion-modal-view ng-style="{opacity: '0.9'}" ng-controller="scanTipsController">
<ion-nav-bar class="bar-ligt">
<ion-nav-buttons side="secondary">
<button class="button" ng-click="close()">
X
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div class="text-center">
<h2>Scan the code to pay with bitcoin</h2>
<h3>QR codes could also contain a bitcoin wallet invitation, or an URL</h3>
</div>
</ion-content>
</ion-modal-view>

24
www/views/modals/tx-status.html
View file

@ -1,15 +1,17 @@
<ion-modal-view id="tx-status" ng-controller="txStatusController">
<div ng-if="type == 'broadcasted'" class="popup-txsent text-center m30tp">
<i class="icon ion-checkmark-round"></i>
<div ng-show="tx.amountStr" class="m20t size-36">
{{tx.amountStr}}
</div>
<div class="size-24 text-gray m20v">
<span ng-if="!fromBitPayCard" translate>Sent</span>
<span ng-if="fromBitPayCard" translate>Funds sent</span>
</div>
<div class="text-center m20t" ng-if="entryExist || !fromSendTab || fromPayPro">
<a class="button button-positive" ng-click="cancel()" translate>OKAY</a>
<div ng-if="type == 'broadcasted'">
<div class="popup-txsent text-center m30tp">
<i class="icon ion-checkmark-round"></i>
<div ng-show="tx.amountStr" class="m20t size-36">
{{tx.amountStr}}
</div>
<div class="size-24 text-gray m20v">
<span ng-if="!fromBitPayCard" translate>Sent</span>
<span ng-if="fromBitPayCard" translate>Funds sent</span>
</div>
<div class="text-center m20t" ng-if="entryExist || !fromSendTab || fromPayPro">
<a class="button button-positive" ng-click="cancel()" translate>OKAY</a>
</div>
</div>
<div class="collect-address" ng-if="!entryExist && fromSendTab && !fromPayPro">
<div class="row">