various style and wording fixes

This commit is contained in:
Manuel Araoz 2014-04-29 18:20:44 -03:00
parent 1f2d050700
commit a9eb53e90f
4 changed files with 13 additions and 5 deletions

View File

@ -20,8 +20,7 @@
<div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
<div class="large-4 medium-4 columns line-dashed-v">
<a href="#/peer" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
<span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
<span ng-if="$root.wallet.name">{{$root.wallet.name}}</span>
<strong><span>{{$root.getWalletDisplay()}}</span></strong>
</a>
<a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
</div>
@ -99,9 +98,10 @@
<div id="footer" data-ng-controller="FooterController" ng-show="$root.wallet">
<link rel="stylesheet" ng-href="{{theme}}">
<div class="large-4 columns">
<span class="size-12">Copayers
{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</span>
<div class="row">
<span class="size-12">
{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet
</span>
</div>
<div class="large-8 columns text-right">
<a class="size-12" ng-if="themes.length > 1" ng-click="change_theme(th)" ng-repeat="th in themes">{{th}} {{$last ? '' : '&middot; '}}</a>

View File

@ -12,6 +12,11 @@ angular.module('copay.controllerUtils')
return trusted;
};
$rootScope.getWalletDisplay = function() {
var w = $rootScope.wallet;
return w && (w.name || w.id);
};
root.logout = function() {
console.log('### DELETING WALLET'); //TODO
$rootScope.wallet = null;

View File

@ -7,6 +7,7 @@ var Video = function() {
this.mediaConnections = {};
this.localStream = null;
this.onlineSound = new Audio('../../sound/online.wav');
};
Video.prototype.setOwnPeer = function(peer, wallet, cb) {
@ -50,10 +51,12 @@ Video.prototype.callPeer = function(peerID, cb) {
};
Video.prototype._addCall = function(mediaConnection, cb) {
var self = this;
var peerID = mediaConnection.peer;
// Wait for stream on the call, then set peer video display
mediaConnection.on('stream', function(stream) {
self.onlineSound.play();
cb(null, peerID, URL.createObjectURL(stream));
});

BIN
sound/online.wav Normal file

Binary file not shown.