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/onboarding_screenshot_warning_model

Browse source
This commit is contained in:
Jamal Jackson 2016-09-15 09:37:36 -04:00
commit be58b7983d
38 changed files with 393 additions and 75 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-disabled="alternativeResult <= 0 && amountResult <= 0" ng-click="finish()">
ng-hide="alternativeResult <= 0 && amountResult <= 0" ng-click="finish()">
<i class="icon ion-ios-arrow-thin-right"></i>
</div>
</div>

16
public/views/backup.html
View file

@ -1,11 +1,13 @@
<ion-view id="wallet-backup-phrase" title="{{viewTitle}}" ng-controller="backupController" ng-init="init()">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-buttons side="primary">
<button class="button button-back button-clear" ng-click="backupGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
<div ng-show="deleted">
<div class="ng-hide" ng-show="deleted">
<div class="row text-center">
<h3 translate class="col col-75 center-block">Wallet recovery phrase not available.</h3>
</div>
@ -18,7 +20,7 @@
<!--
## STEP 1
-->
<div ng-show="step == 1 && (mnemonicWords || (!credentialsEncrypted && !deleted))">
<div class="ng-hide" ng-show="step == 1 && (mnemonicWords || (!credentialsEncrypted && !deleted))">
<div class="backup-phrase" ng-class="{'enable_text_select': wallet.network == 'testnet'}">
<span ng-repeat="word in mnemonicWords track by $index"><span style="white-space:nowrap">{{word}}</span><span ng-show="useIdeograms">&#x3000;</span> </span>
</div>
@ -42,7 +44,7 @@
<!--
## STEP 2
-->
<div ng-show="step == 2">
<div class="ng-hide" ng-show="step == 2">
<div class="backup-phrase">
<span ng-repeat="cword in customWords track by $index" ng-show="customWords[$index]">
<button class="button select-word" ng-click="removeButton($index, cword)">{{cword.word}}</button>
@ -63,7 +65,7 @@
<!--
## STEP 3
-->
<div ng-show="step == 3">
<div class="ng-hide" ng-show="step == 3">
<h5 translate>Enter your password</h5>
<label class="item item-input item-stacked-label">
<span class="input-label" transalate>In order to verify your wallet backup, please type your password:</span>

10
public/views/buyAmazon.html
View file

@ -33,7 +33,7 @@
<form class="m20t"
name="buyAmazonForm"
ng-submit="buy.createTx()"
ng-submit="buy.confirm()"
novalidate>
<div class="card list">
@ -46,17 +46,17 @@
min="0.01"
max="500"
ng-model="fiat"
ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/"
autocomplete="off" ignore-mouse-wheel required>
<a class="postfix">USD</a>
</label>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
<button class="button button-block button-positive"
ng-disabled="!fiat"
type="submit"
value="Buy now">
type="submit">
Buy now
</button>
<div class="size-10 text-gray text-center">

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

@ -1,7 +1,7 @@
<div>
<h1 translate>Screenshots are not secure</h1>
<span translate>if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen.</span>
<button ng-click="close()" class="button button-block no-border" translate>
<button ng-click="close()" class="button button-block button-clear" translate>
Got it
</button>
</div>

4
public/views/includes/wallets.html
View file

@ -4,8 +4,8 @@
<div class="card">
<div class="item item-icon-left text-right">
<i class="icon ion-briefcase size-21" ng-style="{'color':wallet.color}"></i>
<span>{{wallet.name || wallet.id}}</span>
<span class="item-note" ng-show="wallet.n > 1 && wallet.isComplete()">
<span>{{wallet.name || wallet.id}}</span>
<span class="item-note m10l" ng-show="wallet.n > 1 && wallet.isComplete()">
{{wallet.m}}-of-{{wallet.n}}
</span>
<span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>

10
public/views/modals/terms.html
View file

@ -7,14 +7,12 @@
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div ng-include="'views/includes/terms.html'"></div>
<div class="padding-vertical" ng-show="lang != 'en'">
<a ng-click="openExternalLink(disclaimerUrl)" translate>Official English Disclaimer</a>
</div>
<ion-content class="has-header" scroll="false">
<ion-scroll ng-include="'views/includes/terms.html'" ng-style="{'height': '60%'}"></ion-scroll>
<div id="agree-to-terms">
<a ng-click="openExternalLink('https://copay.io/disclaimer')" ng-show="lang != 'en'" translate>Official English Disclaimer</a>
<ion-checkbox ng-model="terms.accept3"></ion-checkbox>
<p translate>I have read, understood, and agree with the <a ui-sref="onboarding.terms">Terms of use</a>.</p>
<p translate>I have read, understood, and agree with the Terms of use.</p>
<button ng-disabled="!terms.accept3" class="button button-block button-positive" ng-click="termsModal.hide(); confirm()" translate>Confirm & Finish</button>
</div>
</ion-content>

4
public/views/onboarding/backupWarning.html
View file

@ -1,7 +1,7 @@
<ion-view id="onboarding-backup-warning" class="onboarding" ng-controller="backupWarningController">
<ion-nav-bar>
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button button-back no-border" href ui-sref="onboarding.backupRequest({walletId: walletId})">
<button class="button button-back button-clear" href ui-sref="onboarding.backupRequest({walletId: walletId})">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>

27
public/views/onboarding/notifications.html
View file

@ -1,16 +1,21 @@
<ion-view>
<ion-content ng-controller="notificationsController" scroll="false">
<div class="text-center">
<h1 translate>
<ion-view class="onboarding" id="onboarding-push-notifications">
<ion-content ng-controller="notificationsController">
<div class="text-center row">
<h2 translate class="col col-80">
Push Notifications
</h1>
<span translate>
</h2>
</div>
<div class="row text-center">
<p class="col col-75 tagline" translate>
Would you like to receive push notifications about payments?
</span>
<button class="button button-block button-positive" ng-click="allowNotif()" translate>Allow notifications</button>
<button class="button button-block button-light" href ui-sref="onboarding.backupRequest({walletId: walletId})" translate>Not now</button>
</p>
</div>
<div id="cta">
</div>
<div class="cta-buttons">
<button class="button button-block button-primary col col-75" ng-click="allowNotif()" translate>Allow notifications</button>
<button class="button button-block button-translucent col col-75" href ui-sref="onboarding.backupRequest({walletId: walletId})" translate>Not now</button>
</div>
</div>
</ion-content>
</ion-view>

8
public/views/onboarding/tour.html
View file

@ -2,12 +2,12 @@
<ion-nav-bar class="bar-stable">
<ion-nav-title></ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button back-button no-border" ng-click="goBack()">
<button class="button back-button button-clear" ng-click="goBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-buttons side="secondary">
<button class="button back-button no-border" ng-show="data.index == 0" ng-click="createDefaultWallet()">
<button class="button back-button button-clear" ng-show="data.index == 0" ng-click="createDefaultWallet()">
{{'Skip' | translate}}
</button>
</ion-nav-buttons>
@ -31,7 +31,7 @@
</p>
</div>
<div class="row cta-button">
<button class="button button-positive col col-75 next-slide" ng-click="slideNext()">
<button class="button button-positive col col-75 next-slide button-translucent" ng-click="slideNext()">
Got it <i class="icon ion-ios-arrow-thin-right"></i>
</button>
</div>
@ -55,7 +55,7 @@
</p>
</div>
<div class="row cta-button">
<button class="button button-positive col col-75 next-slide" ng-click="slideNext()">
<button class="button button-positive col col-75 next-slide button-translucent" ng-click="slideNext()">
Makes sense <i class="icon ion-ios-arrow-thin-right"></i>
</button>
</div>

6
public/views/tab-receive.html
View file

@ -1,13 +1,13 @@
<ion-view id="tab-receive">
<ion-view id="tab-receive" ng-controller="tabReceiveController" ng-init="init()">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
<ion-nav-buttons side="secondary">
<button class="no-border">
<button class="button button-clear" ng-click="checkTips(true)">
<i class="ion-help-circled"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content ng-controller="tabReceiveController" ng-init="init()">
<ion-content>
<article id="address">
<div class="row">
<div class="m15t text-center col col-60 center-block" copy-to-clipboard="addr">

10
public/views/tabs.html
View file

@ -5,11 +5,11 @@ navigation history that also transitions its views in and out.
-->
<ion-tabs class="tabs-icon-top tabs-color-active-positive" ng-controller="tabsController">
<ion-tab title="Home" icon-off="ion-ios-pulse" icon-on="ion-ios-pulse-strong" href="#/tabs/home">
<ion-tab title="Home" icon-off="ico-home" icon-on="ico-home-selected" href="#/tabs/home">
<ion-nav-view name="tab-home"></ion-nav-view>
</ion-tab>
<ion-tab title="Receive" icon-off="ion-ios-chatboxes-outline" icon-on="ion-ios-chatboxes" href="#/tabs/receive">
<ion-tab title="Receive" icon-off="ico-receive" icon-on="ico-receive-selected" href="#/tabs/receive">
<ion-nav-view name="tab-receive"></ion-nav-view>
</ion-tab>
@ -18,14 +18,14 @@ navigation history that also transitions its views in and out.
<qr-scanner class="qr-icon size-24" style="display:none" set-fn="setScanFn(theScanFn)" on-scan="onScan(data)"></qr-scanner>
<ion-tab title="Scan" icon-off="ion-ios-camera" ng-click="scan()" >
<ion-tab title="Scan" icon-off="ico-scan" ng-click="scan()" >
</ion-tab>
<ion-tab title="Send" icon-off="ion-ios-chatboxes-outline" icon-on="ion-ios-chatboxes" href="#/tabs/send">
<ion-tab title="Send" icon-off="ico-send" icon-on="ico-send-selected" href="#/tabs/send">
<ion-nav-view name="tab-send"></ion-nav-view>
</ion-tab>
<ion-tab title="Settings" icon-off="ion-ios-gear-outline" icon-on="ion-ios-gear" href="#/tabs/settings">
<ion-tab title="Settings" icon-off="ico-settings" icon-on="ico-settings-selected" href="#/tabs/settings">
<ion-nav-view name="tab-settings"></ion-nav-view>
</ion-tab>
</ion-tabs>