Browse Source

Mark own sessions differently then contacts.

pull/111/head
Simon Eisenmann 11 years ago
parent
commit
6ee03e47e6
  1. 3
      src/styles/components/_buddylist.scss
  2. 2
      static/css/main.min.css
  3. 6
      static/js/controllers/mediastreamcontroller.js
  4. 4
      static/partials/buddy.html

3
src/styles/components/_buddylist.scss

@ -145,6 +145,9 @@
&.contact .fa.contact:before { &.contact .fa.contact:before {
content: "\f005"; content: "\f005";
} }
&.isself .fa.contact:before {
content: "\f140";
}
.buddyPicture { .buddyPicture {
background: $actioncolor1; background: $actioncolor1;
border-radius: 2px; border-radius: 2px;

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long

6
static/js/controllers/mediastreamcontroller.js

@ -126,8 +126,8 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte
// Default scope data. // Default scope data.
$scope.status = "initializing"; $scope.status = "initializing";
$scope.id = null; $scope.id = $scope.myid = null;
$scope.userid = null; $scope.userid = $scope.myuserid = null;
$scope.suserid = null; $scope.suserid = null;
$scope.peer = null; $scope.peer = null;
$scope.dialing = null; $scope.dialing = null;
@ -365,7 +365,7 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte
$timeout.cancel(ttlTimeout); $timeout.cancel(ttlTimeout);
safeApply($scope, function(scope) { safeApply($scope, function(scope) {
scope.id = scope.myid = data.Id; scope.id = scope.myid = data.Id;
scope.userid = data.Userid ? data.Userid : null; scope.userid = scope.myuserid = data.Userid ? data.Userid : null;
scope.suserid = data.Suserid ? data.Suserid : null; scope.suserid = data.Suserid ? data.Suserid : null;
scope.turn = data.Turn; scope.turn = data.Turn;
scope.stun = data.Stun; scope.stun = data.Stun;

4
static/partials/buddy.html

@ -1,5 +1,5 @@
<div class="buddy" ng-class="{'contact': contact, 'withSubline': display.subline || session.Userid}"> <div class="buddy" ng-class="{'contact': contact, 'withSubline': display.subline || session.Userid, 'isself': session.Userid === myuserid}">
<div class="buddyPicture"><i class="fa fa-user"/><img ng-show="display.buddyPicture" alt ng-src="{{display.buddyPicture}}"/></div> <div class="buddyPicture"><i class="fa fa-user"/><img ng-show="display.buddyPicture" alt ng-src="{{display.buddyPicture}}"/></div>
<div class="buddy1">{{session.Id|displayName}}</div> <div class="buddy1">{{session.Id|displayName}}</div>
<div class="buddy2"><span ng-show="session.Userid"><i class="fa contact" data-action="contact"></i><span ng-show="session.count"> ({{session.count}})</span></span> <span title="{{display.sublineFull}}">{{display.subline}}</span></div> <div class="buddy2"><span ng-show="session.Userid"><i class="fa contact" data-action="contact" title="{{session.Userid|displayUserid}}"></i><span ng-show="session.count"> ({{session.count}})</span></span> <span title="{{display.sublineFull}}">{{display.subline}}</span></div>
</div> </div>

Loading…
Cancel
Save