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

Merge pull request #601 in FS/freeswitch from ~ANDCOFFEECODE/freeswitch:bugfix/FS-8542-video-controls-disappear-when-you to master

Browse Source 
* commit 'b6cf1fbec41a73739a526f03559be7957a19428b':
  FS-8542 [verto_communicator] - fixed the tooltips of video controls...
This commit is contained in:
Ítalo Rossi 2015-11-17 14:40:43 -06:00
commit c918ec8c4f
4 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html5/verto/verto_communicator/bower.json
View File

@ -42,7 +42,7 @@
"jquery-cookie": "~1.4.1", "jquery-cookie": "~1.4.1",
"jquery-json": "~2.5.1", "jquery-json": "~2.5.1",
"datatables": "~1.10.8", "datatables": "~1.10.8",
"angular-bootstrap": "~0.13.3", "angular-bootstrap": "~0.14.3",
"bootstrap-material-design": "~0.3.0" "bootstrap-material-design": "~0.3.0"
}, },
"resolutions": { "resolutions": {

8
html5/verto/verto_communicator/src/css/verto.css
View File

@ -604,10 +604,6 @@ body .modal-body .btn-group .btn.active {
transition-delay:0s; transition-delay:0s;
} }
#incall .video-hover-buttons .btn-group {
margin: 0;
}
#incall .video-hover-buttons .btn-group .dropdown-menu { #incall .video-hover-buttons .btn-group .dropdown-menu {
height: 200px; height: 200px;
overflow: auto; overflow: auto;
@ -775,6 +771,10 @@ body .modal-body .btn-group .btn.active {
transition: all 0.5s ease; transition: all 0.5s ease;
} }
.tooltip-inner {
padding: 8px 8px;
background-color: #000;
}
#sidebar-wrapper { #sidebar-wrapper {
right: 360px; right: 360px;

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

@ -2,23 +2,30 @@
<div class="video-wrapper"> <div class="video-wrapper">
<div class="video-hover-buttons" ng-show="verto.data.callState == 'active'"> <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 tooltips="" tooltip-title="Play" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="play()"> <button tooltip-placement="bottom" tooltip-title="Play" uib-tooltip="Play"
class="btn btn-material-blue-900" ng-click="play()">
<i class="mdi-av-play-circle-outline"></i> <i class="mdi-av-play-circle-outline"></i>
</button> </button>
<button tooltips="" tooltip-title="Stop" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="stop()"> <button tooltip-placement="bottom" tooltip-title="Stop" uib-tooltip="Stop"
class="btn btn-material-blue-900" ng-click="stop()">
<i class="mdi-av-stop"></i> <i class="mdi-av-stop"></i>
</button> </button>
<button tooltips="" tooltip-title="Record" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="record()"> <button tooltip-placement="bottom" tooltip-title="Record" uib-tooltip="Record"
class="btn btn-material-blue-900" ng-click="record()">
<i class="mdi-toggle-radio-button-on"></i> <i class="mdi-toggle-radio-button-on"></i>
</button> </button>
<button tooltips="" tooltip-title="Stop Record" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="stopRecord()"> <button tooltip-placement="bottom" tooltip-title="Stop Record" uib-tooltip="Stop Record"
class="btn btn-material-blue-900" ng-click="stopRecord()">
<i class="mdi-image-switch-camera"></i> <i class="mdi-image-switch-camera"></i>
</button> </button>
<button tooltips="" tooltip-title="Snapshot" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="snapshot()"> <button tooltip-placement="bottom" tooltip-title="Snapshot" uib-tooltip="Snapshot"
tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="snapshot()">
<i class="mdi-image-photo-camera"></i> <i class="mdi-image-photo-camera"></i>
</button> </button>
<div class="btn-group"> <div class="btn-group">
<button tooltips="" tooltip-title="Video Mode" tooltip-side="bottom" tooltip-lazy="false" 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="Video Mode" uib-tooltip="Video Mode"
type="button" class="btn btn-material-blue-900 dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="mdi-action-view-module"></i> <i class="mdi-action-view-module"></i>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
@ -29,22 +36,28 @@
</ul> </ul>
</div> </div>
</div> </div>
<br/> <div class="user-tools">
<button tooltips="" tooltip-title="(un)Mute Mic" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="muteMic(cbMuteMic)"> <button tooltip-placement="bottom" tooltip-title="(un)Mute Mic" uib-tooltip="(un)Mute Mic"
<i class="" ng-class="{'mdi-av-mic': !verto.data.mutedMic, 'mdi-av-mic-off': verto.data.mutedMic}"></i> class="btn btn-material-blue-900" ng-click="muteMic(cbMuteMic)">
</button> <i class="" ng-class="{'mdi-av-mic': !verto.data.mutedMic, 'mdi-av-mic-off': verto.data.mutedMic}"></i>
<button tooltips="" tooltip-title="(un)Mute Video" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="muteVideo(cbMuteVideo)" ng-if="verto.data.canVideo"> </button>
<i class="" ng-class="{'mdi-av-videocam': !verto.data.mutedVideo, 'mdi-av-videocam-off': verto.data.mutedVideo}"></i> <button tooltip-placement="bottom" tooltip-title="(un)Mute Video" uib-tooltip="(un)Mute Video"
</button> class="btn btn-material-blue-900" ng-click="muteVideo(cbMuteVideo)" ng-if="verto.data.canVideo">
<button tooltips="" tooltip-title="Toggle Fullscreen Mode" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="goFullscreen()"> <i class="" ng-class="{'mdi-av-videocam': !verto.data.mutedVideo, 'mdi-av-videocam-off': verto.data.mutedVideo}"></i>
<i class="" ng-class="{'mdi-navigation-fullscreen': !fullscreenEnabled, 'mdi-navigation-fullscreen-exit': fullscreenEnabled}"></i> </button>
</button> <button tooltip-placement="bottom" tooltip-title="Toggle Fullscreen Mode" uib-tooltip="Toggle Fullscreen Mode"
<button tooltips="" tooltip-title="Screenshare" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="screenshare()"> class="btn btn-material-blue-900" ng-click="goFullscreen()">
<i class="mdi-hardware-desktop-windows"></i> <i class="" ng-class="{'mdi-navigation-fullscreen': !fullscreenEnabled, 'mdi-navigation-fullscreen-exit': fullscreenEnabled}"></i>
</button> </button>
<button tooltips="" tooltip-title="Open/Close Chat" tooltip-side="right" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="toggleChat()" ng-show="fullscreenEnabled"> <button tooltip-placement="bottom" tooltip-title="Screenshare" uib-tooltip="Screenshare"
<i class="mdi-communication-chat"></i> class="btn btn-material-blue-900" ng-click="screenshare()">
</button> <i class="mdi-hardware-desktop-windows"></i>
</button>
<button tooltip-placement="bottom" tooltip-title="Open/Close Chat" uib-tooltip="Open/Close Chat"
class="btn btn-material-blue-900" ng-click="toggleChat()" ng-show="fullscreenEnabled">
<i class="mdi-communication-chat"></i>
</button>
</div>
</div> </div>
<div class="video-tag-wrapper" id="video-tag-wrapper" ng-dblclick="goFullscreen()" show-controls> <div class="video-tag-wrapper" id="video-tag-wrapper" ng-dblclick="goFullscreen()" show-controls>
<video-tag ng-class="{'invisible': (verto.data.callState != 'active')}"></video-tag> <video-tag ng-class="{'invisible': (verto.data.callState != 'active')}"></video-tag>
@ -69,4 +82,3 @@
</div> </div>
</div> </div>
</div> </div>

1
html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js
View File

@ -15,6 +15,7 @@
'cgPrompt', 'cgPrompt',
'720kb.tooltips', '720kb.tooltips',
'ui.gravatar', 'ui.gravatar',
'ui.bootstrap',
'directive.g+signin', 'directive.g+signin',
]); ]);