diff --git a/html5/verto/verto_communicator/Gruntfile.js b/html5/verto/verto_communicator/Gruntfile.js index 7eb7a9db3e..5e21d6fd6e 100644 --- a/html5/verto/verto_communicator/Gruntfile.js +++ b/html5/verto/verto_communicator/Gruntfile.js @@ -37,7 +37,8 @@ module.exports = function (grunt) { port: 9001, // Change this to '0.0.0.0' to access the server from outside. hostname: 'localhost', - livereload: 35729 + livereload: 35729, + protocol: 'https' }, livereload: { options: { diff --git a/html5/verto/verto_communicator/css/verto.css b/html5/verto/verto_communicator/css/verto.css index 94da288fbf..19c9ea9b73 100644 --- a/html5/verto/verto_communicator/css/verto.css +++ b/html5/verto/verto_communicator/css/verto.css @@ -823,6 +823,14 @@ body .modal-body .btn-group .btn.active { 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 { margin: 0; font-size: 16px; diff --git a/html5/verto/verto_communicator/js/app.js b/html5/verto/verto_communicator/js/app.js index f30cd2d4ce..98a4d4931f 100644 --- a/html5/verto/verto_communicator/js/app.js +++ b/html5/verto/verto_communicator/js/app.js @@ -17,8 +17,8 @@ var vertoApp = angular.module('vertoApp', [ 'ui.gravatar', ]); -vertoApp.config(['$routeProvider', - function($routeProvider) { +vertoApp.config(['$routeProvider', 'gravatarServiceProvider', + function($routeProvider, gravatarServiceProvider) { $routeProvider. when('/login', { title: 'Login', @@ -48,6 +48,10 @@ vertoApp.config(['$routeProvider', otherwise({ redirectTo: '/login' }); + + gravatarServiceProvider.defaults = { + default: 'mm' // Mystery man as default for missing avatars + }; } ]); diff --git a/html5/verto/verto_communicator/js/controllers.js b/html5/verto/verto_communicator/js/controllers.js index e7f55fe119..cdbed5c75e 100644 --- a/html5/verto/verto_communicator/js/controllers.js +++ b/html5/verto/verto_communicator/js/controllers.js @@ -3,7 +3,7 @@ /* Controllers */ var vertoControllers = angular.module('vertoControllers', ['ui.bootstrap', - 'vertoService', 'storageService' + 'vertoService', 'storageService', 'ui.gravatar' ]); @@ -531,7 +531,8 @@ vertoControllers.controller('ChatController', ['$scope', '$rootScope', '$http', 'number': member[1][1], 'name': member[1][2], 'codec': member[1][3], - 'status': JSON.parse(member[1][4]) + 'status': JSON.parse(member[1][4]), + 'email': member[1][5].email }; } diff --git a/html5/verto/verto_communicator/js/verto-service.js b/html5/verto/verto_communicator/js/verto-service.js index c319f45862..c81e4b3fb8 100644 --- a/html5/verto/verto_communicator/js/verto-service.js +++ b/html5/verto/verto_communicator/js/verto-service.js @@ -624,7 +624,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora useCamera: data.selectedVideo, useMic: data.selectedAudio, dedEnc: data.useDedenc, - mirrorInput: data.mirrorInput + mirrorInput: data.mirrorInput, + userVariables: { + email : storage.data.email + } }); data.call = call; @@ -657,7 +660,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora useVideo: data.useVideo, screenShare: true, dedEnc: data.useDedenc, - mirrorInput: data.mirrorInput + mirrorInput: data.mirrorInput, + userVariables: { + email : storage.data.email + } }); data.shareCall = call; diff --git a/html5/verto/verto_communicator/partials/chat.html b/html5/verto/verto_communicator/partials/chat.html index 928b690fbe..dea02ff15c 100644 --- a/html5/verto/verto_communicator/partials/chat.html +++ b/html5/verto/verto_communicator/partials/chat.html @@ -19,7 +19,7 @@
- +

{{ member.name }}