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

Merge pull request #3334 from bechi/manage-wallet

Browse source 
Manage wallet
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-23 12:13:59 -03:00
commit 23ce1a16cf
3 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

24
public/views/create.html
View file

@ -119,8 +119,8 @@
</select> </select>
</label> </label>
<div class="oh text-gray line-b size-12 p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div> <div class="oh text-gray line-b size-12 p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
</div> </div>
--> -->
<label for="network-name" class="oh" ng-show="!hwLedger && !hwTrezor"> <label for="network-name" class="oh" ng-show="!hwLedger && !hwTrezor">
<span translate>Testnet</span> <span translate>Testnet</span>
<switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch> <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
@ -131,18 +131,13 @@
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch> <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
</label> </label>
<label for="bws" class="oh"> <label for="createPassphrase" class="oh" ng-hide="setSeed || hwLedger || hwTrezor" ><span translate>Add a Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
<span>Wallet Service URL</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
</label>
<label for="createPassphrase" class="line-b oh" ng-hide="setSeed || hwLedger || hwTrezor" ><span translate>Add a Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
<div class="input"> <div class="input">
<input type="text" class="form-control" <input type="text" class="form-control"
name="createPassphrase" ng-model="createPassphrase"> name="createPassphrase" ng-model="createPassphrase">
</div> </div>
</label> </label>
<label for="ext-master" class="m10t" ng-show="setSeed"> <label for="ext-master" class="m10t" ng-show="setSeed">
<span translate>Wallet Seed</span> <span translate>Wallet Seed</span>
<small translate>Enter the seed words (BIP39)</small> <small translate>Enter the seed words (BIP39)</small>
@ -150,11 +145,16 @@
type="text" type="text"
name="privateKey" ng-model="privateKey"> name="privateKey" ng-model="privateKey">
</label> </label>
<label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small> <label for="passphrase" class="oh" ng-show="setSeed"><span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small>
<div class="input"> <div class="input">
<input type="text" class="form-control" name="passphrase" ng-model="passphrase"> <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
</div> </div>
</label> </label>
<label for="bws" class="oh">
<span>Wallet Service URL</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
</label>
</div> </div>
</div> </div>
@ -172,7 +172,7 @@
<button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading || create.hwWallet"> <button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading || create.hwWallet">
<span translate>Create {{requiredCopayers}}-of-{{totalCopayers}} wallet</span> <span translate>Create {{requiredCopayers}}-of-{{totalCopayers}} wallet</span>
</button> </button>
<button type="submit" class="button round black expand m0" ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid || create.loading || create.hwWallet"> <button type="submit" class="button round black expand m0" ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid || create.loading || create.hwWallet">
<span translate>Create new wallet</span> <span translate>Create new wallet</span>
</button> </button>

38
public/views/import.html
View file

@ -84,17 +84,17 @@
<switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch> <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
</label> </label>
<label for="bws" class="oh"> <label for="passphrase" class="oh"><span translate>Passphrase</span> <small translate>Wallet Seed could require a passphrase to be imported</small>
<span>Wallet Service URL</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
</label>
<label for="passphrase" class="oh line-b"><span translate>Passphrase</span> <small translate>Wallet Seed could require a passphrase to be imported</small>
<div class="input"> <div class="input">
<input type="password" class="form-control" placeholder="{{'Seed passphrase'|translate}}" <input type="password" class="form-control" placeholder="{{'Seed passphrase'|translate}}"
name="passphrase" ng-model="import.passphrase"> name="passphrase" ng-model="import.passphrase">
</div> </div>
</label> </label>
<label for="bws" class="oh">
<span>Wallet Service URL</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
</label>
</div> </div>
</div> </div>
@ -132,7 +132,7 @@
<textarea class="form-control" name="backupText" ng-model="import.backupText" rows="5"></textarea> <textarea class="form-control" name="backupText" ng-model="import.backupText" rows="5"></textarea>
</div> </div>
<label for="password"><span translate>Password</span> <label for="password"><span translate>Password</span>
</label> </label>
<div class="input"> <div class="input">
<input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}" <input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"
@ -157,7 +157,7 @@
</label> </label>
</div> </div>
</div> </div>
<button translate type="submit" class="button round expand black" <button translate type="submit" class="button round expand black"
ng-disabled="importForm.$invalid || !import.password || import.loading"> ng-disabled="importForm.$invalid || !import.password || import.loading">
Import backup Import backup
@ -195,7 +195,7 @@
--> -->
<button translate type="submit" class="button round expand black" <button translate type="submit" class="button round expand black"
ng-disabled="import.loading || import.ledger"> ng-disabled="import.loading || import.ledger">
Import from Ledger Import from Ledger
</button> </button>
<div class="m10t oh" ng-init="hideAdvLedger=true"> <div class="m10t oh" ng-init="hideAdvLedger=true">
@ -216,17 +216,12 @@
</label> </label>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<form name="importForm4" ng-submit="import.importTrezor(importForm4)" novalidate> <form name="importForm4" ng-submit="import.importTrezor(importForm4)" novalidate>
<div class="large-12 columns"> <div class="large-12 columns">
<!-- ng-disabled="import.loading || import.ledger" -->
<button translate type="submit" class="button round expand black" ng-disabled="true">
Import from TREZOR
</button>
<div class="m10t oh" ng-init="hideAdvTrezor=true"> <div class="m10t oh" ng-init="hideAdvTrezor=true">
<a class="button outline light-gray expand tiny" ng-click="hideAdvTrezor=!hideAdvTrezor"> <a class="button outline light-gray expand tiny" ng-click="hideAdvTrezor=!hideAdvTrezor">
<i class="fi-widget m3r"></i> <i class="fi-widget m3r"></i>
@ -244,13 +239,18 @@
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl"> <input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
</label> </label>
</div> </div>
</div> </div>
</div>
<!-- ng-disabled="import.loading || import.ledger" -->
<button translate type="submit" class="button round expand black" ng-disabled="true">
Import from TREZOR
</button>
</div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>

24
public/views/join.html
View file

@ -78,11 +78,6 @@
<div ng-show="join.hideAdv" class="row"> <div ng-show="join.hideAdv" class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<label for="bws" class="oh">
<span>Wallet Service URL</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
</label>
<label for="hw-ledger" class="oh" ng-show="index.isChromeApp"> <label for="hw-ledger" class="oh" ng-show="index.isChromeApp">
<span translate>Use Ledger hardware wallet</span> <span translate>Use Ledger hardware wallet</span>
<switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch> <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
@ -101,20 +96,20 @@
</select> </select>
</label> </label>
<div class="oh text-gray line-b size-12 p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div> <div class="oh text-gray line-b size-12 p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
</div> </div>
--> -->
<label ng-show="!hwLedger && !hwTrezor" for="seed" class="oh"> <label ng-show="!hwLedger && !hwTrezor" for="seed" class="oh">
<span translate>Specify your wallet seed</span> <span translate>Specify your wallet seed</span>
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch> <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
</label> </label>
<label for="createPassphrase" class="line-b oh" ng-show="!setSeed && !hwLedger && !hwTrezor" ><span translate>Add a Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small> <label for="createPassphrase" class="oh" ng-show="!setSeed && !hwLedger && !hwTrezor" ><span translate>Add a Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
<div class="input"> <div class="input">
<input type="text" class="form-control" <input type="text" class="form-control"
name="createPassphrase" ng-model="createPassphrase"> name="createPassphrase" ng-model="createPassphrase">
</div> </div>
</label> </label>
<label for="ext-master" class="m10t" ng-show="setSeed"> <label for="ext-master" class="m10t" ng-show="setSeed">
<span translate>Wallet Seed</span> <span translate>Wallet Seed</span>
<small translate>Enter the seed words (BIP39)</small> <small translate>Enter the seed words (BIP39)</small>
@ -122,11 +117,16 @@
type="text" type="text"
name="privateKey" ng-model="privateKey"> name="privateKey" ng-model="privateKey">
</label> </label>
<label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small> <label for="passphrase" class="oh" ng-show="setSeed"><span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small>
<div class="input"> <div class="input">
<input type="text" class="form-control" name="passphrase" ng-model="passphrase"> <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
</div> </div>
</label> </label>
<label for="bws" class="oh">
<span>Wallet Service URL</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
</label>
</div> </div>
</div> </div>
@ -139,7 +139,7 @@
</span> </span>
</div> </div>
<button translate type="submit" class="button expand black m0 round" <button translate type="submit" class="button expand black m0 round"
ng-disabled="joinForm.$invalid || join.loading">Join</button> ng-disabled="joinForm.$invalid || join.loading">Join</button>
</form> </form>
</div> </div>