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/02/27 09:28:20 UTC
[openmeetings] branch csp updated: [OPENMEETINGS-2165]
wait-moderator is converted
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/csp by this push:
new e655bd3 [OPENMEETINGS-2165] wait-moderator is converted
e655bd3 is described below
commit e655bd36afe442dc0c4df38e08b5fe07b048af94
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Feb 27 16:28:03 2020 +0700
[OPENMEETINGS-2165] wait-moderator is converted
---
.../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 +
.../apache/openmeetings/web/room/RoomPanel.html | 2 +-
.../apache/openmeetings/web/room/RoomPanel.java | 23 +++++++--
.../openmeetings/web/room/WaitModeratorDialog.html | 25 ----------
.../openmeetings/web/room/WaitModeratorDialog.java | 57 ----------------------
.../web/room/WaitModeratorDialog_ru.html | 25 ----------
.../openmeetings/web/user/chat/ChatPanel.java | 7 +--
.../web/user/profile/InvitationsPanel.java | 2 +-
.../web/user/profile/MessagesContactsPanel.java | 5 +-
openmeetings-web/src/main/webapp/css/raw-chat.css | 2 +-
openmeetings-web/src/main/webapp/css/raw-room.css | 13 +++++
openmeetings-web/src/main/webapp/css/raw-wb.css | 18 +++++--
43 files changed, 81 insertions(+), 130 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 33e5fb9..0782c12 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 3247810..03696a1 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 05af5ac..f1ea6f8 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 c013b85..0176dea 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 f2c6d6d..14c82a9 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 02d574c..ec82664 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 cbb5cdc..026ce8b 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 1f78cb5..df93e91 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
@@ -1009,6 +1009,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 6757c6e..0289387 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 d7920d5..328d65e 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
@@ -1002,6 +1002,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 c0ae07f..5bed800 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
@@ -996,6 +996,7 @@ target="_blank">Custom Crypt Mechanism</a>
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 abdb125..e1272ce 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 f3fd3a3..fcc37ec 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 1de5b6d..f2b5450 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 33e5fb9..0782c12 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 e5ce99d..857220a 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
@@ -992,6 +992,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 aff1fd7..68cf9a6 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 77bc44f..3ade6d1 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
@@ -1005,6 +1005,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 4a9151f..ad18f21 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 78d74e7..685d1d7 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 ce5558d..b3a2f55 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 b7e060d..9ca9acb 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 5079e57..ac8f073 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 445e423..33c5651 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 92aff73..3695537 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[Никто не сможет воспользоваться комнатой пока нет модератора]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Ждать модератора]]></entry>
<entry key="wait-moderator.title"><![CDATA[Пожалуйста подождите ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Пожалуйста дождитесь появления <b>модератора</b>]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![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 a270746..0733d19 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 f70119b..a14a00a 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 8a1e9c2..4016338 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 e6015c0..021251a 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 be69584..8aee829 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
@@ -1003,6 +1003,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 974f119..5f2a9d5 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></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 d3aa414..0e0c05f 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
@@ -1004,6 +1004,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator will join]]></entry>
<entry key="admin.room.wait-moderator.label"><![CDATA[Wait moderator]]></entry>
<entry key="wait-moderator.title"><![CDATA[Please be patient ...]]></entry>
+ <entry key="wait-moderator.message"><![CDATA[Please wait until <b>moderator</b> will enter the room]]></entry>
<entry key="lbl.or"><![CDATA[or]]></entry>
<entry key="lbl.new"><![CDATA[new]]></entry>
</properties>
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 cb1f50a..0eae2c3 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
@@ -35,7 +35,7 @@
<div wicket:id="wait-recording"></div>
<div wicket:id="nickname"></div>
<div wicket:id="client-kicked"></div>
- <div wicket:id="wait-moderator"></div>
+ <div wicket:id="wait-moderator" class="wait-moder"></div>
<div wicket:id="wait-apply-moderation"></div>
<div wicket:id="noone-can-help"></div>
</div>
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 94f4cd2..0b89833 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
@@ -84,6 +84,8 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.protocol.ws.api.BaseWebSocketBehavior;
import org.apache.wicket.protocol.ws.api.event.WebSocketPushPayload;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -108,6 +110,8 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Alert;
+
@AuthorizeInstantiation("Room")
public class RoomPanel extends BasePanel {
private static final long serialVersionUID = 1L;
@@ -190,7 +194,7 @@ public class RoomPanel extends BasePanel {
};
private RedirectMessageDialog roomClosed;
private MessageDialog clientKicked, nooneCanHelp, waitApplyModeration;
- private WaitModeratorDialog waitModerator;
+ private Alert waitModerator;
private RoomMenuPanel menu;
private RoomSidebar sidebar;
@@ -279,7 +283,7 @@ public class RoomPanel extends BasePanel {
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
- behavior.setOption("hoverClass", Options.asString("ui-state-hover"));
+ behavior.setOption("hoverClass", Options.asString("droppable-hover"));
behavior.setOption("accept", Options.asString(".recorditem, .fileitem, .readonlyitem"));
}
@@ -601,9 +605,9 @@ public class RoomPanel extends BasePanel {
getMainPanel().getChat().toggle(handler, moderInRoom && !r.isHidden(RoomElement.Chat));
if (room.isVisible()) {
handler.appendJavaScript(roomEnter.getCallbackScript());
- waitModerator.close(handler, null);
+ handler.add(waitModerator.setVisible(false));
} else {
- waitModerator.open(handler);
+ handler.add(waitModerator.setVisible(true));
}
}
}
@@ -822,7 +826,16 @@ public class RoomPanel extends BasePanel {
}
private void createWaitModerator(final boolean autoopen) {
- waitModerator = new WaitModeratorDialog("wait-moderator", getString("wait-moderator.title"), autoopen);
+ waitModerator = new Alert("wait-moderator", new ResourceModel("wait-moderator.message"), new ResourceModel("wait-moderator.title")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected Component createMessage(String markupId, IModel<String> message) {
+ return super.createMessage(markupId, message).setEscapeModelStrings(false);
+ }
+ };
+ waitModerator.type(Alert.Type.Warning).setCloseButtonVisible(false);
+ waitModerator.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true).setVisible(autoopen);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog.html
deleted file mode 100644
index fd5949b..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
-<wicket:panel>
- Please wait until <b>moderator</b> will enter the room
-</wicket:panel>
-</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog.java
deleted file mode 100644
index 9b217c0..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.room;
-
-import java.util.List;
-
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
-
-public class WaitModeratorDialog extends AbstractDialog<String> {
- private static final long serialVersionUID = 1L;
- private final boolean autoopen;
-
- public WaitModeratorDialog(String id, String title, boolean autoopen) {
- super(id, title);
- this.autoopen = autoopen;
- }
-
- @Override
- public void onConfigure(JQueryBehavior behavior) {
- super.onConfigure(behavior);
- behavior.setOption("classes", "{'ui-dialog-titlebar': 'ui-corner-all no-close'}");
- behavior.setOption("closeOnEscape", false);
- behavior.setOption("autoOpen", autoopen);
- behavior.setOption("appendTo", Options.asString(".room-block"));
- }
-
- @Override
- protected List<DialogButton> getButtons() {
- return List.of();
- }
-
- @Override
- public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
- // no-op
- }
-}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog_ru.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog_ru.html
deleted file mode 100644
index 6dd59eb..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/WaitModeratorDialog_ru.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
-<wicket:panel>
- Пожалуйста дождитесь появления <b>модератора</b>
-</wicket:panel>
-</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
index 6b3b2d1..45b0611 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
@@ -86,12 +86,7 @@ public class ChatPanel extends Panel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
if (!chat.isShowDashboardChat()) {
- StringBuilder sb = new StringBuilder();
- sb.append("$(document).ready(function(){");
- sb.append("$('#ui-id-1').hide();");
- sb.append("$('#chatPanel,#chat').hide();");
- sb.append("});");
- response.render(OnDomReadyHeaderItem.forScript(sb.toString()));
+ response.render(OnDomReadyHeaderItem.forScript("$('#chatPanel,#chat').hide();"));
}
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.java
index 27a405c..49e796c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.java
@@ -104,7 +104,7 @@ public class InvitationsPanel extends UserBasePanel {
Long id = i.getId();
StringBuilder sb = new StringBuilder(ROW_CLASS);
if (id != null && id.equals(selected)) {
- sb.append(" ui-state-default");
+ sb.append(" selected");
}
return sb;
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index 27f0ed4..757d4d7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -301,10 +301,7 @@ public class MessagesContactsPanel extends UserBasePanel {
});
StringBuilder cssClass = new StringBuilder(m.getIsRead() ? "" : CSS_UNREAD);
if (selectedMessages.contains(id)) {
- if (cssClass.length() > 0) {
- cssClass.append(" ");
- }
- cssClass.append("ui-state-active");
+ cssClass.append(" selected");
}
item.add(AttributeModifier.replace(ATTR_CLASS, cssClass.toString()));
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css b/openmeetings-web/src/main/webapp/css/raw-chat.css
index 5507d0d..4a6d4e2 100644
--- a/openmeetings-web/src/main/webapp/css/raw-chat.css
+++ b/openmeetings-web/src/main/webapp/css/raw-chat.css
@@ -154,7 +154,7 @@ html[dir="rtl"] .main.room #chatPanel {
transform-origin: -15% 68% 0;
position: absolute;
top: 0;
- right: -73px;
+ right: -67px;
}
.main.room #chatPanel.closed #chatPopup #chat {
display: none;
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css b/openmeetings-web/src/main/webapp/css/raw-room.css
index f45c347..5f50fe0 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -316,6 +316,19 @@ html[dir="rtl"] .room-block .sidebar {
{
width: 40px;
}
+.room-block .wait-moder {
+ position: fixed;
+ bottom: 30px;
+ right: 30px;
+}
+.room-block.small .wait-moder {
+ font-size: 120%;
+}
+.room-block .wait-moder strong {
+ display: block;
+ padding-bottom: 20px;
+}
+
/************ VIDEO **************/
.ui-dialog.video, .ui-dialog.video .ui-dialog-titlebar, .ui-dialog.video .ui-dialog-content {
padding: 0;
diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css b/openmeetings-web/src/main/webapp/css/raw-wb.css
index a3b0a69..d38d236 100644
--- a/openmeetings-web/src/main/webapp/css/raw-wb.css
+++ b/openmeetings-web/src/main/webapp/css/raw-wb.css
@@ -10,26 +10,34 @@ html[dir="rtl"] .room-block .wb-block {
right: calc(var(--room-sidebar-width) + var(--buffer-size));
left: auto;
}
-.room-block .wb-block.ui-state-hover {
+.room-block .wb-block.droppable-hover {
border: 0;
}
.room-block .wb-block .wb-area {
height: 100%;
}
-.room-block .wb-block.ui-state-hover .wb-area {
+.room-block .wb-block.droppable-hover .wb-area {
visibility: hidden;
height: 1px !important;
}
.room-block .wb-block .wb-drop-area {
display: none;
}
-.room-block .wb-block.ui-state-hover .wb-drop-area {
- background-image: url(images/drop.png);
+.room-block .wb-block.droppable-hover .wb-drop-area {
display: block;
- background-repeat: no-repeat;
height: inherit;
background-position: center;
}
+.room-block .wb-block.droppable-hover .wb-drop-area::before {
+ font-family: 'Font Awesome 5 Free';
+ font-weight: 400;
+ font-size: 20em;
+ content: '\f358';
+ display: inline-block;
+ width: 100%;
+ text-align: center;
+ color: var(--success);
+}
.room-block .wb-block .tabs {
height: calc(100% - var(--buffer-size));
}