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

Merge branch 'ref/design' of github.com:matiu/copay into ref/design

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-18 10:13:00 -03:00
commit 1f5e55efae
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
12 changed files with 149 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

12
public/views/create.html
View file

@ -1,9 +1,11 @@
<ion-view view-title="Create new wallet" ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">
<ion-nav-buttons side="primary">
<a href ui-sref="add" class="button icon-left ion-chevron-left button-clear button-dark">Add</a>
</ion-nav-buttons>
<ion-view view-title="Create new wallet">
<ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary">
<a href ui-sref="add" class="button icon-left ion-chevron-left button-clear button-dark">Add</a>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
<ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">
<div class="row" ng-hide="create.hideTabs">
<div class="col">

16
public/views/import.html
View file

@ -1,12 +1,11 @@
<ion-view view-title="Import wallet" ng-controller="importController" ng-init="type='12'">
<ion-nav-buttons side="primary">
<a href ui-sref="add" class="button icon-left ion-chevron-left button-clear button-dark">Add</a>
</ion-nav-buttons>
<ion-nav-buttons side="secondary">
<qr-scanner class="button button-clear button-positive" on-scan="processWalletInfo(data)"></qr-scanner>
</ion-nav-buttons>
<ion-view view-title="Import wallet">
<ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary">
<a href ui-sref="add" class="button icon-left ion-chevron-left button-clear button-dark">Add</a>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
<ion-content ng-controller="importController" ng-init="type='12'">
<div class="row">
<div class="col">
@ -57,6 +56,7 @@
<form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
<div class="list">
<qr-scanner class="button button-clear button-positive" on-scan="processWalletInfo(data)"></qr-scanner>
<label class="item item-input item-stacked-label">
<span class="input-label" translate>Type the Recovery Phrase (usually 12 words)</span>
<textarea name="words"

17
public/views/join.html
View file

@ -1,12 +1,12 @@
<ion-view view-title="Join shared wallet" ng-controller="joinController as join">
<ion-nav-buttons side="primary">
<a href ui-sref="add" class="button icon-left ion-chevron-left button-clear button-dark">Add</a>
</ion-nav-buttons>
<ion-nav-buttons side="secondary">
<qr-scanner class="button button-clear button-positive" on-scan="join.onQrCodeScanned(data)"></qr-scanner>
</ion-nav-buttons>
<ion-view view-title="Join shared wallet">
<ion-nav-bar class="bar-stable">
<ion-nav-buttons side="primary">
<a href ui-sref="add" class="button icon-left ion-chevron-left button-clear button-dark">Add</a>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
<ion-content ng-controller="joinController as join">
<div class="padding assertive" ng-show="join.error">
{{join.error|translate}}
@ -25,6 +25,7 @@
ng-required="true">
</label>
<qr-scanner class="button button-clear button-positive" on-scan="join.onQrCodeScanned(data)"></qr-scanner>
<label class="item item-input item-stacked-label">
<span class="input-label">
Wallet Invitation

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

@ -2,7 +2,7 @@
<ion-nav-bar class="bar-stable">
<ion-nav-title>Scan</ion-nav-title>
</ion-nav-bar>
<ion-content ng-controller="tabScanController" ng-init="init()">
<ion-content class="padding" ng-controller="tabScanController" ng-init="init()">
<canvas id="qr-canvas" width="200" height="150"></canvas>
<video id="qrcode-scanner-video" width="300" height="225"></video>