You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/30 03:58:27 UTC
openmeetings git commit: [OPENMEETINGS-1638] pod switch is added,
basic start/stop recording buttons are added
Repository: openmeetings
Updated Branches:
refs/heads/master 99ede5cab -> 6d4cfc758
[OPENMEETINGS-1638] pod switch is added, basic start/stop recording buttons are added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6d4cfc75
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6d4cfc75
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6d4cfc75
Branch: refs/heads/master
Commit: 6d4cfc758f1d9475db9abdd9310738dc5e68d8d2
Parents: 99ede5c
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Aug 30 10:58:19 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Aug 30 10:58:19 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/room/room.js | 8 ++++++++
.../apache/openmeetings/web/room/wb/InterviewWbPanel.html | 6 ++++++
.../java/org/apache/openmeetings/web/room/wb/interviewwb.js | 9 +++++++++
3 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d4cfc75/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index d8bc471..8648727 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -230,6 +230,9 @@ var Video = (function() {
var volume = v.parent().find('.dropdown-menu.video.volume');
let slider = v.parent().find('.slider');
let prevVolume = 0;
+ if (opts.interview) {
+ v.parent().find('.ui-dialog-titlebar-collapse').hide();
+ }
vol = v.parent().find('.ui-dialog-titlebar-volume')
.on('mouseenter', function(e) {
e.stopImmediatePropagation();
@@ -305,6 +308,7 @@ var Video = (function() {
v.dialog("widget").css(_pos);
}
function _update(_c) {
+ var opts = VideoManager.getOptions();
c.screenActivities = _c.screenActivities;
c.activities = _c.activities;
if (VideoUtil.hasAudio(c)) {
@@ -313,6 +317,10 @@ var Video = (function() {
vol.hide();
v.parent().find('.dropdown-menu.video.volume').hide();
}
+ if (opts.interview && c.pod != _c.pod) {
+ c.pod = _c.pod;
+ v.dialog('option', 'appendTo', '.pod.pod-' + c.pod);
+ }
if (c.self && swf[0].update !== undefined) {
swf[0].update();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d4cfc75/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
index 11400f4..a02e1a9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
@@ -25,11 +25,17 @@
<div class="pod pod-left">
<a class="middle choose-btn" href="#" onclick="return false;" data-pod="left"><wicket:message key="910"/></a>
</div>
+ <div style="padding-top: 20px;">
+ <a class="rec-btn start" href="#" onclick="return false;"><wicket:message key="913"/></a>
+ </div>
</div>
<div class="pod-container">
<div class="pod pod-right">
<a class="middle choose-btn" href="#" onclick="return false;" data-pod="right"><wicket:message key="910"/></a>
</div>
+ <div style="padding-top: 20px;">
+ <a class="rec-btn stop" href="#" onclick="return false;"><wicket:message key="914"/></a>
+ </div>
</div>
</div>
<div id="interview-choose-video" wicket:message="title:910,data-btn-ok:54, data-btn-cancel:lbl.cancel" style="display: none">
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d4cfc75/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js
index 5cee2df..17e4123 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js
@@ -34,7 +34,16 @@ var WbArea = (function() {
sel.append($('<option></option>').text(u.attr('title')).val(u.attr('id').substr(4)));
}
choose.find('.pod-name').val($(this).data('pod'));
+ return false;
});
+ $('.pod-row .pod-container a.rec-btn.start').button({
+ disabled: true
+ , icon: "ui-icon-play"
+ });
+ $('.pod-row .pod-container a.rec-btn.stop').button({
+ disabled: true
+ , icon: "ui-icon-stop"
+ });
choose = $('#interview-choose-video');
choose.dialog({
modal: true