]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8263 #resolve [verto_communicator] floor and presenter badges
authorStefan Yohansson <stefan@evolux.net.br>
Fri, 2 Oct 2015 12:52:48 +0000 (09:52 -0300)
committerStefan Yohansson <stefan@evolux.net.br>
Fri, 2 Oct 2015 12:52:48 +0000 (09:52 -0300)
html5/verto/verto_communicator/src/css/verto.css
html5/verto/verto_communicator/src/partials/chat.html

index 5df89dabd3793583dd3f3d105f38468adea2dd11..1bb445118c1bd0c0661e8e1032b11bb3a483532e 100644 (file)
@@ -892,10 +892,14 @@ body .modal-body .btn-group .btn.active {
   width: 160px;
   overflow: hidden;
   text-overflow: ellipsis;
-  margin-top: 5px;
   white-space: nowrap;
 }
 
+.members-badges {
+  font-size: 10px;
+  text-transform: uppercase;
+}
+
 .chat-members .chat-member-item {
   padding: 8px 16px;
   height: 56px;
@@ -927,7 +931,7 @@ body .modal-body .btn-group .btn.active {
   margin: 0;
   font-size: 16px;
   display: inline-block;
-  line-height: 18px;
+  line-height: 14px;
 }
 
 .chat-members .chat-members-status i {
index 3168e9d34a6bd77c5c95f8ad8927b2ffecefe043..a717c5d53465820022f4d650c6c91187b883ec29 100644 (file)
         <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>
       <!-- FIXME(italo): Put this whole block in a flex box to avoid defining fixed width.-->
-      <h4 class="chat-members-name"><div class="members-name">{{ member.name }}</div> <small class="ellipsis">({{ member.number }})</small></h4>
+      <h4 class="chat-members-name">
+        <div class="members-name">{{ member.name }}</div> 
+       <small class="ellipsis">({{ member.number }})</small>
+       
+       <div class="members-badges">
+         <div ng-if="member.status.video.floor" class="label" ng-class="{'label-danger': member.status.video.floorLocked, 'label-info': !member.status.video.floorLocked}">Floor</div>
+          <div ng-if="member.status.video.reservationID == 'presenter'" class="label label-warning">Presenter</div>
+       </div>
+      </h4>
+      
       <div class="pull-right action-buttons chat-members-action" ng-show="verto.data.confRole == 'moderator'">
         <div class="btn-group">
           <button type="button" class="btn btn-xs dropdown-toggle" data-toggle="dropdown">