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

FS-8023 #resolve Add shadow to the avatar to indicate muting and talking statuses FS-8024 #resolve pass in the email to display avatar.

diff --git a/html5/verto/verto_communicator/Gruntfile.js b/html5/verto/verto_communicator/Gruntfile.js
index 7eb7a9db3e2088772e03f23bb0be1a0f7aca0d1a..5e21d6fd6e02a5749958a7b16ecd0a3720c314d3 100644 (file)
--- 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 94da288fbf75a4fe5eba03d7c1e35bbf7595d411..19c9ea9b7328a8a49f3c910def02077938b80759 100644 (file)
--- 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 f30cd2d4cee7baeae1aed1268eacaf6a7c0f8474..98a4d4931f15a9cca0af476f4247df80428e03b0 100644 (file)
--- 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 e7f55fe1196241f34f8c17331f25e7d6d4e9b237..cdbed5c75ef56b80441457e68fc29894f8c0738b 100644 (file)
--- 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 c319f45862e6ae356c6045112f334de4b37d51be..c81e4b3fb8ba7357727cf0699c3505b54de7ebcc 100644 (file)
--- 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 928b690fbe94e96f5b3c62169b525b38dcf56dba..dea02ff15c5b36af55f08770ad031bb8ee65942a 100644 (file)
--- a/html5/verto/verto_communicator/partials/chat.html
+++ b/html5/verto/verto_communicator/partials/chat.html
@@ -19,7 +19,7 @@
 
     <div ng-repeat="member in members" class="chat-member-item">
       <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>
       <h4 class="chat-members-name">{{ member.name }}</h4>
       <div class="pull-right action-buttons chat-members-action" ng-show="verto.data.confRole == 'moderator'">