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

Merge pull request #4360 from matiu/bug/webintents

Browse source 
Bug/webintents
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-13 10:48:18 -03:00 • committed by GitHub
commit 88b25370ff
39 changed files with 616 additions and 1041 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/add.html
View file

@ -9,21 +9,21 @@
<div class="content">
<ul class="no-bullet manage size-12">
<li>
<a title="Create new wallet" ng-click="$root.go('create')">
<a title="Create new wallet" href ui-sref="create">
<i class="fi-plus circle plus-fixed"></i>
<i class="icon-arrow-right3 size-18 right m20t"></i>
<span translate>Create new wallet</span>
</a>
</li>
<li>
<a title="Join shared wallet" ng-click="$root.go('join')">
<a title="Join shared wallet" href ui-sref="join">
<i class="icon-people circle"></i>
<i class="icon-arrow-right3 size-18 right m20t"></i>
<span translate>Join shared wallet</span>
</a>
</li>
<li>
<a title="Import wallet" ng-click="$root.go('import')">
<a title="Import wallet" href ui-sref="import">
<i class="icon-download circle"></i>
<i class="icon-arrow-right3 size-18 right m20t"></i>
<span translate>Import wallet </span>

4
public/views/buyAndSell.html
View file

@ -7,12 +7,12 @@
<div class="content">
<ul class="no-bullet manage text-center">
<li class="white m20t" ng-show="index.glideraEnabled">
<a ng-click="$root.go('glidera')">
<a href ui-sref="glidera">
<img src="img/glidera-logo.png" width="150">
</a>
</li>
<li class="white m20t" ng-show="index.coinbaseEnabled">
<a ng-click="$root.go('coinbase')">
<a href ui-sref="coinbase">
<img src="img/coinbase-logo.png" width="150">
</a>
</li>

2
public/views/buyCoinbase.html
View file

@ -84,7 +84,7 @@
<div
ng-if="index.coinbaseToken"
ng-init="buy.init(index.coinbaseTestnet)"
ng-click="openWalletsModal(buy.otherWallets)">
ng-click="openWalletsModal(buy.allWallets)">
<label>Copay Wallet</label>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="buy.selectedWalletId"

2
public/views/buyGlidera.html
View file

@ -42,7 +42,7 @@
<div ng-if="index.glideraToken"
ng-init="buy.init(index.glideraTestnet)"
ng-click="openWalletsModal(buy.otherWallets)">
ng-click="openWalletsModal(buy.allWallets)">
<label>Wallet</label>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="buy.selectedWalletId"

10
public/views/import.html
View file

@ -21,7 +21,7 @@
<div class="create-tab pr small-only-text-center" ng-hide="create.hideTabs">
<div class="row">
<div class="tab-container small-4 medium-4 large-4" ng-class="{'selected': type =='12'}">
<a href ng-click="import.setType('12')" translate>Wallet Recovery Phrase</a>
<a href ng-click="import.setType('12')" translate>Recovery Phrase</a>
</div>
<div class="tab-container small-4 medium-4 large-4" ng-class="{'selected': type=='file'}">
<a href ng-click="import.setType('file')" translate>File/Text Backup</a>
@ -161,14 +161,6 @@
Import backup
</button>
</form>
<div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
<p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
<button class=" outline dark-gray tiny round"> <span translate>Import here</span>
<i class="icon-arrow-right3 size-14"></i>
</button>
</div>
</div>
</div>

68
public/views/importLegacy.html
View file

@ -1,68 +0,0 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Import legacy wallet'; goBackToState = 'import'; noColor = true">
</div>
<div class="content p20v" ng-controller="importLegacyController as importLegacy">
<div class="row m20t">
<div class="large-12 columns">
<div ng-show="importLegacy.importing">
<h1 class="m20b animated infinite flash" translate>Importing...</h1>
<ul>
<li ng-repeat="m in importLegacy.messages">
<span ng-style="{'opacity':m.opacity}">{{m.message|translate}}</span>
</ul>
</div>
<div class="box-notification" ng-show="importLegacy.error">
<span class="text-warning size-14">
{{importLegacy.error|translate}}
</span>
</div>
<div ng-show="!importLegacy.importing">
<form name="importForm" ng-submit="importLegacy.import(importForm)" novalidate>
<label for="fromCloud" class="line-b oh m20b">
<span translate>Import from the Cloud?</span>
<switch id="fromCloud" name="fromCloud" ng-model="importLegacy.fromCloud" class="green right m5t m10b"></switch>
</label>
<label for="username">
<span ng-show="importLegacy.fromCloud" translate>Email</span>
<span ng-show="!importLegacy.fromCloud" translate>Username</span>
<input type="text" class="form-control"
placeholder="{{importLegacy.fromCloud ? ('Email'|translate): ('Username'|translate)}}"
name="username" ng-model="importLegacy.username" autocapitalize="off" required>
</label>
<label for="password">
<span translate>Password</span>
<input type="password" class="form-control" placeholder="{{'Your profile password'|translate}}"
name="password" ng-model="importLegacy.password" required>
</label>
<label for="server" ng-show="importLegacy.fromCloud">
<span translate>Server</span>
<input type="text" class="form-control" placeholder="{{'Server URL'}}"
name="server" ng-model="importLegacy.server" required>
</label>
<button translate type="submit"
class="button black round expand m0"
ng-disabled="importForm.$invalid">
Import
</button>
</form>
<div class="text-center p20v">
<a class="m20t tiny button outline round light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
Learn more about Wallet Migration
</a>
</div>
</div>
</div>
</div>
</div>

17
public/views/includes/sidebar.html
View file

@ -9,44 +9,37 @@
<li ng-show="sidebar.wallets[0]"
ng-repeat="item in sidebar.wallets track by $index"
ng-class="{'selected': item.id == index.walletId}"
class="nav-item">
<a menu-toggle ng-click="$root.go('walletHome'); sidebar.switchWallet(item.id, index.walletId)" class="oh">
class="nav-item"
menu-toggle on-touch="$root.go('walletHome'); sidebar.switchWallet(item.id, index.walletId)" >
<div class="avatar-wallet"
ng-style="{'background-color':item.color}">
<i class="icon-wallet size-21"></i>
</div>
<div class="name-wallet" ng-class="{'m8t':item.n == 1}">{{item.name || item.id}}</div>
<div class="size-12" ng-show="item.n > 1" translate>{{item.m}}-of-{{item.n}}</div>
</a>
</li>
<li>
<a menu-toggle ng-click="$root.go('add')" class="oh">
<li menu-toggle href ui-sref="add">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-plus size-24 icon vm"></i>
<div class="tu text-bold">
<span class="size-12" translate>Add wallet</span>
</div>
<div translate>Create, join or import</div>
</a>
</li>
<li ng-show="!index.isWindowsPhoneApp && index.isComplete && (index.glideraEnabled || index.coinbaseEnabled)">
<a menu-toggle ng-click="$root.go('buyandsell')" class="oh">
<li ng-show="!index.isWindowsPhoneApp && (index.glideraEnabled || index.coinbaseEnabled)" menu-toggle href ui-sref="buyandsell">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="icon-bank size-24 icon vm"></i>
<div class="tu text-bold m5t">
<span class="size-12" translate>Buy &amp; Sell</span>
</div>
</a>
</li>
<li>
<a menu-toggle ng-click="$root.go('preferencesGlobal')" class="oh">
<li menu-toggle href ui-sref="preferencesGlobal">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-widget size-24 icon vm"></i>
<div class="tu text-bold">
<span class="size-12" translate>Settings</span>
</div>
<div translate>Global preferences</div>
</a>
</li>
</ul>
</ion-content>

2
public/views/paymentUri.html
View file

@ -5,7 +5,7 @@
</div>
<div class="content p20v row payment-uri" ng-controller="paymentUriController as payment">
<div class="large-12 columns" ng-init="payment.checkBitcoinUri()">
<div class="large-12 columns" ng-init="payment.init()">
<div class="panel text-center" ng-if="!payment.uri">
<h1 translate>Bitcoin URI is NOT valid!</h1>
</div>

2
public/views/sellCoinbase.html
View file

@ -38,7 +38,7 @@
<div
ng-if="index.coinbaseToken"
ng-init="sell.init(index.coinbaseTestnet)"
ng-click="openWalletsModal(sell.otherWallets)">
ng-click="openWalletsModal(sell.allWallets)">
<label>Copay Wallet</label>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="sell.selectedWalletId"

2
public/views/sellGlidera.html
View file

@ -41,7 +41,7 @@
<div ng-if="index.glideraToken"
ng-init="sell.init(index.glideraTestnet)"
ng-click="openWalletsModal(sell.otherWallets)">
ng-click="openWalletsModal(sell.allWallets)">
<label>Wallet</label>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="sell.selectedWalletId"

11
public/views/uri.html Normal file
View file

@ -0,0 +1,11 @@
<div class="row columns p20" ng-controller="uriController">
<div class="text-center">
<logo width="146"></logo>
<div class="text-white" ng-include="'views/includes/version.html'"></div>
</div>
<h3 class="text-center" translate>
Please wait to be redirected...
</h3>
</div>