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:02:53 UTC
[openmeetings] branch master 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 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 95d7936 [OPENMEETINGS-2098] it is possible to have room with all WBs removed, 'Reset WB' action menu item is added
95d7936 is described below
commit 95d7936271c2c59ee5295ea9bff1e4f5e16ddb4d
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 | 1 +
.../web/app/Application_ar.properties.xml | 1 +
.../web/app/Application_bg.properties.xml | 1 +
.../web/app/Application_bn.properties.xml | 1 +
.../web/app/Application_ca.properties.xml | 1 +
.../web/app/Application_cs.properties.xml | 1 +
.../web/app/Application_da.properties.xml | 1 +
.../web/app/Application_de.properties.xml | 1 +
.../web/app/Application_el.properties.xml | 1 +
.../web/app/Application_es.properties.xml | 1 +
.../web/app/Application_fa.properties.xml | 1 +
.../web/app/Application_fi.properties.xml | 1 +
.../web/app/Application_fr.properties.xml | 1 +
.../web/app/Application_gl.properties.xml | 1 +
.../web/app/Application_he.properties.xml | 1 +
.../web/app/Application_hu.properties.xml | 1 +
.../web/app/Application_in.properties.xml | 1 +
.../web/app/Application_it.properties.xml | 1 +
.../web/app/Application_ja.properties.xml | 1 +
.../web/app/Application_ko.properties.xml | 1 +
.../web/app/Application_nl.properties.xml | 1 +
.../web/app/Application_pl.properties.xml | 1 +
.../web/app/Application_pt.properties.xml | 1 +
.../web/app/Application_pt_BR.properties.xml | 1 +
.../web/app/Application_ru.properties.xml | 1 +
.../web/app/Application_sk.properties.xml | 1 +
.../web/app/Application_sv.properties.xml | 1 +
.../web/app/Application_th.properties.xml | 1 +
.../web/app/Application_tr.properties.xml | 1 +
.../web/app/Application_uk.properties.xml | 1 +
.../web/app/Application_zh_CN.properties.xml | 1 +
.../web/app/Application_zh_TW.properties.xml | 1 +
.../openmeetings/web/app/WhiteboardManager.java | 21 +++++++-----
.../openmeetings/web/room/menu/ActionsSubMenu.java | 40 +++++++++++++++++-----
.../openmeetings/web/room/menu/RoomMenuPanel.java | 2 +-
35 files changed, 77 insertions(+), 18 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 bdc150f..0ad716f 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 3ada484..9217961 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 fd5aa18..2307981 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 8509ee6..c639112 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 561b784..975f3c8 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 0b912ff..38cada5 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 45ac3fc..723ddc8 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 3f41a5f..9ea120e 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
@@ -1003,4 +1003,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 efd69bc..2ada9a9 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 54ecb42..606e551 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
@@ -996,4 +996,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 0a50131..cba9850 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
@@ -990,4 +990,5 @@ target="_blank">Custom Crypt Mechanism</a>
<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 1d9dd1f..09f1a23 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 dc5d54b..394b611 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 6b0adc4..80157fb 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 bdc150f..0ad716f 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 ece8d78..adb0ccb 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
@@ -986,4 +986,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 927f887..c9f1a00 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 843dc73..490890a 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
@@ -999,4 +999,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 2eff887..f866a62 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 d84768c..0e2c1f7 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 d6b6613..e7df5ce 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 b8067d3..a327bf5 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 d4c6809..0b165ef 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 06d769a..f15d3e9 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 aba4413..40cdd61 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 09e2d7c..99f9016 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 c6d46a8..582497b 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 889d34c..ded2528 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 037e9bb..8836d05 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 b72d325..f25e329 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,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 d268c4e..2284158 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 83c0aac..2d18c7d 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
@@ -998,4 +998,5 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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 e4d6681..7ced4dc 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
@@ -53,6 +53,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
@@ -120,13 +121,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;
}
@@ -145,7 +149,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());
@@ -161,15 +165,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/menu/ActionsSubMenu.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ActionsSubMenu.java
index 260c453..c705b5a 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,22 +21,26 @@ 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.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;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.injection.Injector;
+import org.apache.wicket.spring.injection.annot.SpringBean;
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 InvitationDialog invite;
+ private SipDialerDialog sipDialer;
private RoomMenuItem actionsMenu;
private RoomMenuItem inviteMenuItem;
private RoomMenuItem shareMenuItem;
@@ -46,19 +50,23 @@ public class ActionsSubMenu implements Serializable {
private RoomMenuItem sipDialerMenuItem;
private RoomMenuItem downloadPngMenuItem;
private RoomMenuItem downloadPdfMenuItem;
+ private RoomMenuItem resetWb;
private final boolean visible;
+ @SpringBean
+ private WhiteboardManager wbManager;
public ActionsSubMenu(final RoomPanel room, final RoomMenuPanel mp) {
+ Injector.get().inject(this);
this.room = room;
this.mp = mp;
- 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;
@@ -125,6 +133,15 @@ 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) {
+ wbManager.clean(room.getRoom().getId(), getUserId());
+ download(target, EXTENSION_PDF);
+ }
+ };
}
RoomMenuItem getMenu() {
@@ -135,15 +152,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);
@@ -155,6 +176,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 b4ba5f7..3083cb7 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
@@ -206,7 +206,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");