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

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book

Browse source
This commit is contained in:
Jamal Jackson 2016-09-23 11:30:56 -04:00
commit 6e23e35171
10 changed files with 71 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/amount.html
View file

@ -41,7 +41,7 @@
<div class="keypad">
<div class="row">
<div class="col col-25 col-offset-75 operator-send"
ng-hide="alternativeResult <= 0 && amountResult <= 0" ng-click="finish()">
ng-show="amount > 0 || alternativeResult > 0 || amountResult > 0" ng-click="finish()">
<i class="icon ion-ios-arrow-thin-right"></i>
</div>
</div>

4
public/views/confirm.html
View file

@ -51,7 +51,7 @@
<i ng-show="!description" class="icon ion-ios-plus-empty size-21"></i>
</div>
</div>
<button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button>
<button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
</ion-content>
<accept class="accept-slide" ng-if="isCordova && fee"></accept>
<accept class="accept-slide" ng-if="isCordova"></accept>
</ion-view>

8
public/views/includes/acceptSlide.html
View file

@ -1,7 +1,9 @@
<ion-slides options="{loop: false, effect: 'flip', speed: 500, pagination: false, initialSlide: 1}" slider="data.slider">
<ion-slide-page></ion-slide-page>
<ion-slide-page>
</ion-slide-page>
<ion-slide-page>
<div><h1>Slide to accept</h1><i class="icon-arrow-right3 size-24 right"></i></div>
<div>
<i class="icon ion-ios-arrow-thin-right"></i>
<span translate>Slide to accept</span>
</div>
</ion-slide-page>
</ion-slides>

33
public/views/tab-settings.html
View file

@ -50,21 +50,6 @@
<i class="icon nav-item-arrow-right"></i>
</a>
<div ng-show="usePushNotifications && PNEnabledByUser">
<div class="item item-divider" translate>Notifications</div>
<ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
<span class="toggle-label" translate>Enable push notifications</span>
</ion-toggle>
<div ng-show="usePushNotifications && !PNEnabledByUser && isIOSApp">
<div translate>Push notifications for Copay are currently disabled. Enable them in the Settings app.</div>
<ul ng-click="openSettings()">
<li translate>Open Settings app</li>
</ul>
</div>
</div>
<div class="item item-divider" translate>Exchanges</div>
<ion-toggle ng-show="!isWP" ng-model="glideraEnabled.value" toggle-class="toggle-balanced" ng-change="glideraChange()">
@ -84,6 +69,24 @@
<span class="toggle-label" translate>Use Unconfirmed Funds</span>
</ion-toggle>
<div ng-show="usePushNotifications && PNEnabledByUser">
<div class="item item-divider" translate>Notifications</div>
<ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
<span class="toggle-label" translate>Enable push notifications</span>
</ion-toggle>
</div>
<div ng-show="usePushNotifications && !PNEnabledByUser && isIOSApp">
<div class="item item-divider" translate>Notifications</div>
<div class="padding text-light" translate>
Push notifications for Copay are currently disabled. Enable them in the Settings app.
</div>
<a class="item" ng-click="openSettings()">
<span translate>Open Settings app</span>
</a>
</div>
<div class="item item-divider" translate>Wallets Preferences</div>
<a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences({'walletId': item.id})"