fix style issues
This commit is contained in:
parent
d98bc6f2e9
commit
aa021125a0
5 changed files with 133 additions and 110 deletions
15
css/main.css
15
css/main.css
|
|
@ -278,8 +278,17 @@ button.secondary:hover { background-color: #FFDF00 !important;}
|
||||||
}
|
}
|
||||||
|
|
||||||
.video-small {
|
.video-small {
|
||||||
width: 100px;
|
width: 120px;
|
||||||
height: 100px;
|
height: 120px;
|
||||||
border: 1px solid black;
|
margin: 20px;
|
||||||
|
display: inline;
|
||||||
|
float:left;
|
||||||
|
}
|
||||||
|
.online {
|
||||||
|
border: 10px solid green;
|
||||||
|
}
|
||||||
|
.offline {
|
||||||
|
border: 10px solid gray;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
29
index.html
29
index.html
|
|
@ -205,20 +205,29 @@
|
||||||
<script type="text/ng-template" id="peer.html">
|
<script type="text/ng-template" id="peer.html">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns p70l">
|
<div class="large-12 columns p70l">
|
||||||
<h3 class="panel-title">Online Copayers: {{$root.wallet.network.connectedCopayers().length}}</h3>
|
|
||||||
|
|
||||||
<p class="text-info" ng-show="$root.wallet.publicKeyRing.requiredCopayers >$root.wallet.network.connectedCopayers()"> <i class="fi-alert size-28"></i>
|
<p class="text-info" ng-show="$root.wallet.publicKeyRing.requiredCopayers >$root.wallet.network.connectedCopayers()"> <i class="fi-alert size-28"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="large-12 columns p70l">
|
||||||
{{$root.wallet.publicKeyRing.requiredCopayers}} copayers needed for signing transactions
|
{{$root.wallet.publicKeyRing.requiredCopayers}} copayers needed for signing transactions
|
||||||
|
</div>
|
||||||
<ul class="no-bullet">
|
</div>
|
||||||
<li class="panel" ng-repeat="copayer in $root.wallet.network.connectedPeers">
|
<div class="row">
|
||||||
<video class="video-small" autoplay ng-show="$root.videoSrc[copayer]"
|
<div class="large-4 columns"
|
||||||
|
ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
|
||||||
|
<video
|
||||||
|
ng-class="($root.wallet.getOnlinePeerIDs().indexOf(copayer) != -1) ? 'online' : 'offline'"
|
||||||
|
class="video-small"
|
||||||
|
autoplay ng-show="$root.videoSrc[copayer]"
|
||||||
ng-src="{{$root.getVideoURL(copayer)}}"
|
ng-src="{{$root.getVideoURL(copayer)}}"
|
||||||
id="{{copayer + '-video'}}" muted="true"></video>
|
id="{{copayer + '-video'}}" muted="true"
|
||||||
|
title="{{copayer + (copayer == $root.wallet.network.peerId?' (You)':'')}}" ></video>
|
||||||
<img ng-show="!$root.videoSrc[copayer]"
|
<img ng-show="!$root.videoSrc[copayer]"
|
||||||
src="/img/satoshi.gif" title="{{copayer + (copayer == $root.wallet.network.peerId?' (You)':'')}}" />
|
ng-class="($root.wallet.getOnlinePeerIDs().indexOf(copayer) != -1) ? 'online' : 'offline'"
|
||||||
</li>
|
class="video-small"
|
||||||
</ul>
|
src="/img/satoshi.gif"
|
||||||
|
title="{{copayer + (copayer == $root.wallet.network.peerId?' (You)':'')}}" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ Wallet.prototype._handleNetworkChange = function(newCopayerId) {
|
||||||
if (newCopayerId) {
|
if (newCopayerId) {
|
||||||
this.log('#### Setting new PEER:', newCopayerId);
|
this.log('#### Setting new PEER:', newCopayerId);
|
||||||
this.sendWalletId(newCopayerId);
|
this.sendWalletId(newCopayerId);
|
||||||
this.emit('peer', newCopayerId);
|
this.emit('peer', this.network.peerFromCopayer(newCopayerId));
|
||||||
}
|
}
|
||||||
this.emit('refresh');
|
this.emit('refresh');
|
||||||
};
|
};
|
||||||
|
|
@ -176,13 +176,13 @@ Wallet.prototype.netStart = function() {
|
||||||
signingKeyHex: self.privateKey.getSigningKey(),
|
signingKeyHex: self.privateKey.getSigningKey(),
|
||||||
};
|
};
|
||||||
|
|
||||||
net.start(function() {
|
net.start(startOpts, function() {
|
||||||
self.emit('created', net.getPeer());
|
self.emit('created', net.getPeer());
|
||||||
var registered = self.getRegisteredPeerIds();
|
var registered = self.getRegisteredPeerIds();
|
||||||
for (var i=0; i<registered.length; i++) {
|
for (var i = 0; i < self.publicKeyRing.registeredCopayers(); i++) {
|
||||||
var otherPeerId = registered[i];
|
var otherId = self.getCopayerId(i);
|
||||||
if (otherPeerId !== myPeerId) {
|
if (otherId !== myId) {
|
||||||
net.connectTo(otherPeerId);
|
net.connectTo(otherId);
|
||||||
}
|
}
|
||||||
if (self.firstCopayerId) {
|
if (self.firstCopayerId) {
|
||||||
self.sendWalletReady(self.firstCopayerId);
|
self.sendWalletReady(self.firstCopayerId);
|
||||||
|
|
@ -200,7 +200,9 @@ Wallet.prototype.getOnlinePeerIDs = function() {
|
||||||
Wallet.prototype.getRegisteredPeerIds = function() {
|
Wallet.prototype.getRegisteredPeerIds = function() {
|
||||||
var ret = [];
|
var ret = [];
|
||||||
for (var i = 0; i < this.publicKeyRing.registeredCopayers(); i++) {
|
for (var i = 0; i < this.publicKeyRing.registeredCopayers(); i++) {
|
||||||
ret.push(this.getPeerId(i));
|
var cid = this.getCopayerId(i)
|
||||||
|
var pid = this.network.peerFromCopayer(cid);
|
||||||
|
ret.push(pid);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
@ -212,8 +214,7 @@ Wallet.prototype.store = function(isSync) {
|
||||||
|
|
||||||
if (isSync) {
|
if (isSync) {
|
||||||
this.log('Wallet stored.'); //TODO
|
this.log('Wallet stored.'); //TODO
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
this.log('Wallet stored. REFRESH Emitted'); //TODO
|
this.log('Wallet stored. REFRESH Emitted'); //TODO
|
||||||
this.emit('refresh');
|
this.emit('refresh');
|
||||||
}
|
}
|
||||||
|
|
@ -496,14 +497,18 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!opts.remainderOut) {
|
if (!opts.remainderOut) {
|
||||||
opts.remainderOut ={ address: this.generateAddress(true).toString() };
|
opts.remainderOut = {
|
||||||
|
address: this.generateAddress(true).toString()
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
var b = new Builder(opts)
|
var b = new Builder(opts)
|
||||||
.setUnspent(utxos)
|
.setUnspent(utxos)
|
||||||
.setHashToScriptMap(pkr.getRedeemScriptMap())
|
.setHashToScriptMap(pkr.getRedeemScriptMap())
|
||||||
.setOutputs([{address: toAddress, amountSat: amountSat}])
|
.setOutputs([{
|
||||||
;
|
address: toAddress,
|
||||||
|
amountSat: amountSat
|
||||||
|
}]);
|
||||||
|
|
||||||
var signRet;
|
var signRet;
|
||||||
if (priv) {
|
if (priv) {
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ angular.module('copay.controllerUtils')
|
||||||
root.setupUxHandlers = function(w) {
|
root.setupUxHandlers = function(w) {
|
||||||
var handlePeerVideo = function(err, peerID, url) {
|
var handlePeerVideo = function(err, peerID, url) {
|
||||||
if (err) {
|
if (err) {
|
||||||
root.onErrorDigest(err);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$rootScope.videoSrc[peerID] = encodeURI(url);
|
$rootScope.videoSrc[peerID] = encodeURI(url);
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ var Video = function() {
|
||||||
Video.prototype.setOwnPeer = function(peer, wallet, cb) {
|
Video.prototype.setOwnPeer = function(peer, wallet, cb) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
|
|
||||||
navigator.getUserMedia({
|
navigator.getUserMedia({
|
||||||
audio: true,
|
audio: true,
|
||||||
video: true
|
video: true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue