Merge branch 'master' of github.com:bitpay/copay into feature/copay-shell
This commit is contained in:
Gordon Hall
commit
4dbad23eac
16 changed files with 283 additions and 162 deletions
115
index.html
115
index.html
|
|
@ -139,13 +139,13 @@
|
|||
|
||||
<div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet}">
|
||||
<link rel="stylesheet" ng-href="{{theme}}">
|
||||
<div class="row" ng-show="!$root.wallet">
|
||||
<div ng-show="!$root.wallet">
|
||||
<div class="large-12 columns text-right">
|
||||
Copay
|
||||
<small>v{{version}}</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row p10t" ng-show="$root.wallet">
|
||||
<div class="p10t" ng-show="$root.wallet">
|
||||
<div class="large-3 medium-3 hide-for-small columns">
|
||||
<div>
|
||||
<strong>{{$root.wallet.getName()}}</strong>
|
||||
|
|
@ -203,13 +203,10 @@
|
|||
</div>
|
||||
<div ng-show="!wallets.length">
|
||||
<h3>Create a new wallet</h3>
|
||||
<form name="createForm" ng-submit="create(createForm)" novalidate>
|
||||
<p class="text-gray">
|
||||
Copay is a free, open-source, multisignature bitcoin wallet. A single-owner bitcoin wallet's security depends on carefully securing the private keys. With copay you can have multiple people controlling the funds, using bitcoin's multisignature functionality, requiring no trust in any third party.
|
||||
</p>
|
||||
<button type="submit" class="button secondary radius"
|
||||
ng-disabled="createForm.$invalid || loading" loading="Creating">Create</button>
|
||||
</form>
|
||||
<a href="#setup" class="button secondary radius">Create</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -257,19 +254,21 @@
|
|||
<label for="backupText" ng-click="pastetext=!pastetext" class="m10b">· Paste backup plain text code <i class="fi-clipboard"></i></label>
|
||||
<textarea class="form-control" name="backupText" ng-model="backupText" rows="5" ng-show="pastetext"></textarea>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
<div class="large-8 medium-8 columns">
|
||||
<div class="large-6 large-centered medium-6 medium-centered columns">
|
||||
<label for="password">Password <small>Required</small></label>
|
||||
<input type="password" class="form-control" placeholder="Your wallet password" name="password" ng-model="password" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="large-12 columns line-dashed">
|
||||
<div class="row line-dashed">
|
||||
<div class="large-6 medium-6 small-5 columns text-left">
|
||||
<a class="button secondary radius" href="#signin">Go back</a>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-5 columns text-right">
|
||||
<button type="submit" class="button primary radius right" ng-disabled="importForm.$invalid" loading="Importing">
|
||||
Import backup
|
||||
</button>
|
||||
<a class="button secondary radius" href="#signin">Go back</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
@ -285,46 +284,64 @@
|
|||
</div>
|
||||
<div ng-show="!loading">
|
||||
<form name="setupForm" ng-submit="create(setupForm)" novalidate>
|
||||
<div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup">
|
||||
<h3>Create new wallet</h3>
|
||||
<div class="large-6 columns line-dashed-v">
|
||||
<h6>Select total number of copayers</h6>
|
||||
<select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
|
||||
</select>
|
||||
</div>
|
||||
<div class="large-6 columns">
|
||||
<h6>Select required signatures</h6>
|
||||
<select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<h3>Create new wallet</h3>
|
||||
<div class="row">
|
||||
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
|
||||
<div class="small-12 medium-8 medium-centered large-8 large-centered columns">
|
||||
<label>Wallet name <small>Optional</small>
|
||||
<input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
|
||||
</label>
|
||||
</div>
|
||||
<div class="small-12 medium-8 medium-centered large-8 large-centered columns">
|
||||
<div class="row">
|
||||
<div class="small-12 medium-6 large-6 columns">
|
||||
<label>Your name <small>Optional</small>
|
||||
<input type="text" placeholder="Name" class="form-control" ng-model="myNickname">
|
||||
</label>
|
||||
</div>
|
||||
<div class="small-12 medium-6 large-6 columns">
|
||||
<label>Your Wallet Password <small class="has-tip" tooltip="doesn't need to be shared">Required</small>
|
||||
<input type="password" placeholder="Choose your password" class="form-control"
|
||||
ng-model="$parent.walletPassword" check-strength="passwordStrength" tooltip="Password strength: {{passwordStrength}}" tooltip-trigger="focus" required>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup">
|
||||
<fieldset>
|
||||
<div class="row">
|
||||
<div class="large-6 medium-6 columns line-dashed-v">
|
||||
<label>Select total number of copayers
|
||||
<select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
<div class="large-6 medium-6 columns">
|
||||
<label>Select required signatures
|
||||
<select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m10b">
|
||||
<div class="box-setup-copayers">
|
||||
<div class="box-setup-copayers-fix">
|
||||
<img class="box-setup-copay" ng-repeat="i in getNumber(totalCopayers) track by $index" src="./img/satoshi.gif" alt="Copayer {{$index+1}}-{{totalCopayers}}" ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
|
||||
<h6>Your Wallet Password<small>(doesn't need to be shared) Required</small></h6>
|
||||
<input type="password" placeholder="Choose your password" class="form-control"
|
||||
ng-model="$parent.walletPassword" check-strength="passwordStrength" tooltip="Password strength: {{passwordStrength}}" tooltip-trigger="focus" required>
|
||||
</div>
|
||||
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
|
||||
<h6>Wallet name <small>Optional</small></h6>
|
||||
<input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
|
||||
</div>
|
||||
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
|
||||
<h6>Your name <small>Optional</small></h6>
|
||||
<input type="text" placeholder="Name" class="form-control" ng-model="myNickname">
|
||||
</div>
|
||||
</div>
|
||||
<div class="large-12 columns line-dashed">
|
||||
<button type="submit" class="button primary radius right" ng-disabled="setupForm.$invalid || loading">
|
||||
Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
|
||||
</button>
|
||||
<a class="button secondary radius" href="#signin">Go back</a>
|
||||
|
||||
<div class="row line-dashed">
|
||||
<div class="large-6 medium-6 small-5 columns text-left">
|
||||
<a class="button secondary radius" href="#signin">Go back</a>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-7 columns text-right">
|
||||
<button type="submit" class="button primary radius" ng-disabled="setupForm.$invalid || loading">
|
||||
Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -402,11 +419,11 @@
|
|||
<div class="transactions" data-ng-controller="TransactionsController">
|
||||
<div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
|
||||
<div class="large-12 columns">
|
||||
<h4> Transaction proposals <span ng-if="onlyPending">[Pending]</span> <small>({{txs.length}})</small></h4>
|
||||
<h4> Transaction proposals <small>({{txs.length}})</small></h4>
|
||||
|
||||
<ul class="button-group radius">
|
||||
<li> <button class="secondary" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating"> Pending </button>
|
||||
<li> <button class="secondary" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating"> All </button>
|
||||
<ul class="inline-list">
|
||||
<li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
|
||||
<li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
|
||||
</ul>
|
||||
<div class="panel radius pending" ng-repeat="tx in txs | paged">
|
||||
<div class="txheader row m10">
|
||||
|
|
@ -501,8 +518,8 @@
|
|||
</div>
|
||||
<div class="large-12 columns">
|
||||
<h4>Last transactions</h4>
|
||||
<a ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-hide="lastShowed && !loading">Show</a>
|
||||
<a ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-show="lastShowed && !loading">Hide</a>
|
||||
<a class="size-12" ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-hide="lastShowed && !loading">Show</a>
|
||||
<a class="size-12" ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-show="lastShowed && !loading">Hide</a>
|
||||
<div class="btransactions" ng-if="lastShowed">
|
||||
<div ng-if="!blockchain_txs[0].txid && !loading">
|
||||
No transactions yet.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue