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_push_notifications

Browse source 
# Conflicts:
#	public/views/onboarding/notifications.html
#	src/js/controllers/onboarding/collectEmail.js
This commit is contained in:
Jamal Jackson 2016-09-14 11:42:33 -04:00
commit fdb5e467b9
28 changed files with 150 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

7
public/views/addressbook.html
View file

@ -29,10 +29,11 @@
<ion-list>
<ion-item ng-repeat="addrEntry in addressbook"
class="item-icon-left item-icon-right"
class="item-icon-right item-avatar"
ui-sref="tabs.addressbook.view({address:addrEntry.address})">
<i class="icon ion-ios-person-outline"></i>
{{addrEntry.name}}
<gravatar name="{{addrEntry.name}}" width="50" email="{{addrEntry.email}}"></gravatar>
<h2>{{addrEntry.name}}</h2>
<p>{{addrEntry.address}}</p>
<i class="icon nav-item-arrow-right"></i>
<ion-option-button class="button-assertive" ng-click="remove(addrEntry.address)">

4
public/views/addressbook.view.html
View file

@ -12,6 +12,10 @@
<ion-content>
<div class="gravatar-content">
<gravatar name="{{addressbookEntry.name}}" width="80" email="{{addressbookEntry.email}}"></gravatar>
</div>
<div class="card">
<div class="item item-text-wrap">
<h3 translate>Name</h3>

2
public/views/amount.html
View file

@ -13,7 +13,7 @@
<div class="item item-no-bottom-border" translate>Recipient</div>
<div class="item item-text-wrap item-icon-left bitcoin-address">
<i class="icon ion-ios-person-outline"></i>
<gravatar class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
<span>{{toName || toAddress}}</span>
</div>
</div>

4
public/views/confirm.html
View file

@ -1,4 +1,4 @@
<ion-view>
<ion-view id="view-confirm">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
@ -23,7 +23,7 @@
</div>
<div class="item item-icon-left">
<i class="icon ion-ios-person-outline"></i>
<gravatar class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
<label translate>To</label> {{toAddress}}
<p ng-show="toName">{{toName}}</p>

2
public/views/onboarding/backupRequest.html
View file

@ -1,5 +1,5 @@
<ion-view id="onboarding-backup-request" class="onboarding">
<ion-content ng-controller="backupRequestController">
<ion-content ng-controller="backupRequestController" scroll="false">
<div class="row">
<img src="img/onboarding-warning.svg" class="col col-75 warning">
</div>

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

@ -6,7 +6,7 @@
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
<ion-content scroll="false">
<div class="row text-center">
<h3 translate class="col col-80">
Are you being watched?

2
public/views/onboarding/collectEmail.html
View file

@ -40,7 +40,7 @@
</div>
</div>
<div class="overlay collect-overlay">
<button class="button button-stable button-clear" ng-click="onboardingMailSkip()">
<button class="button button-stable button-clear" ng-click="goNextView()">
{{'Skip' | translate}}
</button>
</div>

2
public/views/onboarding/disclaimer.html
View file

@ -1,5 +1,5 @@
<ion-view id="onboarding-disclaimer" class="onboarding">
<ion-content ng-controller="disclaimerController" ng-init=init()>
<ion-content ng-controller="disclaimerController" ng-init=init() scroll="false">
<div class="row text-center">
<h3 translate class="col-75 col">Almost done! Let's review</h3>
</div>

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

@ -14,7 +14,7 @@
</ion-nav-bar>
<ion-slides class="slides" options="options" slider="data.slider">
<ion-slide-page>
<ion-content id="onboard-tour-secure">
<ion-content id="onboard-tour-secure" scroll="false">
<div class="text-center row">
<h2 class="col col-60" translate>Bitcoin is secure, digital money</h2>
</div>
@ -38,7 +38,7 @@
</ion-content>
</ion-slide-page>
<ion-slide-page>
<ion-content id="onboard-tour-currency">
<ion-content id="onboard-tour-currency" scroll="false">
<div class="text-center row">
<h2 class="col col-75" translate>Bitcoin is a currency</h2>
</div>
@ -62,7 +62,7 @@
</ion-content>
</ion-slide-page>
<ion-slide-page>
<ion-content id="onboard-tour-control">
<ion-content id="onboard-tour-control" scroll="false">
<div class="text-center row">
<h2 translate class="col col-75">You control your bitcoin</h2>
</div>

2
public/views/onboarding/welcome.html
View file

@ -1,5 +1,5 @@
<ion-view id="onboard-welcome" class="onboarding">
<ion-content ng-controller="welcomeController" ng-init="createProfile()">
<ion-content ng-controller="welcomeController" ng-init="createProfile()" scroll="false">
<qr-scanner id="shopping-24" on-scan="goImport(data)"></qr-scanner>
<article id="logo-tagline">
<div class="row text-center">

2
public/views/tab-send.html
View file

@ -24,7 +24,7 @@
<div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div>
<a class="item item-icon-left" ng-repeat="item in list" ng-click="goToAmount(item)">
<i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
<i ng-show="!item.isWallet" class="icon ion-ios-person-outline"></i>
<gravatar class="send-gravatar" ng-show="!item.isWallet" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
{{item.name}}
</a>
</div>