diff --git a/css/main.css b/css/main.css index d9118c0c9..a11dc13f0 100644 --- a/css/main.css +++ b/css/main.css @@ -75,7 +75,9 @@ body, html{ } .page, .main, .sidebar { - height:100%; + height:100%; + overflow-y: auto; + overflow-x: none; } .sidebar { @@ -91,10 +93,33 @@ body, html{ color: #fff; } +.sidebar ul.copayer-list { + list-style-type: none; + padding:0; margin:0; +} + +.sidebar ul.copayer-list li { + margin-top: 15px; +} + +.sidebar ul.copayer-list img { + width: 30px; + height: 30px; +} + .button.small.side-bar { padding: 0.2rem 0.4rem; } +.online { + border: 3px solid #1ABC9C; +} + +.offline { + border: 3px solid gray; + opacity: 0.4; +} + .main { margin-left: 250px; padding: 1.5rem diff --git a/js/controllers/video.js b/js/controllers/video.js index 159fcc277..3544712a3 100644 --- a/js/controllers/video.js +++ b/js/controllers/video.js @@ -3,16 +3,35 @@ angular.module('copayApp.controllers').controller('VideoController', function($scope, $rootScope, $sce) { + // Cached list of copayers + $scope.copayers = $rootScope.wallet.getRegisteredPeerIds(); + + $scope.copayersList = function() { + return $rootScope.wallet.getRegisteredPeerIds(); + } + + $scope.hasVideo = function(copayer) { + return $rootScope.videoInfo[copayer.peerId]; + } + + $scope.isConnected = function(copayer) { + return $rootScope.wallet.getOnlinePeerIDs().indexOf(copayer.peerId) != -1; + } + + $scope.isBackupReady = function(copayer) { + return $rootScope.wallet.publicKeyRing.isBackupReady(copayer.copayerId); + } + $scope.getVideoURL = function(copayer) { if (config.disableVideo) return; - var vi = $rootScope.videoInfo[copayer] - if (!vi) return; + var vi = $scope.videoInfo[copayer.peerId]; + if (!vi) return; - if ($rootScope.wallet.getOnlinePeerIDs().indexOf(copayer) === -1) { + if ($scope.isConnected(copayer)) { // peer disconnected, remove his video - delete $rootScope.videoInfo[copayer] - return; + delete $rootScope.videoInfo[copayer.peerId]; + return; } var encoded = vi.url; diff --git a/views/includes/peer-list.html b/views/includes/peer-list.html new file mode 100644 index 000000000..764f200d8 --- /dev/null +++ b/views/includes/peer-list.html @@ -0,0 +1,28 @@ +
+
+
+ you
+ {{copayer.nick}}
+
+
-
+
+