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_wallet_created

Browse source 
# Conflicts:
#	public/views/onboarding/backupWarning.html
#	src/sass/common.scss
This commit is contained in:
Jamal Jackson 2016-09-02 06:57:50 -04:00
commit ee7bb0f455
96 changed files with 610 additions and 607 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/activity.html
View file

@ -1,10 +1,10 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>Recent Activity</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
<span translate>Close</span>
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

26
public/views/add.html
View file

@ -1,29 +1,29 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-view id="view-add">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
<ion-list>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create.personal">
<a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create.personal">
<h2 translate>Create new wallet</h2>
<i class="icon ion-chevron-right icon-accessory"></i>
</ion-item>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.join">
<a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.join">
<h2 translate>Join shared wallet</h2>
<i class="icon ion-chevron-right icon-accessory"></i>
</ion-item>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.import.phrase">
<a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.import.phrase">
<h2 translate>Import wallet</h2>
<i class="icon ion-chevron-right icon-accessory"></i>
</ion-item>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>
</ion-list>
</ion-content>

7
public/views/amazon.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Gift cards</ion-nav-title>
@ -65,4 +65,3 @@
</div>
</ion-content>
</ion-view>

6
public/views/amount.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ng-click="$ionicGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ng-click="$ionicGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

4
public/views/backup.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

13
public/views/bitpayCard.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>BitPay Card</ion-nav-title>
@ -38,7 +38,7 @@
ng-submit="bitpayCard.authenticate()"
novalidate>
<div class="list">
<div class="card list">
<label class="item item-input item-stacked-label">
<span class="input-label">Email</span>
<input name="email"
@ -58,7 +58,7 @@
</label>
</div>
<input class="button button-block"
<input class="button button-block button-positive"
type="submit"
ng-disabled="!authenticateForm.$valid || bitpayCard.authenticating"
value="Login">
@ -85,7 +85,7 @@
</label>
</div>
<input class="button button-block"
<input class="button button-block button-positive"
type="submit"
ng-disabled="!authenticate2FAForm.$valid || bitpayCard.authenticating"
value="Login">
@ -216,4 +216,3 @@
</div>
</ion-content>
</ion-view>

7
public/views/buyAmazon.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="amazon.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="amazon.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Buy</ion-nav-title>
@ -154,4 +154,3 @@
</ion-content>
</ion-view>

6
public/views/buyGlidera.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="glidera.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="glidera.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Buy</ion-nav-title>

6
public/views/buyandsell.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title translate>Buy and sell</ion-nav-title>

4
public/views/confirm.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

6
public/views/copayers.html
View file

@ -1,10 +1,10 @@
<ion-view ng-controller="copayersController">
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{wallet.name}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button" href ui-sref="tabs.home">
<i class="ion-arrow-left-c"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

10
public/views/glidera.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Glidera</ion-nav-title>
@ -10,6 +10,10 @@
<ion-content ng-controller="glideraController as glidera" ng-init="init()">
<div class="box-notification error" ng-show="!network">
Glidera is disabled for this application
</div>
<div class="box-notification warning" ng-show="network == 'testnet'">
Testnet wallets only work with Glidera Sandbox Accounts
</div>

6
public/views/glideraUri.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Glidera</ion-nav-title>

36
public/views/import.html
View file

@ -1,17 +1,33 @@
<ion-view >
<ion-view ng-controller="tabsController" ng-init="importInit()">
<ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
<ion-tab title="Recovery Phrare" ui-sref="tabs.import.phrase">
<ion-nav-view name="tab-import-phrase"></ion-nav-view>
</ion-tab>
<div ng-if="!fromOnboarding">
<ion-tab title="Recovery Phrase" ui-sref="tabs.import.phrase">
<ion-nav-view name="tab-import-phrase"></ion-nav-view>
</ion-tab>
<ion-tab title="File/Text" ui-sref="tabs.import.file">
<ion-nav-view name="tab-import-file"></ion-nav-view>
</ion-tab>
<ion-tab title="File/Text" ui-sref="tabs.import.file">
<ion-nav-view name="tab-import-file"></ion-nav-view>
</ion-tab>
<ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
<ion-nav-view name="tab-import-hardware"></ion-nav-view>
</ion-tab>
<ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
<ion-nav-view name="tab-import-hardware"></ion-nav-view>
</ion-tab>
</div>
<div ng-if="fromOnboarding">
<ion-tab title="Recovery Phrase" ui-sref="onboarding.import.phrase">
<ion-nav-view name="tab-import-phrase"></ion-nav-view>
</ion-tab>
<ion-tab title="File/Text" ui-sref="onboarding.import.file">
<ion-nav-view name="tab-import-file"></ion-nav-view>
</ion-tab>
<ion-tab title="Hardware Wallet" ui-sref="onboarding.import.hardware">
<ion-nav-view name="tab-import-hardware"></ion-nav-view>
</ion-tab>
</div>
</ion-tabs>
</ion-view>

52
public/views/includes/walletActivity.html
View file

@ -1,14 +1,14 @@
<span class="wallet-activity">
<div ng-if="x.types.indexOf('NewCopayer')>=0 && x.wallet.n>1">
<div ng-if="x.type == 'NewCopayer' && x.wallet.n>1">
Copayer joined
</div>
<div ng-if="x.types.indexOf('NewCopayer')>=0 && x.wallet.n==1">
<div ng-if="x.type == 'NewCopayer' && x.wallet.n==1">
Wallet created
</div>
<div ng-if="x.types.indexOf('NewOutgoingTx')>=0">
<div ng-if="x.type == 'NewOutgoingTx'">
<span translate>Payment Sent </span>
<div class="wallet-activity-amount">
{{x.amountStr}}
@ -17,36 +17,48 @@
<div ng-if="x.types.indexOf('NewIncomingTx')>=0">
<div ng-if="x.type == 'NewIncomingTx'">
<span translate>Payment Received</span>
<div class="wallet-activity-amount">
{{x.amountStr}}
</div>
</div>
<div ng-if="x.types.indexOf('TxProposalRemoved')>=0">
<div ng-if="x.type == 'TxProposalRemoved'">
<i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
<span translate>Proposal Deleted</span>
<span translate>Proposal Deleted</span>:
<i>{{x.message}}</i>
<div class="wallet-activity-amount">
{{x.amountStr}}:
</div>
</div>
<div ng-if="x.types.indexOf('TxProposalRejected')>=0">
<div ng-if="x.type == 'TxProposalRejected'">
<i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
<span translate>Proposal Rejected</span>
<span translate>Proposal Rejected</span>:
<i>{{x.message}}</i>
<div class="wallet-activity-amount">
{{x.amountStr}}:
</div>
</div>
<div ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
<span ng-if="x.types.indexOf('NewTxProposal')>=0 && x.types.indexOf('NewOutgoingTx')==-1 ">
<i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
{{x.amountStr}}
<i>{{x.message}}</i>
</span>
<span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1 && x.types.indexOf('NewOutgoingTx')==-1">
<i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
<span translate>Proposal Accepted</span>
</span>
</div>
<span ng-if="x.type == 'NewTxProposal'">
<i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
<span translate>New Proposal</span>:
<i>{{x.message}}</i>
<div class="wallet-activity-amount">
{{x.amountStr}}
</div>
</span>
<span ng-if="x.type == 'TxProposalAcceptedBy'">
<i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
<span translate>Proposal Accepted</span>
<i>{{x.message}}</i>
<div class="wallet-activity-amount">
{{x.amountStr}}
</div>
</span>
<p class="wallet-activity-note">
<!-- {{x.types}} -->

12
public/views/join.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.add">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Join shared wallet' | translate}}</ion-nav-title>
@ -11,13 +11,9 @@
<ion-content ng-controller="joinController as join">
<div class="padding assertive" ng-show="join.error">
{{join.error|translate}}
</div>
<form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
<div class="list">
<div class="card list">
<div class="row">
<div class="col">

7
public/views/modals/addressbook.html
View file

@ -1,8 +1,7 @@
<ion-modal-view ng-controller="addressbookModalController" ng-init="initAddressbook()">
<ion-header-bar align-title="center" class="bar-stable">
<button class="button button-clear button-positive"
ng-click="closeAddressbookModal()" translate>
Close
<ion-header-bar align-title="center" class="bar-royal">
<button class="button back-button" ng-click="closeAddressbookModal()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
<div class="h1 title">
<span ng-show="!addAddressbookEntry" translate>Addressbook</span>

2
public/views/modals/glidera-tx-details.html
View file

@ -1,5 +1,5 @@
<ion-modal-view ng-controller="glideraTxDetailsController">
<ion-header-bar align-title="center" class="bar-stable">
<ion-header-bar align-title="center" class="bar-royal">
<button class="button button-clear button-positive"
ng-click="cancel()">
Close

2
public/views/modals/scanner.html
View file

@ -1,5 +1,5 @@
<ion-modal-view ng-controller="scannerController" ng-init="init()">
<ion-header-bar align-title="center" class="bar-stable">
<ion-header-bar align-title="center" class="bar-royal">
<button ng-click="cancel()" class="button button-clear button-positive" translate>
Close
</button>

3
public/views/modals/txp-details.html
View file

@ -25,9 +25,6 @@
</li>
<li class="item">
<div class="assertive" ng-show="error">
<span class="text-warning size-14">{{error|translate}}</span>
</div>
<div class="row" ng-if="tx.removed">
<div class="column m20t text-center text-warning size-12" translate>

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

@ -14,7 +14,7 @@
</p>
</div>
<div class="row text-center">
<i class="ion-arrow-down-c light-blue col col-60" id="arrow-down"></i>
<i class="ion-ios-arrow-thin-down light-blue col col-60" id="arrow-down"></i>
</div>
<div class="row">
<button class="button button-block button-positive col-75 col" href ui-sref="onboarding.backupWarning" translate>Backup wallet</button>

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

@ -2,7 +2,7 @@
<ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary">
<button class="button no-border" href ui-sref="onboarding.backupRequest">
<i class="icon ion-arrow-left-c"></i>
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

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

@ -1,6 +1,6 @@
<ion-view id="onboard-welcome" class="onboarding">
<ion-content ng-controller="welcomeController" ng-init="createProfile()">
<img src="../img/onboarding-welcome-shopping24.png" id="shopping-24" />
<qr-scanner id="shopping-24" on-scan="goImport(data)"></qr-scanner>
<div class="text-center">
<div class="row">
<img src='../../img/bitpay-logo.svg' class="logo col col-50" />
@ -14,7 +14,7 @@
<button class="button button-block get-started col col-75" href ui-sref="onboarding.tour" translate>Get started</button>
</div>
<div class="row">
<button class="button button-block restore col col-75" translate href ui-sref="tabs.import({'fromOnboarding':true})">Restore</button>
<button class="button button-block restore col col-75" translate href ui-sref="onboarding.import.phrase({'fromOnboarding':true})">Restore</button>
</div>
</ion-content>
</ion-view>

4
public/views/preferences.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesController" ng-init="init()">

6
public/views/preferencesAbout.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button button-stable no-border" ui-sref="tabs.settings">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.settings">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

4
public/views/preferencesAdvanced.html
View file

@ -1,8 +1,8 @@
<ion-view >
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Advanced Preferences' | translate}}</ion-nav-title>
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>

4
public/views/preferencesAlias.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAliasController" >

4
public/views/preferencesAltCurrency.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAltCurrencyController" ng-init="init()" >

7
public/views/preferencesBitpayCard.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="bitpayCard.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="bitpayCard.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Preferences</ion-nav-title>
@ -16,4 +16,3 @@
</ul>
</ion-content>
</ion-view>

26
public/views/preferencesBwsUrl.html
View file

@ -1,16 +1,22 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesBwsUrlController" >
<form name="settingsBwsUrlForm" ng-submit="save(settingsBwsUrlForm)" novalidate>
<label class="item item-input item-stacked-label">
<span class="input-label" transalate>Wallet Service URL</span><a ng-click="resetDefaultUrl()" translate> Set default url</a>
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl">
</label>
<input type="submit" class="button button-block button-stable" value="{{'Save'|translate}}"></input>
</form>
<ion-content ng-controller="preferencesBwsUrlController">
<div class="row no-border">
<div class="col col-90">
<label class="item item-input item-stacked-label no-border">
<span class="input-label" transalate>Wallet Service URL</span>
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl">
</label>
</div>
<div class="col">
<i class="icon ion-ios-reload" ng-click="resetDefaultUrl()"></i>
</div>
</div>
<button class="button button-block button-balanced" ng-click="save()" translate>Save</button>
</ion-content>
</ion-view>

4
public/views/preferencesColor.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesColorController" >

4
public/views/preferencesDeleteWallet.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content class="has-header" ng-controller="preferencesDeleteWalletController" >

4
public/views/preferencesDeleteWords.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesDeleteWordsController" >

4
public/views/preferencesEmail.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesEmailController" >

4
public/views/preferencesFee.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

7
public/views/preferencesGlidera.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="glidera.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="glidera.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Preferences</ion-nav-title>
@ -275,4 +275,3 @@
</ul>
</ion-content>
</ion-view>

4
public/views/preferencesHistory.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesHistory" ng-init="index.updatingTxHistory ? null : csvHistory()">

4
public/views/preferencesInformation.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesInformation" ng-init="init()">

4
public/views/preferencesLanguage.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesLanguageController" ng-init="init()" >

4
public/views/preferencesLogs.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesLogs" ng-init="init()" >

4
public/views/preferencesUnit.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesUnitController" ng-init="init()" >

6
public/views/sellGlidera.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="glidera.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="glidera.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Sell</ion-nav-title>

12
public/views/tab-create-personal.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.add">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
@ -10,13 +10,9 @@
<ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">
<div class="padding assertive" ng-show="create.error">
{{create.error|translate}}
</div>
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
<div class="list">
<div class="card list">
<label ng-hide="create.hideWalletName" class="item item-input item-stacked-label">
<span class="input-label" translate>Wallet name</span>
<input type="text"

12
public/views/tab-create-shared.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.add">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
@ -10,13 +10,9 @@
<ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(3)">
<div class="padding assertive" ng-show="create.error">
{{create.error|translate}}
</div>
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
<div class="list">
<div class="card list">
<label ng-hide="create.hideWalletName" class="item item-input item-stacked-label">
<span class="input-label" translate>Wallet name</span>
<input type="text"

8
public/views/tab-export-file.html
View file

@ -1,10 +1,10 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
</button>
<button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

8
public/views/tab-export-qrCode.html
View file

@ -1,10 +1,10 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
</button>
<button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

25
public/views/tab-home.html
View file

@ -1,27 +1,22 @@
<ion-view id="tab-home">
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Home' | translate}}</ion-nav-title>
</ion-nav-bar>
<ion-content class="padding" ng-controller="tabHomeController" ng-init="updateAllWallets(); nextStep()">
<div class="card">
<div class="item item-divider item-icon-right" translate>
<div class="list card" ng-hide="!notifications[0]">
<a class="item item-icon-right item-heading" ui-sref="activity" translate>
Recent Activity
<i class="icon ion-ios-arrow-right" ui-sref="activity"></i>
</div>
<div ng-if="fetchingNotifications" class="item text-center">
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>
<span ng-if="fetchingNotifications" class="item text-center">
<ion-spinner icon="lines"></ion-spinner>
<div translate>Updating activity. Please stand by</div>
</div>
<div ng-if="!fetchingNotifications">
<a class="item" ng-repeat="x in notifications" ng-click="x.action()">
<span ng-include="'views/includes/walletActivity.html'"></span>
</a>
<div class="item" ng-show="!notifications[0]">
<span translate>Nothing to show here.</span>
</div>
</div>
</span>
<a ng-if="!fetchingNotifications" class="item" ng-repeat="x in notifications" ng-click="x.action()">
<span ng-include="'views/includes/walletActivity.html'"></span>
</a>
</div>
<div class="list card" ng-hide="!wallets[0]">

22
public/views/tab-import-file.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-bar class="bar-royal" ng-controller="backController">
<ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ng-click="importGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Import wallet' | translate}}</ion-nav-title>
@ -10,13 +10,9 @@
<ion-content ng-controller="importController" ng-init="type='file'">
<div class="padding assertive" ng-show="error">
{{error|translate}}
</div>
<form name="importForm" ng-submit="importBlob(importForm)" novalidate>
<div class="list">
<div class="list card">
<label class="item item-input item-stacked-label no-border" ng-show="!isSafari && !isCordova">
<div class="input-label" translate>Choose a backup file from your computer</div>
@ -36,9 +32,9 @@
<label class="item item-input item-stacked-label">
<span class="input-label" translate>Password</span>
<input type="password"
placeholder="{{'Your password'|translate}}"
name="password"
ng-model="password">
placeholder="{{'Your password'|translate}}"
name="password"
ng-model="password">
</label>
<ion-toggle ng-model="showAdv" toggle-class="toggle-stable">
@ -56,9 +52,7 @@
</div>
</div>
<button type="submit"
class="button round expand black"
ng-disabled="importForm.$invalid || !password " translate>
<button type="submit" class="button button-block button-positive" ng-disabled="importForm.$invalid || !password " translate>
Import backup
</button>
</form>

12
public/views/tab-import-hardware.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-bar class="bar-royal" ng-controller="backController">
<ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ng-click="importGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Import wallet' | translate}}</ion-nav-title>
@ -10,10 +10,6 @@
<ion-content ng-controller="importController" ng-init="type='hwWallet'">
<div class="padding assertive" ng-show="error">
{{error|translate}}
</div>
<form name="importForm3" ng-submit="importHW(importForm3)" novalidate>
<div class="card" ng-show="!seedOptions[0]">
@ -23,7 +19,7 @@
</div>
<div ng-show="seedOptions[0]">
<div class="list">
<div class="card list">
<label class="item item-input item-select">
<div class="input-label" translate>

36
public/views/tab-import-phrase.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-bar class="bar-royal" ng-controller="backController">
<ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ng-click="importGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Import wallet</ion-nav-title>
@ -10,26 +10,20 @@
<ion-content ng-controller="importController" ng-init="type='12'">
<div ng-show="importErr || error" class="padding assertive" ng-click="importErr = error = null">
<div ng-show="importErr">
<div translate>Could not access the wallet at the server. Please check:</div>
<ul>
<li translate>The password of the recovery phrase (if set)</li>
<li translate>The derivation path</li>
<li translate>The wallet service URL</li>
</ul>
<div translate>
NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the Recovery Phrase there.
</div>
</div>
<div ng-show="error">
{{error|translate}}
<div ng-show="importErr" class="padding assertive" ng-click="importErr = null">
<div translate>Could not access the wallet at the server. Please check:</div>
<ul>
<li translate>The password of the recovery phrase (if set)</li>
<li translate>The derivation path</li>
<li translate>The wallet service URL</li>
</ul>
<div translate>
NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the Recovery Phrase there.
</div>
</div>
<form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
<div class="list">
<div class="list card">
<div class="row">
<div class="col col-90">
@ -83,8 +77,8 @@
</div>
<button type="submit"
class="button button-block button-positive"
ng-disabled="importForm12.$invalid" translate>Import</button>
class="button button-block button-positive"
ng-disabled="importForm12.$invalid" translate>Import</button>
</form>
</ion-content>
</ion-view>

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

@ -1,5 +1,5 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
</ion-nav-bar>
@ -11,10 +11,6 @@
</div>
</div>
<div class="padding assertive" ng-show="error">
{{error|translate}}
</div>
<div class="list card padding text-center" ng-if="!wallets[0]">
<span translate>No Wallet</span>
</div>

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

@ -1,5 +1,5 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Scan' | translate}}</ion-nav-title>
</ion-nav-bar>

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

@ -1,5 +1,5 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Send' | translate}}</ion-nav-title>
</ion-nav-bar>

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

@ -1,5 +1,5 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Global Settings' | translate}}</ion-nav-title>
</ion-nav-bar>

4
public/views/termsOfUse.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

4
public/views/translators.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Translators' | translate}}</ion-nav-title>
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>

19
public/views/walletDetails.html
View file

@ -1,10 +1,13 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-title>{{wallet.name}}</ion-nav-title>
<ion-nav-back-button>
{{'Back' | translate}}
</ion-nav-back-button>
</ion-nav-bar>
<ion-view id="walletDetails">
<ion-header-bar ng-style="{'background-color': walletDetailsColor}">
<button class="button back-button" ng-click="$ionicGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
<h1 class="title">{{walletDetailsName}}</h1>
<button class="button search-button">
<i class="icon ion-ios-search-strong"></i>
</button>
</ion-header-bar>
<ion-content ng-controller="walletDetailsController" ng-init="init()" delegate-handle="my-handle">
<div ng-show="!wallet" translate>
@ -39,7 +42,7 @@
<div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden" on-hold="hideToggle()">
<strong class="size-36">{{status.totalBalanceStr}}</strong>
<div class="size-14" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
<div class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
<div class="size-14" ng-if="status.pendingAmount">
<span translate>Pending Confirmation</span>: {{status.pendingAmountStr}}
</div>