提交 2a890706 authored 作者: João Mesquita's avatar João Mesquita 提交者: Joao Mesquita

FS-8024 Display gravatar on interface using new userVariable on mod_conference/mod_verto liveArray.

FS-8023 #resolve Add shadow to the avatar to indicate muting and talking statuses FS-8024 #resolve pass in the email to display avatar.
上级 d262f07d
...@@ -37,7 +37,8 @@ module.exports = function (grunt) { ...@@ -37,7 +37,8 @@ module.exports = function (grunt) {
port: 9001, port: 9001,
// Change this to '0.0.0.0' to access the server from outside. // Change this to '0.0.0.0' to access the server from outside.
hostname: 'localhost', hostname: 'localhost',
livereload: 35729 livereload: 35729,
protocol: 'https'
}, },
livereload: { livereload: {
options: { options: {
......
...@@ -823,6 +823,14 @@ body .modal-body .btn-group .btn.active { ...@@ -823,6 +823,14 @@ body .modal-body .btn-group .btn.active {
float: left; float: left;
} }
.chat-members .chat-members-avatar .chat-member-talking {
box-shadow: 1px 1px 9px green;
}
.chat-members .chat-members-avatar .chat-member-muted {
box-shadow: 1px 1px 9px red;
}
.chat-members .chat-members-name { .chat-members .chat-members-name {
margin: 0; margin: 0;
font-size: 16px; font-size: 16px;
......
...@@ -17,8 +17,8 @@ var vertoApp = angular.module('vertoApp', [ ...@@ -17,8 +17,8 @@ var vertoApp = angular.module('vertoApp', [
'ui.gravatar', 'ui.gravatar',
]); ]);
vertoApp.config(['$routeProvider', vertoApp.config(['$routeProvider', 'gravatarServiceProvider',
function($routeProvider) { function($routeProvider, gravatarServiceProvider) {
$routeProvider. $routeProvider.
when('/login', { when('/login', {
title: 'Login', title: 'Login',
...@@ -48,6 +48,10 @@ vertoApp.config(['$routeProvider', ...@@ -48,6 +48,10 @@ vertoApp.config(['$routeProvider',
otherwise({ otherwise({
redirectTo: '/login' redirectTo: '/login'
}); });
gravatarServiceProvider.defaults = {
default: 'mm' // Mystery man as default for missing avatars
};
} }
]); ]);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* Controllers */ /* Controllers */
var vertoControllers = angular.module('vertoControllers', ['ui.bootstrap', var vertoControllers = angular.module('vertoControllers', ['ui.bootstrap',
'vertoService', 'storageService' 'vertoService', 'storageService', 'ui.gravatar'
]); ]);
...@@ -531,7 +531,8 @@ vertoControllers.controller('ChatController', ['$scope', '$rootScope', '$http', ...@@ -531,7 +531,8 @@ vertoControllers.controller('ChatController', ['$scope', '$rootScope', '$http',
'number': member[1][1], 'number': member[1][1],
'name': member[1][2], 'name': member[1][2],
'codec': member[1][3], 'codec': member[1][3],
'status': JSON.parse(member[1][4]) 'status': JSON.parse(member[1][4]),
'email': member[1][5].email
}; };
} }
......
...@@ -624,7 +624,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -624,7 +624,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
useCamera: data.selectedVideo, useCamera: data.selectedVideo,
useMic: data.selectedAudio, useMic: data.selectedAudio,
dedEnc: data.useDedenc, dedEnc: data.useDedenc,
mirrorInput: data.mirrorInput mirrorInput: data.mirrorInput,
userVariables: {
email : storage.data.email
}
}); });
data.call = call; data.call = call;
...@@ -657,7 +660,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -657,7 +660,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
useVideo: data.useVideo, useVideo: data.useVideo,
screenShare: true, screenShare: true,
dedEnc: data.useDedenc, dedEnc: data.useDedenc,
mirrorInput: data.mirrorInput mirrorInput: data.mirrorInput,
userVariables: {
email : storage.data.email
}
}); });
data.shareCall = call; data.shareCall = call;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div ng-repeat="member in members" class="chat-member-item"> <div ng-repeat="member in members" class="chat-member-item">
<span class="chat-members-avatar"> <span class="chat-members-avatar">
<img /> <img gravatar-size="40" gravatar-src-once="member.email" class="img-circle" ng-class="{'chat-member-talking': member.status.audio.talking, 'chat-member-muted': member.status.audio.muted}" />
</span> </span>
<h4 class="chat-members-name">{{ member.name }}</h4> <h4 class="chat-members-name">{{ member.name }}</h4>
<div class="pull-right action-buttons chat-members-action" ng-show="verto.data.confRole == 'moderator'"> <div class="pull-right action-buttons chat-members-action" ng-show="verto.data.confRole == 'moderator'">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论