FS-8616 [verto_communicator] - A new menu for moderator, added Gain buttons and remov...

diff --git a/html5/verto/verto_communicator/src/css/verto.css b/html5/verto/verto_communicator/src/css/verto.css
index 84666c880a18ae5c9b43f7490e0fb76d61b8243e..4da5f19cc134e9f6fd9c2b91577d86f70cceff17 100644 (file)
--- 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 afe85c1af711d5f8d7814c7730b36b139e472755..c769b70a9f2d26652b6c34adbd36baa561dfeb9b 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/chat.html
+++ b/html5/verto/verto_communicator/src/partials/chat.html
@@ -17,12 +17,12 @@
       <p class="text-center text-muted">There are no members to show.</p>
     </div>
 
-    <div ng-repeat="member in members" class="chat-member-item">
+    <div ng-repeat="member in members" class="chat-member-item" ng-class="{ opened: $index == openId }">
       <span class="chat-members-avatar">
         <img gravatar-size="40" gravatar-src="::member.email" class="img-circle" ng-class="{'chat-member-talking': member.status.audio.talking, 'chat-member-muted': member.status.audio.muted}" />
       </span>
       <!-- FIXME(italo): Put this whole block in a flex box to avoid defining fixed width.-->
-      <h4 class="chat-members-name">
+      <h4 class="chat-members-name" ng-class="{ 'clickable': verto.data.confRole == 'moderator' }" ng-click="toggleModMenu($index)">
         <div class="ellipsis members-name">{{ member.name }}</div>
        <small class="ellipsis members-number">({{ member.number }})</small>
 
@@ -33,107 +33,143 @@
        </div>
       </h4>
 
-      <div class="pull-right action-buttons chat-members-action" ng-show="verto.data.confRole == 'moderator'">
+      <div class="pull-right resevartion-menu chat-members-action" ng-show="verto.data.confRole == 'moderator' && resIDs.length > 0">
         <div class="btn-group">
           <button type="button" class="btn btn-xs dropdown-toggle" data-toggle="dropdown">
-            <i class="mdi-navigation-more-vert dark" style="margin-right: 0px;"></i>
+            <i class="mdi-action-picture-in-picture icon" style="margin-right: 0px;"></i>
           </button>
           <ul class="dropdown-menu slidedown pull-right">
-            <li>
-              <a href="" ng-click="confKick(member.id)">
-                <span class="mdi-fw mdi-av-not-interested"></span>
-                Kick
+            <li ng-repeat="resID in resIDs">
+              <a href="" class="text-capitalize" ng-class="{ 'selected': resID == member.status.video.reservationID }" ng-click="confResID(member.id, resID)">
+                {{ resID }}
               </a>
             </li>
-            <li>
-              <a href="" ng-click="confMuteMic(member.id)">
-                <span class="mdi-fw mdi-av-mic-off"></span>
-                Mute/Unmute Mic
+          </ul>
+        </div>
+      </div>
+
+      <span class="chat-members-status pull-right">
+        <i ng-click="confMuteMic(member.id)" class="in-use" ng-class="{'clickable': verto.data.confRole == 'moderator', 'mdi-av-mic': !member.status.audio.muted, 'mdi-av-mic-off': member.status.audio.muted, 'mic_talking': member.status.audio.talking}"></i>
+        <i ng-click="confMuteVideo(member.id)" ng-class="{'clickable': verto.data.confRole == 'moderator', 'mdi-av-videocam': !member.status.video.muted, 'mdi-av-videocam-off': member.status.video.muted, 'in-use': (member.status.video && !member.status.video.muted), 'disabled': !member.status.video}"></i>
+      </span>
+
+      <div class="admin-controls" ng-if="verto.data.confRole == 'moderator'" ng-show="$index == $parent.openId">
+        <div>
+          <div class="col-md-6 ctrl-section">
+            <h3>General</h3>
+            <div class="group btn-group-justified">
+              <a href="" class="btn btn-xs" ng-click="confKick(member.id)" title="Kick">
+                <i class="mdi-fw mdi-av-not-interested"></i>
+                Kick
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confMuteVideo(member.id)">
-                <span class="mdi-fw mdi-av-videocam-off"></span>
-                Mute/Unmute Video
+              <a href="" class="btn btn-xs" ng-click="confVideoFloor(member.id)" title="Video Floor">
+                <i class="mdi-fw mdi-action-aspect-ratio"></i>
+                Floor
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confVideoFloor(member.id)">
-                <span class="mdi-fw mdi-action-aspect-ratio"></span>
-                Video Floor
+              <a href="" class="btn btn-xs" ng-click="confTransfer(member.id)" title="Transfer">
+                <i class="mdi-fw mdi-communication-call-made"></i>
+                <span style="margin-left: -9px">Transfer</span>
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confBanner(member.id)">
-                <span class="mdi-fw mdi-av-subtitles"></span>
-                Banner
+            </div>
+          </div>
+
+          <div class="col-md-6 ctrl-section">
+            <h3>Banner</h3>
+            <div class="group btn-group-justified">
+              <a href="" class="btn btn-xs" ng-click="confBanner(member.id)" title="Set">
+                <i class="mdi-fw mdi-toggle-radio-button-on"></i>
+                Set
               </a>
-            </li>
-           <li>
-              <a href="" ng-click="confResetBanner(member.id)">
-                <span class="mdi-fw mdi-content-clear"></span>
-                Reset Banner
+              <a href="" class="btn btn-xs" ng-click="confResetBanner(member.id)" title="Reset">
+                <i class="mdi-fw mdi-content-clear"></i>
+                Reset
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confVolumeDown(member.id)">
-                <span class="mdi-fw mdi-av-volume-down"></span>
-                Vol –
+            </div>
+          </div>
+        </div>
+
+        <div>
+          <div class="col-md-6 ctrl-section" ng-if="conf.canvasCount > 1">
+            <h3>Canvas</h3>
+            <div class="group btn-group-justified">
+              <a href="" class="btn btn-xs" ng-click="confCanvasIn(member.id, 'prev')" title="Canvas In">
+                <i class="mdi-fw mdi-action-open-in-browser"></i>
+                Prev
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confVolumeUp(member.id)">
-                <span class="mdi-fw mdi-av-volume-up"></span>
-                Vol +
+              <a href="" class="btn btn-xs" ng-click="confCanvasIn(member.id)" title="Canvas In">
+                <i class="mdi-fw mdi-action-open-in-browser"></i>
+                Id
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confTransfer(member.id)">
-                <span class="mdi-fw mdi-communication-call-made"></span>
-                Transfer
+              <a href="" class="btn btn-xs" ng-click="confCanvasIn(member.id, 'next')" title="Canvas In">
+                <i class="mdi-fw mdi-action-open-in-browser"></i>
+                Next
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confCanvasIn(member.id)">
-                <span class="mdi-fw  mdi-image-switch-video"></span>
-                Canvas In
+            </div>
+            <div class="group btn-group-justified">
+              <a href="" class="btn btn-xs" ng-click="confCanvasOut(member.id, 'prev')" title="Canvas Out">
+                <i class="mdi-fw mdi-fw mdi-action-system-update-tv"></i>
+                Prev
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confCanvasOut(member.id)">
-                <span class="mdi-fw mdi-action-swap-horiz"></span>
-                Canvas Out
+              <a href="" class="btn btn-xs" ng-click="confCanvasOut(member.id)" title="Canvas Out">
+                <i class="mdi-fw mdi-fw mdi-action-system-update-tv"></i>
+                Id
               </a>
-            </li>
-            <li>
-              <a href="" ng-click="confLayer(member.id)">
-                <span class="mdi-fw mdi-action-view-carousel"></span>
-                Layer
+              <a href="" class="btn btn-xs" ng-click="confCanvasOut(member.id, 'next')" title="Canvas Out">
+                <i class="mdi-fw mdi-fw mdi-action-system-update-tv"></i>
+                Next
               </a>
-            </li>
-          </ul>
-        </div>
-      </div>
+            </div>
+            <div class="group btn-group-justified">
+              <a href="" class="btn btn-xs" ng-click="confLayer(member.id, 'prev')" title="Layer">
+                <i class="mdi-fw mdi-action-view-carousel"></i>
+                Prev
+              </a>
+              <a href="" class="btn btn-xs" ng-click="confLayer(member.id)" title="Layer">
+                <i class="mdi-fw mdi-action-view-carousel"></i>
+                Id
+              </a>
+              <a href="" class="btn btn-xs" ng-click="confLayer(member.id, 'next')" title="Layer">
+                <i class="mdi-fw mdi-action-view-carousel"></i>
+                Next
+              </a>
+            </div>
+          </div>
 
-      <div class="pull-right resevartion-menu chat-members-action" ng-show="verto.data.confRole == 'moderator' && resIDs.length > 0">
-        <div class="btn-group">
-          <button type="button" class="btn btn-xs dropdown-toggle" data-toggle="dropdown">
-            <i class="mdi-action-picture-in-picture icon" style="margin-right: 0px;"></i>
-          </button>
-          <ul class="dropdown-menu slidedown pull-right">
-            <li ng-repeat="resID in resIDs">
-              <a href="" class="text-capitalize" ng-class="{ 'selected': resID == member.status.video.reservationID }" ng-click="confResID(member.id, resID)">
-                {{ resID }}
+          <div class="col-md-6 ctrl-section">
+            <h3>Audio/Video</h3>
+            <div class="group btn-group-justified">
+              <a href="" class="btn btn-xs" ng-click="confMuteMic(member.id)" title="Mute/Unmute Mic">
+                <i class="mdi-fw" ng-class="member.status.audio.muted ? 'mdi-av-mic-off' : 'mdi-av-mic'"></i>
+                {{ member.status.audio.muted ? 'Unmute' : 'Mute' }}
               </a>
-            </li>
-          </ul>
+              <a href="" ng-class="{ 'disabled': !member.status.video }" class="btn btn-xs" ng-click="confMuteVideo(member.id)" title="Mute/Unmute Video">
+                <i class="mdi-fw" ng-class="member.status.video.muted ? 'mdi-av-videocam-off' : 'mdi-av-videocam'"></i>
+                {{ member.status.video.muted ? 'Unmute' : 'Mute' }}
+              </a>
+            </div>
+            <div class="group btn-group-justified">
+              <a href="" class="btn btn-xs" ng-click="confVolumeDown(member.id)" title="Vol –">
+                <i class="mdi-fw mdi-av-volume-down"></i>
+                Vol –
+              </a>
+              <a href="" class="btn btn-xs" ng-click="confVolumeUp(member.id)" title="Vol +">
+                <i class="mdi-fw mdi-av-volume-up"></i>
+                Vol +
+              </a>
+            </div>
+            <div class="group btn-group-justified">
+              <a href="" class="btn btn-xs" ng-click="confGainDown(member.id)" title="Gain –">
+                <i class="mdi-fw mdi-av-volume-down"></i>
+                Gain –
+              </a>
+              <a href="" class="btn btn-xs" ng-click="confGainUp(member.id)" title="Gain +">
+                <i class="mdi-fw mdi-av-volume-up"></i>
+                Gain +
+              </a>
+            </div>
+          </div>
         </div>
       </div>
-
-      <span class="chat-members-status pull-right">
-        <i ng-click="confMuteMic(member.id)" class="in-use" ng-class="{'clickable': verto.data.confRole == 'moderator', 'mdi-av-mic': !member.status.audio.muted, 'mdi-av-mic-off': member.status.audio.muted, 'mic_talking': member.status.audio.talking}"></i>
-        <i ng-click="confMuteVideo(member.id)" ng-class="{'clickable': verto.data.confRole == 'moderator', 'mdi-av-videocam': !member.status.video.muted, 'mdi-av-videocam-off': member.status.video.muted, 'in-use': (member.status.video && !member.status.video.muted), 'disabled': !member.status.video}"></i>
-      </span>
     </div>
   </div>
 

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js
index 75947db607554dcd0607dd03faccc7f78a5d804c..74f21c946ee888c4cb182ac33c1b37d9d3d76190 100644 (file)
--- 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({