kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-07 04:03:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #528 in FS/freeswitch from ~STEFAN_YOHANSSON/freeswitch:feature/FS-8263-reset-the-banner-of-a-member to master

Browse Source 
* commit 'cd67e05946e141185a9f6a67511d87e853369294':
  FS-8263 #resolve [verto_communicator] floor and presenter badges
This commit is contained in:
Ítalo Rossi 2015-10-02 07:56:03 -05:00
commit fd603e483f
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
html5/verto/verto_communicator/src/css/verto.css
View 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 {

11
html5/verto/verto_communicator/src/partials/chat.html
View File

@ -22,7 +22,16 @@
<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">