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 2019/08/08 06:20:21 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2098] it is
possible to have room with all WBs removed,
'Reset WB' action menu item is added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 8b114ea [OPENMEETINGS-2098] it is possible to have room with all WBs removed, 'Reset WB' action menu item is added
8b114ea is described below
commit 8b114ea321daed55d5e2f907c262ea695becb84a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Aug 8 13:02:36 2019 +0700
[OPENMEETINGS-2098] it is possible to have room with all WBs removed, 'Reset WB' action menu item is added
---
.../web/app/Application.properties.xml | 2 ++
.../web/app/Application_ar.properties.xml | 2 ++
.../web/app/Application_bg.properties.xml | 2 ++
.../web/app/Application_bn.properties.xml | 2 ++
.../web/app/Application_ca.properties.xml | 2 ++
.../web/app/Application_cs.properties.xml | 2 ++
.../web/app/Application_da.properties.xml | 2 ++
.../web/app/Application_de.properties.xml | 2 ++
.../web/app/Application_el.properties.xml | 2 ++
.../web/app/Application_es.properties.xml | 2 ++
.../web/app/Application_fa.properties.xml | 2 ++
.../web/app/Application_fi.properties.xml | 2 ++
.../web/app/Application_fr.properties.xml | 2 ++
.../web/app/Application_gl.properties.xml | 2 ++
.../web/app/Application_he.properties.xml | 2 ++
.../web/app/Application_hu.properties.xml | 2 ++
.../web/app/Application_in.properties.xml | 2 ++
.../web/app/Application_it.properties.xml | 2 ++
.../web/app/Application_ja.properties.xml | 2 ++
.../web/app/Application_ko.properties.xml | 2 ++
.../web/app/Application_nl.properties.xml | 2 ++
.../web/app/Application_pl.properties.xml | 2 ++
.../web/app/Application_pt.properties.xml | 2 ++
.../web/app/Application_pt_BR.properties.xml | 2 ++
.../web/app/Application_ru.properties.xml | 2 ++
.../web/app/Application_sk.properties.xml | 2 ++
.../web/app/Application_sv.properties.xml | 2 ++
.../web/app/Application_th.properties.xml | 2 ++
.../web/app/Application_tr.properties.xml | 2 ++
.../web/app/Application_uk.properties.xml | 2 ++
.../web/app/Application_zh_CN.properties.xml | 2 ++
.../web/app/Application_zh_TW.properties.xml | 2 ++
.../openmeetings/web/app/WhiteboardManager.java | 21 ++++++++-----
.../apache/openmeetings/web/room/RoomPanel.java | 2 +-
.../openmeetings/web/room/menu/ActionsSubMenu.java | 35 ++++++++++++++++------
.../openmeetings/web/room/menu/RoomMenuPanel.java | 2 +-
.../web/room/menu/StartSharingButton.java | 3 +-
37 files changed, 107 insertions(+), 20 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index b9362c8..8f164c8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Choose a file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 7fea363..3b66f58 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[اختر ملف]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 9ad73a8..9f548e9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Избор на файл]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index 66d7c07..2eb95ad 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[একটি ফাইল নির্বাচন করুন]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index f2e61c6..4b83913 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Seleccioni un fitxer]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index c227b39..0537c94 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Vyber soubor]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 947f2cd..86d0542 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Vælg en fil]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 8785b7e..f0baa09 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -1002,4 +1002,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Datei auswählen]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index dd51ec8..32ce9aa 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Επιλογή Αρχείου]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 19204c5..5e92517 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -995,4 +995,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Seleccione un archivo]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 3ea4ddf..e07b65d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -989,4 +989,6 @@ target="_blank">Custom Crypt Mechanism</a>
<entry key="upload.dlg.choose.title"><![CDATA[انتخاب یک فایل]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index e0508a4..e1cda74 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Valitse tiedosto]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 1ce2cbe..8bca910 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Choisir un fichier]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 3c093b5..712d776 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Seleccione un ficheiro]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index b9362c8..8f164c8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Choose a file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 2e86822..34b3c8a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -985,4 +985,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Fájl választás]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
index 01d3b5d..1bcdf8b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Pilih file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index 3913f84..8d6e9ee 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -998,4 +998,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Scegli un file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 7ddbcec..201161a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[フィル選択]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 39dc890..d9caeda 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Choose a file]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 81bd0cf..2a9972c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Kies een bestand]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index c40d4d2..b91b3c0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Wybierz plik]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index 83492b7..eac44dc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Escolha um arquivo]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index f5e0511..4be3037 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Escolha um arquivo]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index f795366..d97628d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Выбор файла]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Преобразование...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Настройки доски]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Камера/Микрофон скорее всего не будут работать без HTTPS.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Восстановить начальную доску]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 67faafe..1851fa8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Vybrať súbor]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index e964e58..68bed31 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Välj en fil]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 6979092..7d31b33 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[เลือกไฟล์]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index c06be17..d99c4d4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Bir dosya seçin]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 0e9001c..db3a17a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[Вибрати файл]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 37a3bb5..2090abf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[选择文件]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 4a6837a..07e8e8c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -997,4 +997,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="upload.dlg.choose.title"><![CDATA[選擇一個文件]]></entry>
<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
<entry key="lbl.settings.whiteboard"><![CDATA[Whiteboard Settings]]></entry>
+ <entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment.]]></entry>
+ <entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
index 2504e24..f8d57ba 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
@@ -54,6 +54,7 @@ import com.hazelcast.core.IMap;
import com.hazelcast.map.listener.EntryAddedListener;
import com.hazelcast.map.listener.EntryRemovedListener;
import com.hazelcast.map.listener.EntryUpdatedListener;
+import com.hazelcast.util.function.Consumer;
/**
* Hazelcast based Whiteboard manager
@@ -121,13 +122,16 @@ public class WhiteboardManager implements IWhiteboardManager {
return get(roomId, null);
}
- private Whiteboards getOrCreate(Long roomId) {
+ private Whiteboards getOrCreate(Long roomId, Consumer<Whiteboards> consumer) {
if (roomId == null) {
return null;
}
Whiteboards wbs = onlineWbs.get(roomId);
if (wbs == null) {
wbs = new Whiteboards(roomId);
+ if (consumer != null) {
+ consumer.accept(wbs);
+ }
}
return wbs;
}
@@ -146,7 +150,7 @@ public class WhiteboardManager implements IWhiteboardManager {
}
bfl.add(rf.getFile());
}
- Whiteboards wbs = getOrCreate(r.getId());
+ Whiteboards wbs = getOrCreate(r.getId(), null);
for (Map.Entry<Long, List<BaseFileItem>> e : files.entrySet()) {
Whiteboard wb = add(wbs, langId);
wbs.setActiveWb(wb.getId());
@@ -162,15 +166,16 @@ public class WhiteboardManager implements IWhiteboardManager {
}
public Whiteboards get(Long roomId, Long langId) {
- Whiteboards wbs = getOrCreate(roomId);
+ Whiteboards wbs = getOrCreate(roomId, inWbs -> {
+ if (inWbs.getWhiteboards().isEmpty()) {
+ Whiteboard wb = add(inWbs, langId);
+ inWbs.setActiveWb(wb.getId());
+ update(inWbs);
+ }
+ });
if (wbs == null) {
return null;
}
- if (wbs.getWhiteboards().isEmpty()) {
- Whiteboard wb = add(wbs, langId);
- wbs.setActiveWb(wb.getId());
- update(wbs);
- }
return wbs;
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 5aadb1e..11d23dd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -237,7 +237,7 @@ public class RoomPanel extends BasePanel {
public void startDownload(AjaxRequestTarget target, byte[] bb) {
pdfWb = bb;
- download.initiate(target);
+ download.initiate((IPartialPageRequestHandler)target);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java
index 28164af..cb8d6b8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java
@@ -21,11 +21,14 @@ package org.apache.openmeetings.web.room.menu;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.isSipEnabled;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.io.Serializable;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
+import org.apache.openmeetings.web.app.WhiteboardManager;
import org.apache.openmeetings.web.common.InvitationDialog;
import org.apache.openmeetings.web.common.menu.RoomMenuItem;
import org.apache.openmeetings.web.room.RoomPanel;
@@ -33,11 +36,11 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
public class ActionsSubMenu implements Serializable {
private static final long serialVersionUID = 1L;
- private final InvitationDialog invite;
- private final SipDialerDialog sipDialer;
private final RoomPanel room;
private final RoomMenuPanel mp;
private final StartSharingButton shareBtn;
+ private InvitationDialog invite;
+ private SipDialerDialog sipDialer;
private RoomMenuItem actionsMenu;
private RoomMenuItem inviteMenuItem;
private RoomMenuItem shareMenuItem;
@@ -47,20 +50,21 @@ public class ActionsSubMenu implements Serializable {
private RoomMenuItem sipDialerMenuItem;
private RoomMenuItem downloadPngMenuItem;
private RoomMenuItem downloadPdfMenuItem;
+ private RoomMenuItem resetWb;
private final boolean visible;
public ActionsSubMenu(final RoomPanel room, final RoomMenuPanel mp, final StartSharingButton shareBtn) {
this.room = room;
this.mp = mp;
this.shareBtn = shareBtn;
- RoomInvitationForm rif = new RoomInvitationForm("form", room.getRoom().getId());
- mp.add(invite = new InvitationDialog("invite", rif));
- rif.setDialog(invite);
- mp.add(sipDialer = new SipDialerDialog("sipDialer", room));
visible = !room.getRoom().isHidden(RoomElement.ActionMenu);
}
public void init() {
+ RoomInvitationForm rif = new RoomInvitationForm("form", room.getRoom().getId());
+ mp.add(invite = new InvitationDialog("invite", rif));
+ rif.setDialog(invite);
+ mp.add(sipDialer = new SipDialerDialog("sipDialer", room));
actionsMenu = new RoomMenuItem(mp.getString("635"), null, false);
inviteMenuItem = new RoomMenuItem(mp.getString("213"), mp.getString("1489"), false) {
private static final long serialVersionUID = 1L;
@@ -127,6 +131,14 @@ public class ActionsSubMenu implements Serializable {
download(target, EXTENSION_PDF);
}
};
+ resetWb = new RoomMenuItem(mp.getString("reset.whiteboard"), mp.getString("reset.whiteboard")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getBean(WhiteboardManager.class).clean(room.getRoom().getId(), getUserId());
+ }
+ };
}
RoomMenuItem getMenu() {
@@ -137,15 +149,19 @@ public class ActionsSubMenu implements Serializable {
actionsMenu.getItems().add(applyWbMenuItem);
actionsMenu.getItems().add(applyAvMenuItem);
actionsMenu.getItems().add(sipDialerMenuItem);
- actionsMenu.getItems().add(downloadPngMenuItem);
- actionsMenu.getItems().add(downloadPdfMenuItem);
+ if (Room.Type.interview != room.getRoom().getType()) {
+ actionsMenu.getItems().add(downloadPngMenuItem);
+ actionsMenu.getItems().add(downloadPdfMenuItem);
+ actionsMenu.getItems().add(resetWb);
+ }
return actionsMenu;
}
- public void update(final boolean moder, final boolean notExternalUser, final Room r) {
+ public void update(final boolean moder, final boolean notExternalUser) {
if (!visible) {
return;
}
+ final Room r = room.getRoom();
boolean isInterview = Room.Type.interview == r.getType();
downloadPngMenuItem.setEnabled(!isInterview);
downloadPdfMenuItem.setEnabled(!isInterview);
@@ -157,6 +173,7 @@ public class ActionsSubMenu implements Serializable {
applyWbMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.whiteBoard));
applyAvMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.audio) || !room.getClient().hasRight(Room.Right.video));
sipDialerMenuItem.setEnabled(r.isSipEnabled() && isSipEnabled());
+ resetWb.setEnabled(moder);
}
private static void download(AjaxRequestTarget target, String type) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index c0b30af..808c85c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -195,7 +195,7 @@ public class RoomMenuPanel extends Panel {
exitMenuItem.setEnabled(notExternalUser);
filesMenu.setEnabled(!isInterview && room.getSidebar().isShowFiles());
boolean moder = room.getClient().hasRight(Room.Right.moderator);
- actionsSubMenu.update(moder, notExternalUser, r);
+ actionsSubMenu.update(moder, notExternalUser);
pollsSubMenu.update(moder, notExternalUser, r);
menuPanel.update(handler);
StringBuilder roomClass = new StringBuilder("room name");
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
index 3520193..1e3355a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
@@ -46,6 +46,7 @@ import org.apache.openmeetings.web.common.OmButton;
import org.apache.openmeetings.web.room.VideoSettings;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior;
import org.apache.wicket.request.resource.ResourceStreamResource;
import org.apache.wicket.util.resource.IResourceStream;
@@ -125,7 +126,7 @@ public class StartSharingButton extends OmButton {
.replace("$allowRecording", String.valueOf(room.isAllowRecording() && (0 == streamClientManager.getRecordingCount(roomId))))
.replace("$allowPublishing", String.valueOf(0 == streamClientManager.getPublishingCount(roomId)))
;
- download.initiate(target);
+ download.initiate((IPartialPageRequestHandler)target);
} catch (Exception e) {
log.error("Unexpected error while creating jnlp file", e);
}