better texts and forms

This commit is contained in:
Matias Alejo Garcia 2015-09-03 01:49:48 -03:00
commit 4ac32f13a0
10 changed files with 150 additions and 51 deletions

View file

@ -112,21 +112,49 @@
</select>
</label>
</div>
<label ng-hide="hwLedger" for="network-name" class="line-b oh">
<label for="network-name" class="oh">
<span translate>Testnet</span>
<switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
</label>
<label for="ext-master" class="m10t">
<span translate>Backup Words (BIP39 seed)</span>
<small translate>If not given, a random secure key will be generated</small>
<label for="seed" class="oh">
<span translate>Specify the wallet seed</span>
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
</label>
<label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span> <small translate>Add an optional passphrase to secure the wallet seed</small>
<div class="input">
<input type="text" class="form-control"
name="createPassphrase" ng-model="createPassphrase">
</div>
</label>
<label for="ext-master" class="m10t" ng-show="setSeed">
<span translate>Wallet Seed</span>
<small translate>Enter the 12 words to seed the wallet (BIP39)</small>
<input id="ext-master"
type="text"
placeholder="{{'Backup words'|translate}}"
placeholder="{{'Wallet seed'|translate}}"
name="privateKey" ng-model="privateKey">
</label>
<label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span> <small translate>Seed could require a passphrase to be imported</small>
<div class="input">
<input type="text" class="form-control" name="passphrase" ng-model="passphrase">
</div>
</label>
</div>
</div>
<div class="box-notification" ng-show="!setSeed && createPassphrase">
<span class="text-warning size-14">
<i class="fi-alert"></i>
<span translate>
WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase.
</span>
</span>
</div>
<button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading">

View file

@ -23,7 +23,7 @@
<div class="tab-container small-6 medium-6 large-6">
<a href
ng-class="{'selected': type =='12'}"
ng-click="import.setType('12')" translate>12 Words Backup</a>
ng-click="import.setType('12')" translate>Walled Seed</a>
</div>
<div class="tab-container small-6 medium-6 large-6">
<a href
@ -53,7 +53,7 @@
<div >
<label for="words">
<span translate>Type the 12 backup words here</span>:
<span translate>Type the Wallet Seed (12 words)</span>:
</label>
<textarea class="form-control" name="words" ng-model="import.words" rows="2"></textarea>
</div>
@ -69,22 +69,21 @@
</div>
<div ng-hide="hideAdv" class="row">
<div class="large-12 columns">
<label for="passphrase" class="line-b oh"><span translate>Passphrase</span> <small translate>Mnemonics could required a passphrase to be imported</small>
<div class="input">
<input type="password" class="form-control" placeholder="{{'Your backup passhrase'|translate}}"
name="passphrase" ng-model="import.passphrase">
</div>
</label>
<label for="network-name" class="line-b oh">
<label for="network-name" class=" oh">
<span translate>Testnet</span>
<switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
</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">
<input type="password" class="form-control" placeholder="{{'Seed passphrase'|translate}}"
name="passphrase" ng-model="import.passphrase">
</div>
</label>
</div>
</div>
<button translate type="submit" class="button round expand black"
<button translate type="submit" class="button round expand black m10t"
ng-disabled="importForm12.$invalid || import.loading">
Import
</button>
@ -118,7 +117,7 @@
<textarea class="form-control" name="backupText" ng-model="import.backupText" rows="5"></textarea>
</div>
<label for="password"><span translate>Password</span> <small translate>Required</small>
<label for="password"><span translate>Password</span>
</label>
<div class="input">
<input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"

View file

@ -99,15 +99,42 @@
</label>
</div>
<div class="large-12 columns">
<label for="ext-master">
<span translate>Backup Words (BIP39 seed)</span>
<small translate>If not given, a random secure key will be generated</small>
<input id="ext-master"
type="text"
placeholder="{{'Backup words'|translate}}"
name="privateKey" ng-model="privateKey">
</label>
</div>
<label for="seed" class="oh">
<span translate>Specify the wallet seed</span>
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
</label>
<label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span> <small translate>Add an optional passphrase to secure the wallet seed</small>
<div class="input">
<input type="text" class="form-control"
name="createPassphrase" ng-model="createPassphrase">
</div>
</label>
<label for="ext-master" class="m10t" ng-show="setSeed">
<span translate>Wallet Seed</span>
<small translate>Enter the 12 words to seed the wallet (BIP39)</small>
<input id="ext-master"
type="text"
placeholder="{{'Wallet seed'|translate}}"
name="privateKey" ng-model="privateKey">
</label>
<label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span> <small translate>Seed could require a passphrase to be imported</small>
<div class="input">
<input type="text" class="form-control" name="passphrase" ng-model="passphrase">
</div>
</label>
</div>
</div>
<div class="box-notification" ng-show="!setSeed && createPassphrase">
<span class="text-warning size-14">
<i class="fi-alert"></i>
<span translate>
WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase.
</span>
</span>
</div>
<button translate type="submit" class="button expand black m0 round"
ng-disabled="joinForm.$invalid || join.loading">Join</button>