mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #813 from matiu/feature/minor-ux-changes
add testnet in footer / add links
This commit is contained in:
commit
0f28f607d8
21
index.html
21
index.html
|
@ -158,10 +158,20 @@
|
||||||
<div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet || !$root.wallet.isReady()}">
|
<div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet || !$root.wallet.isReady()}">
|
||||||
<link rel="stylesheet" ng-href="{{theme}}">
|
<link rel="stylesheet" ng-href="{{theme}}">
|
||||||
<div ng-show="!$root.wallet">
|
<div ng-show="!$root.wallet">
|
||||||
<div class="large-12 columns text-left">
|
<div class="large-4 columns text-left">
|
||||||
Copay
|
Copay
|
||||||
<small>v{{version}}</small>
|
<small>v{{version}}</small>
|
||||||
|
<small ng-if="networkName==='testnet'">[TESTNET]</small>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="large-4 columns text-center">
|
||||||
|
<small>
|
||||||
|
<A href="https://copay.io" target="_blank">Copay Project Homapage</a>
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
<div class="large-4 columns">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="$root.wallet && !$root.wallet.isReady()">
|
<div ng-show="$root.wallet && !$root.wallet.isReady()">
|
||||||
<div class="large-6 medium-6 small-6 columns">
|
<div class="large-6 medium-6 small-6 columns">
|
||||||
|
@ -237,6 +247,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="!wallets.length">
|
<div ng-show="!wallets.length">
|
||||||
<h3>Create a new wallet</h3>
|
<h3>Create a new wallet</h3>
|
||||||
|
|
||||||
<p class="text-gray">
|
<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.
|
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>
|
</p>
|
||||||
|
@ -826,7 +837,6 @@
|
||||||
<legend>Wallet Unit</legend>
|
<legend>Wallet Unit</legend>
|
||||||
<select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" required>
|
<select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" required>
|
||||||
</select>
|
</select>
|
||||||
<label for="settingsUnit">Prefered Unit for Wallet</label>
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Videoconferencing</legend>
|
<legend>Videoconferencing</legend>
|
||||||
|
@ -842,6 +852,9 @@
|
||||||
<input id="insight-secure" type="checkbox" ng-model="insightSecure" class="form-control" ng-click="changeInsightSSL()">
|
<input id="insight-secure" type="checkbox" ng-model="insightSecure" class="form-control" ng-click="changeInsightSSL()">
|
||||||
<label for="insight-secure">Use SSL</label>
|
<label for="insight-secure">Use SSL</label>
|
||||||
|
|
||||||
|
<p class="small">
|
||||||
|
Insight API server is open-source software. You can run your own instance, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
|
||||||
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>PeerJS server</legend>
|
<legend>PeerJS server</legend>
|
||||||
|
@ -853,6 +866,10 @@
|
||||||
<input type="number" ng-model="networkPort" class="form-control" name="peerjs-port">
|
<input type="number" ng-model="networkPort" class="form-control" name="peerjs-port">
|
||||||
<input id="peerjs-secure" type="checkbox" ng-model="networkSecure" class="form-control">
|
<input id="peerjs-secure" type="checkbox" ng-model="networkSecure" class="form-control">
|
||||||
<label for="peerjs-secure">Use SSL</label>
|
<label for="peerjs-secure">Use SSL</label>
|
||||||
|
|
||||||
|
|
||||||
|
<p class="small">
|
||||||
|
PeerJS Server is open-source software. You can run your own instance, or use PeerJS Server cloud. Check <a href="http://peerjs.com" target="_blank">PeerJS Server</a>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('FooterController', function($rootScope, $sce, $scope, $http) {
|
angular.module('copayApp.controllers').controller('FooterController', function($rootScope, $sce, $scope, $http) {
|
||||||
|
|
||||||
|
$scope.networkName = config.networkName;
|
||||||
|
|
||||||
if (config.themes && Array.isArray(config.themes) && config.themes[0]) {
|
if (config.themes && Array.isArray(config.themes) && config.themes[0]) {
|
||||||
$scope.themes = config.themes;
|
$scope.themes = config.themes;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -260,6 +260,7 @@ Wallet.decodeSecret = function(secretB) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
Wallet.prototype._lockIncomming = function() {
|
Wallet.prototype._lockIncomming = function() {
|
||||||
this.network.lockIncommingConnections(this.publicKeyRing.getAllCopayerIds());
|
this.network.lockIncommingConnections(this.publicKeyRing.getAllCopayerIds());
|
||||||
};
|
};
|
||||||
|
|
|
@ -48,7 +48,6 @@ Network.prototype.cleanUp = function() {
|
||||||
this.privkey = null; //TODO: hide privkey in a closure
|
this.privkey = null; //TODO: hide privkey in a closure
|
||||||
this.key = null;
|
this.key = null;
|
||||||
this.copayerId = null;
|
this.copayerId = null;
|
||||||
this.signingKey = null;
|
|
||||||
this.allowedCopayerIds = null;
|
this.allowedCopayerIds = null;
|
||||||
this.isInboundPeerAuth = [];
|
this.isInboundPeerAuth = [];
|
||||||
this.copayerForPeer = {};
|
this.copayerForPeer = {};
|
||||||
|
|
Loading…
Reference in New Issue