From 3df5826098176bcc0a36e02c06e68032a61090bf Mon Sep 17 00:00:00 2001 From: Jaon EarlWolf Date: Fri, 4 Dec 2015 16:05:58 -0300 Subject: [PATCH] FS-8616 [verto_communicator] - A new menu for moderator, added Gain buttons and removed the 3-dot-button, moving its behavior to member-name div --- .../verto_communicator/src/css/verto.css | 78 ++++++- .../verto_communicator/src/partials/chat.html | 204 ++++++++++-------- .../controllers/ChatController.js | 21 ++ 3 files changed, 217 insertions(+), 86 deletions(-) diff --git a/html5/verto/verto_communicator/src/css/verto.css b/html5/verto/verto_communicator/src/css/verto.css index 84666c880a..4da5f19cc1 100644 --- a/html5/verto/verto_communicator/src/css/verto.css +++ b/html5/verto/verto_communicator/src/css/verto.css @@ -952,13 +952,18 @@ body .modal-body .btn-group .btn.active { .chat-members .chat-member-item { padding: 8px 16px; - height: 56px; + min-height: 56px; +} + +.chat-members .chat-member-item.opened { + background-color: #F8F8F8; } .chat-members .chat-member-item:hover { - background-color: #E5E5E5; + background-color: #F8F8F8; } + .chat-members .chat-members-avatar { width: 40px; height: 40px; @@ -1609,3 +1614,72 @@ body:-webkit-full-screen #incall .video-footer { .watcher .spinner { top: 20%; } + +.admin-controls { + border: 1px solid rgba(204, 204, 204, 0.48); + background: #F3F3F3; + margin-top: 12px; + margin-bottom: 10px; + overflow: hidden; +} + +.admin-controls .ctrl-section { + padding: 10px 0px; + padding-bottom: 0; +} + +.admin-controls .ctrl-section:nth-child(1) { + border-right: 1px solid rgba(204, 204, 204, 0.48); +} + +.admin-controls h3 { + font-size: 9px; + margin: 0 auto; + color: #AFAFAF; + text-transform: uppercase; + font-weight: 900; + text-align: center; + margin-top: -10px; + width: 100%; + background-color: rgba(224, 224, 224, 0.53); + padding: 5px; +} + +.admin-controls .mdi-fw { + width: auto; + display: block; +} + +.admin-controls .group .btn { + box-shadow: none; + color: #607D8B; + font-size: 8px; +} + +.admin-controls .group .btn:hover { + box-shadow: none !important; +} + +.admin-controls .group .btn:active { + box-shadow: none !important; +} + +.admin-controls.ng-hide-add, .admin-controls.ng-hide-remove { + transition: 0s linear all; +} +.admin-controls.ng-hide-add-active, +.admin-controls.ng-hide-remove-active { + transition: .2s linear all; +} + +.admin-controls.ng-hide { + animation: growY .2s; +} +.admin-controls.ng-hide-remove { + animation: growY .2s reverse; +} + +@keyframes growY { + from { max-height:2000px;} + to { max-height:0px;} +} diff --git a/html5/verto/verto_communicator/src/partials/chat.html b/html5/verto/verto_communicator/src/partials/chat.html index afe85c1af7..c769b70a9f 100644 --- a/html5/verto/verto_communicator/src/partials/chat.html +++ b/html5/verto/verto_communicator/src/partials/chat.html @@ -17,12 +17,12 @@

There are no members to show.

-
+
-

+

{{ member.name }}
({{ member.number }}) @@ -33,88 +33,6 @@

-
-
- - -
-
-
diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js index 75947db607..74f21c946e 100644 --- a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js +++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js @@ -49,6 +49,11 @@ }); }); + $rootScope.$on('call.conference', function(event, data) { + $timeout(function() { + $scope.conf = verto.data.conf.params.laData; + }); + }); $rootScope.$on('changedVideoLayout', function(event, layout) { $scope.resIDs = getResByLayout(layout); @@ -176,6 +181,12 @@ /** * Public methods. */ + + $scope.toggleModMenu = function(index) { + if (verto.data.confRole != 'moderator') return; + $scope.openId = $scope.openId == index ? null : index; + }; + $scope.send = function() { // Only conferencing chat is supported for now // but still calling method with the conference prefix @@ -285,6 +296,16 @@ verto.data.conf.volumeUp(memberID); }; + $scope.confGainDown = function(memberID) { + console.log('$scope.confGainDown'); + verto.data.conf.gainDown(memberID); + }; + + $scope.confGainUp = function(memberID) { + console.log('$scope.confGainUp'); + verto.data.conf.gainUp(memberID); + }; + $scope.confTransfer = function(memberID) { console.log('$scope.confTransfer'); prompt({