kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #981 in FS/freeswitch from ~WALDYR/freeswitch:FS-8958-no-controls-for-moderator-on-secondary-canvas to master

Browse Source 
* commit 'baba2acdce2caa1802cae07b8c1936291efb4dec':
  FS-8958 [verto_communicator] Fix no layout controls for moderator on secondary canvas
This commit is contained in:
Italo Rossi 2016-09-28 09:51:27 -05:00
commit 6e02ca919f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
html5/verto/verto_communicator/src/partials/video_call.html
View File

@ -1,6 +1,6 @@
<div class="panel panel-default shadow-z-0"> <div class="panel panel-default shadow-z-0">
<div class="video-wrapper"> <div class="video-wrapper">
<div class="video-hover-buttons" ng-show="verto.data.callState == 'active' && !watcher"> <div class="video-hover-buttons" ng-show="verto.data.callState == 'active'">
<div id="moderator-tools" ng-show="verto.data.confRole == 'moderator'"> <div id="moderator-tools" ng-show="verto.data.confRole == 'moderator'">
<button tooltip-placement="bottom" tooltip-title="{{'MESSAGE_PLAY' | translate}}" uib-tooltip="{{'MESSAGE_PLAY' | translate}}" <button tooltip-placement="bottom" tooltip-title="{{'MESSAGE_PLAY' | translate}}" uib-tooltip="{{'MESSAGE_PLAY' | translate}}"
class="btn btn-material-blue-900" ng-click="play()"> class="btn btn-material-blue-900" ng-click="play()">
@ -31,7 +31,7 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li ng-repeat="layout in verto.data.confLayouts"> <li ng-repeat="layout in verto.data.confLayouts">
<a ng-click="confChangeVideoLayout(layout)" ng-class="{ 'selected': layout == videoLayout }">{{ layout }}</a> <a ng-click="confChangeVideoLayout(layout, canvasID)" ng-class="{ 'selected': layout == videoLayout }">{{ layout }}</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -71,7 +71,7 @@
<button tooltips="" tooltip-title="Dialpad" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-900" ng-click="toggleDialpad()"> <button tooltips="" tooltip-title="Dialpad" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-900" ng-click="toggleDialpad()">
<i class="big-icon mdi-communication-dialpad"></i> <i class="big-icon mdi-communication-dialpad"></i>
</button> </button>
<div class="btn-group" ng-show="conf.canvasCount > 1"> <div class="btn-group" ng-show="conf.canvasCount > 1 && !watcher">
<button tooltip-placement="bottom" tooltip-title="{{'MESSAGE_POPUP' | translate}}" uib-tooltips="{{'MESSAGE_POPUP' | translate}}" type="button" class="btn btn-material-blue-900 dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button tooltip-placement="bottom" tooltip-title="{{'MESSAGE_POPUP' | translate}}" uib-tooltips="{{'MESSAGE_POPUP' | translate}}" type="button" class="btn btn-material-blue-900 dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="mdi-image-filter-none"></i> <i class="mdi-image-filter-none"></i>
<span class="caret"></span> <span class="caret"></span>

4
html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js
View File

@ -71,8 +71,8 @@
storage.data.mutedMic = !storage.data.mutedMic; storage.data.mutedMic = !storage.data.mutedMic;
} }
$scope.confChangeVideoLayout = function(layout) { $scope.confChangeVideoLayout = function(layout, canvasID) {
verto.data.conf.setVideoLayout(layout); verto.data.conf.setVideoLayout(layout, canvasID);
$scope.videoLayout = layout; $scope.videoLayout = layout;
$rootScope.$emit('changedVideoLayout', layout); $rootScope.$emit('changedVideoLayout', layout);
}; };