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 2020/09/30 14:07:20 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2451] don't ask
again should be fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 0f2e5d3 [OPENMEETINGS-2451] don't ask again should be fixed
0f2e5d3 is described below
commit 0f2e5d36f8baf51b2498927eeabf59f5ba13c0e4
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Sep 30 21:07:04 2020 +0700
[OPENMEETINGS-2451] don't ask again should be fixed
---
.../src/main/java/org/apache/openmeetings/web/room/RoomPanel.html | 6 +++---
.../main/java/org/apache/openmeetings/web/room/raw-video-manager.js | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index ef61649..17920c5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -81,11 +81,11 @@
</a>
</div>
<div id="muteothers-confirm" wicket:message="title:ulist.right.muteothers.grant, data-btn-ok:54, data-btn-cancel:lbl.cancel">
- <div class="ui-state-highlight ui-corner-all p-1">
- <span class="ui-icon ui-icon-alert align-left mr-2 mt-2 mb-3 ml-0"></span><wicket:message key="ulist.user.muteothers.confirm"/>
+ <div class="text-warning p-1">
+ <i class="m-2 warn fas fa-exclamation-triangle text-warning"></i><wicket:message key="ulist.user.muteothers.confirm"/>
</div>
<br/>
- <input id="muteothers-confirm-dont-show" type="checkbox"/><label for="muteothers-confirm-dont-show"><wicket:message key="64"/></label>
+ <input id="muteothers-confirm-dont-show" type="checkbox"/><label for="muteothers-confirm-dont-show" class="mr-2 ml-2"><wicket:message key="64"/></label>
</div>
<div id="clipboard-dialog" wicket:message="title:1121,data-btn-ok:54">
<p><span class="ui-icon ui-icon-alert align-left mr-2 mt-2 mb-3 ml-0"></span><span class="text"></span></p>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
index 426a888..ad4e40f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
@@ -226,7 +226,8 @@ var VideoManager = (function() {
if (false !== s.video.confirmMuteOthers) {
const dlg = $('#muteothers-confirm');
dlg.dialog({
- buttons: [
+ appendTo: ".room-container"
+ , buttons: [
{
text: dlg.data('btn-ok')
, click: function() {
@@ -244,6 +245,8 @@ var VideoManager = (function() {
}
]
})
+ } else {
+ OmUtil.roomAction({action: 'muteOthers', uid: uid});
}
}
function _muteOthers(uid) {