You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/28 16:40:02 UTC
openmeetings git commit: [OPENMEETINGS-1768] auto-clean option is
added
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 49c2e6dc8 -> fa1a8f321
[OPENMEETINGS-1768] auto-clean option is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fa1a8f32
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fa1a8f32
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fa1a8f32
Branch: refs/heads/4.0.x
Commit: fa1a8f3216ae5ad038c8e2993a50f15fe56ed442
Parents: 49c2e6d
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Nov 28 23:39:51 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Nov 28 23:39:51 2017 +0700
----------------------------------------------------------------------
.../web/app/Application.properties.xml | 3 +-
.../web/app/Application_ar.properties.xml | 3 +-
.../web/app/Application_bg.properties.xml | 3 +-
.../web/app/Application_ca.properties.xml | 3 +-
.../web/app/Application_cs.properties.xml | 3 +-
.../web/app/Application_da.properties.xml | 3 +-
.../web/app/Application_de.properties.xml | 3 +-
.../web/app/Application_el.properties.xml | 3 +-
.../web/app/Application_es.properties.xml | 3 +-
.../web/app/Application_fa.properties.xml | 3 +-
.../web/app/Application_fi.properties.xml | 3 +-
.../web/app/Application_fr.properties.xml | 3 +-
.../web/app/Application_gl.properties.xml | 3 +-
.../web/app/Application_he.properties.xml | 3 +-
.../web/app/Application_hu.properties.xml | 3 +-
.../web/app/Application_id.properties.xml | 3 +-
.../web/app/Application_it.properties.xml | 3 +-
.../web/app/Application_ja.properties.xml | 3 +-
.../web/app/Application_ko.properties.xml | 3 +-
.../web/app/Application_nl.properties.xml | 3 +-
.../web/app/Application_pl.properties.xml | 3 +-
.../web/app/Application_pt.properties.xml | 3 +-
.../web/app/Application_pt_BR.properties.xml | 3 +-
.../web/app/Application_ru.properties.xml | 3 +-
.../web/app/Application_sk.properties.xml | 3 +-
.../web/app/Application_sv.properties.xml | 3 +-
.../web/app/Application_th.properties.xml | 3 +-
.../web/app/Application_tr.properties.xml | 3 +-
.../web/app/Application_uk.properties.xml | 3 +-
.../web/app/Application_zh_CN.properties.xml | 3 +-
.../web/app/Application_zh_TW.properties.xml | 3 +-
.../apache/openmeetings/web/room/RoomPanel.java | 1 +
.../web/room/activities/ActivitiesPanel.html | 16 +-
.../web/room/activities/ActivitiesPanel.java | 230 ++++++++-----------
.../web/room/activities/activities.js | 118 ++++++----
35 files changed, 249 insertions(+), 209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
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 77282b5..150285f 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny and remove message]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others. Give exclusive audio to me (You can also press F12)]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
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 5ea995c..ad42ce5 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
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 8fe30e0..6de747a 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
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 02bbb2e..865d985 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
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 ee6b0b5..8efb08c 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
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 36107b1..5b1249e 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
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 e0b0cbb..52bf53f 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Ablehnen]]></entry>
<entry key="1362"><![CDATA[Ich]]></entry>
<entry key="1363"><![CDATA[Aktivitäten und Aktionen]]></entry>
- <entry key="1367"><![CDATA[hat den Raum verlassen.]]></entry>
<entry key="1386"><![CDATA[Mikrofone für andere stumm schalten]]></entry>
<entry key="1399"><![CDATA[bittet den Moderator sein/ihr Mikrofon stummzuschalten.]]></entry>
<entry key="1410"><![CDATA[Titel der Abstimmung]]></entry>
@@ -993,4 +992,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[hat den Raum verlassen.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
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 1f2d69d..7c26697 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
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 84933c6..b64a875 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Denegar]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Actividades y acciones]]></entry>
- <entry key="1367"><![CDATA[ha salido de la sala.]]></entry>
<entry key="1386"><![CDATA[Silenciar los micrófonos de los demás]]></entry>
<entry key="1399"><![CDATA[quiero que el moderador silencie su micrófono.]]></entry>
<entry key="1410"><![CDATA[Nombre Encuesta]]></entry>
@@ -986,4 +985,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[ha salido de la sala.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
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 090fcce..4e5e87f 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
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 2942b2a..922fce0 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
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 4a6ba5e..0e5342e 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Refuser]]></entry>
<entry key="1362"><![CDATA[Je]]></entry>
<entry key="1363"><![CDATA[Activités et actions]]></entry>
- <entry key="1367"><![CDATA[a quitté la salle.]]></entry>
<entry key="1386"><![CDATA[Couper le micro des autres]]></entry>
<entry key="1399"><![CDATA[souhaite que le modérateur coupe son micro.]]></entry>
<entry key="1410"><![CDATA[Nom du sondage]]></entry>
@@ -980,4 +979,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[a quitté la salle.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
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 99a907b..8c875c7 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
----------------------------------------------------------------------
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 77282b5..150285f 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny and remove message]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others. Give exclusive audio to me (You can also press F12)]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
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 e8bfda3..6d4b7c9 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Tilt]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Aktivitások és műveletek]]></entry>
- <entry key="1367"><![CDATA[kilépett a szobából.]]></entry>
<entry key="1386"><![CDATA[Mások mikrofonjának némítása]]></entry>
<entry key="1399"><![CDATA[a moderátor némította a mikrofonját.]]></entry>
<entry key="1410"><![CDATA[Szavazás neve]]></entry>
@@ -976,4 +975,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[kilépett a szobából.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index ac7615d..b8d297d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
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 2c3acea..8056024 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Rifiuta e rimuovi messaggio]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Attività e azioni]]></entry>
- <entry key="1367"><![CDATA[ha lasciato la stanza.]]></entry>
<entry key="1386"><![CDATA[Dai l'audio esclusivo a questo utente. Silenzia microfono degli altri (Puoi anche premere F12)]]></entry>
<entry key="1399"><![CDATA[vorrebbe che il moderatore silenzi il suo microfono.]]></entry>
<entry key="1410"><![CDATA[Nome sondaggio]]></entry>
@@ -989,4 +988,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[ha lasciato la stanza.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
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 11d3119..36932a7 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[メッセージを拒否して削除する]]></entry>
<entry key="1362"><![CDATA[私]]></entry>
<entry key="1363"><![CDATA[アクティビティ/アクション]]></entry>
- <entry key="1367"><![CDATA[さんは会議室から退室しました]]></entry>
<entry key="1386"><![CDATA[他の参加者のマイクを無効にして私のマイクだけを有効にする (F12)]]></entry>
<entry key="1399"><![CDATA[さんが、参加者のマイクの無効化を依頼しています。]]></entry>
<entry key="1410"><![CDATA[投票名]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[さんは会議室から退室しました]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
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 2668091..3c66e14 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
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 a42b8ad..e4a1d0b 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
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 528bd80..078db85 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
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 1decc1e..c11f767 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
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 eb943a8..492ec9c 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Negar]]></entry>
<entry key="1362"><![CDATA[Eu]]></entry>
<entry key="1363"><![CDATA[Atividades e ações]]></entry>
- <entry key="1367"><![CDATA[saiu da sala.]]></entry>
<entry key="1386"><![CDATA[Microfone dos outros mudo]]></entry>
<entry key="1399"><![CDATA[gostaria que o moderador desabilite o microfone dele/dela.]]></entry>
<entry key="1410"><![CDATA[Nome da enquete]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[saiu da sala.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
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 89e2ced..7d93bb4 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Отклонить]]></entry>
<entry key="1362"><![CDATA[Я]]></entry>
<entry key="1363"><![CDATA[Активность и действия]]></entry>
- <entry key="1367"><![CDATA[покидает комнату.]]></entry>
<entry key="1386"><![CDATA[Дать слово]]></entry>
<entry key="1399"><![CDATA[хочет, чтобы модератор выключил его/её микрофон.]]></entry>
<entry key="1410"><![CDATA[Название опроса]]></entry>
@@ -989,4 +988,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Кликните чтобы "прилепить" панель]]></entry>
<entry key="label.undock.panel"><![CDATA[Кликните чтобы "отлепить" панель]]></entry>
<entry key="activities.autoclean"><![CDATA[Авто-очистка]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[входит в комнату.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[покидает комнату.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
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 ab62305..ef5bf89 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
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 62a780e..e60d47f 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
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 7746945..e5e4be0 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
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 e727980..ea8065f 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
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 41a0822..7ea04fb 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Відхилити]]></entry>
<entry key="1362"><![CDATA[Я]]></entry>
<entry key="1363"><![CDATA[Активність і дії]]></entry>
- <entry key="1367"><![CDATA[залишає кімнату.]]></entry>
<entry key="1386"><![CDATA[Дати слово]]></entry>
<entry key="1399"><![CDATA[хоче, щоб модератор вимкнув його/її мікрофон.]]></entry>
<entry key="1410"><![CDATA[Назва опитування]]></entry>
@@ -989,4 +988,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[залишає кімнату.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
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 99b00b4..2fe7c44 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[拒绝]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[活动]]></entry>
- <entry key="1367"><![CDATA[离开了会议室.]]></entry>
<entry key="1386"><![CDATA[给予独家音频]]></entry>
<entry key="1399"><![CDATA[请求主持人设置自身为静音]]></entry>
<entry key="1410"><![CDATA[调查名称]]></entry>
@@ -978,4 +977,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[离开了会议室.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
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 9f1c699..1c2adc4 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
@@ -522,7 +522,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1361"><![CDATA[Deny]]></entry>
<entry key="1362"><![CDATA[I]]></entry>
<entry key="1363"><![CDATA[Activities and actions]]></entry>
- <entry key="1367"><![CDATA[has left the room.]]></entry>
<entry key="1386"><![CDATA[Mute microphone of others]]></entry>
<entry key="1399"><![CDATA[want that the moderator mutes his/her microphone.]]></entry>
<entry key="1410"><![CDATA[Poll Name]]></entry>
@@ -988,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
+ <entry key="activities.msg.enter"><![CDATA[enter the room.]]></entry>
+ <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
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 44a4c39..20d84f0 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
@@ -532,6 +532,7 @@ public class RoomPanel extends BasePanel {
case roomEnter:
sidebar.update(handler);
menu.update(handler);
+ activities.add(new Activity(m, Activity.Type.roomEnter), handler);
break;
case roomExit:
sidebar.update(handler);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
index 08ee9d6..e6ddc1f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
@@ -26,13 +26,15 @@
<div class="ctrl ui-widget-content">
<div><input type="checkbox" id="activity-auto-clean"/><label for="activity-auto-clean"><wicket:message key="activities.autoclean"/></label></div>
</div>
- <div wicket:id="container" class="area ui-widget-content">
- <div wicket:id="activities" class="activity item ui-helper-clearfix ui-corner-all">
- <span wicket:id="close" class="ui-icon ui-icon-close ui-corner-all clickable" wicket:message="title:85"></span>
- <span wicket:id="accept" class="ui-icon ui-icon-check ui-corner-all clickable" wicket:message="title:1360"></span>
- <span wicket:id="decline" class="ui-icon ui-icon-cancel ui-corner-all clickable" wicket:message="title:1361"></span>
- <span wicket:id="find" class="ui-icon crosshair ui-corner-all clickable" wicket:message="title:find.user"></span>
- <div wicket:id="text"></div>
+ <div class="area ui-widget-content">
+ </div>
+ <div style="display: none">
+ <div id="activity-stub" class="activity item ui-helper-clearfix ui-corner-all">
+ <span class="activity-close ui-icon ui-icon-close ui-corner-all clickable" wicket:message="title:85"></span>
+ <span class="activity-accept ui-icon ui-icon-check ui-corner-all clickable" wicket:message="title:1360"></span>
+ <span class="activity-decline ui-icon ui-icon-cancel ui-corner-all clickable" wicket:message="title:1361"></span>
+ <span class="activity-find ui-icon crosshair ui-corner-all clickable" wicket:message="title:find.user"></span>
+ <div class="activity-text"></div>
</div>
</div>
</wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
index 2215028..88d52d9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
@@ -19,17 +19,12 @@
package org.apache.openmeetings.web.room.activities;
import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.openmeetings.web.pages.BasePage.ALIGN_LEFT;
-import static org.apache.openmeetings.web.pages.BasePage.ALIGN_RIGHT;
-import static org.apache.openmeetings.web.util.CallbackFunctionHelper.addOnClick;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -41,7 +36,6 @@ import org.apache.openmeetings.db.util.ws.RoomMessage;
import org.apache.openmeetings.db.util.ws.TextRoomMessage;
import org.apache.openmeetings.web.pages.BasePage;
import org.apache.openmeetings.web.room.RoomPanel;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -49,15 +43,13 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import com.github.openjson.JSONObject;
+
public class ActivitiesPanel extends Panel {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(ActivitiesPanel.class, getWebAppRootKey());
@@ -66,14 +58,12 @@ public class ActivitiesPanel extends Panel {
private static final String PARAM_ROOM_ID = "roomid";
private static final String ACTIVITY_FMT = "%s %s [%s]";
private static final String ACTIVITY_FMT_RTL = "%3$s %2$s [%1$s]";
- private static final String ACTIVITY_FUNC_FMT = "activityAction(%s, '%s', '%s');";
private enum Action {
accept, decline, close
};
private static final FastDateFormat df = FastDateFormat.getInstance("HH:mm:ss");
private final Map<String, Activity> activities = new LinkedHashMap<>();
private final RoomPanel room;
- private final WebMarkupContainer container = new WebMarkupContainer("container");
private final AbstractDefaultAjaxBehavior action = new AbstractDefaultAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -83,6 +73,9 @@ public class ActivitiesPanel extends Panel {
@Override
protected void respond(AjaxRequestTarget target) {
+ if (!isVisible()) {
+ return;
+ }
try {
String id = getRequest().getRequestParameters().getParameterValue(PARAM_ID).toString();
long roomId = getRequest().getRequestParameters().getParameterValue(PARAM_ROOM_ID).toLong();
@@ -158,111 +151,6 @@ public class ActivitiesPanel extends Panel {
response.render(new PriorityHeaderItem(getNamedFunction("activityAction", this, explicit(PARAM_ROOM_ID), explicit(ACTION), explicit(PARAM_ID))));
}
};
- private ListView<Activity> lv = new ListView<Activity>("activities", new ArrayList<Activity>()) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(ListItem<Activity> item) {
- Activity a = item.getModelObject();
- String text = "";
- Long roomId = room.getRoom().getId();
- Component accept = new WebMarkupContainer("accept").add(addOnClick(String.format(ACTIVITY_FUNC_FMT, roomId, Action.accept.name(), a.getId())));
- Component decline = new WebMarkupContainer("decline").add(addOnClick(String.format(ACTIVITY_FUNC_FMT, roomId, Action.decline.name(), a.getId())));
- Component find = new WebMarkupContainer("find").add(addOnClick(String.format("Activities.findUser('%s');", a.getUid()))).setVisible(false);
- boolean self = getUserId().equals(a.getSender());
- switch (a.getType()) {
- case reqRightModerator:
- case reqRightPresenter:
- case reqRightWb:
- case reqRightShare:
- case reqRightRemote:
- case reqRightA:
- case reqRightAv:
- case reqRightMute:
- case reqRightExclusive:
- accept.setVisible(room.getClient().hasRight(Right.moderator));
- decline.setVisible(room.getClient().hasRight(Right.moderator));
- break;
- case haveQuestion:
- find.setVisible(!self);
- case roomEnter:
- case roomExit:
- accept.setVisible(false);
- decline.setVisible(false);
- break;
- }
- String name = self ? getString("1362") : a.getName();
- final String fmt = ((BasePage)getPage()).isRtl() ? ACTIVITY_FMT_RTL : ACTIVITY_FMT;
- switch (a.getType()) {
- case roomEnter:
- text = "";
- item.setVisible(false);
- break;
- case roomExit:
- text = String.format(fmt, name, getString("1367"), df.format(a.getCreated()));
- break;
- case reqRightModerator:
- text = String.format(fmt, name, getString("room.action.request.right.moderator"), df.format(a.getCreated()));
- break;
- case reqRightPresenter:
- text = String.format(fmt, name, getString("right.presenter.request"), df.format(a.getCreated()));
- break;
- case reqRightWb:
- text = String.format(fmt, name, getString("694"), df.format(a.getCreated()));
- break;
- case reqRightShare:
- text = String.format(fmt, name, getString("1070"), df.format(a.getCreated()));
- break;
- case reqRightRemote:
- text = String.format(fmt, name, getString("1082"), df.format(a.getCreated()));
- break;
- case reqRightA:
- text = String.format(fmt, name, getString("1603"), df.format(a.getCreated()));
- break;
- case reqRightAv:
- text = String.format(fmt, name, getString("695"), df.format(a.getCreated()));
- break;
- case reqRightMute:
- text = String.format(fmt, name, getString("1399"), df.format(a.getCreated()));
- break;
- case reqRightExclusive:
- text = String.format(fmt, name, getString("1427"), df.format(a.getCreated()));
- break;
- case haveQuestion:
- text = String.format(fmt, name, getString("693"), df.format(a.getCreated()));
- break;
- }
- final String align = ((BasePage)getPage()).isRtl() ? ALIGN_LEFT : ALIGN_RIGHT;
- item.add(new WebMarkupContainer("close").add(addOnClick(String.format(ACTIVITY_FUNC_FMT, roomId, Action.close.name(), a.getId())))
- .add(AttributeModifier.append(ATTR_CLASS, align)));
- item.add(accept.add(AttributeModifier.append(ATTR_CLASS, align))
- , decline.add(AttributeModifier.append(ATTR_CLASS, align))
- , find.add(AttributeModifier.append(ATTR_CLASS, align))
- , new Label("text", text));
- item.add(AttributeModifier.append(ATTR_CLASS, getClass(a)));
- }
-
- private String getClass(Activity a) {
- String cls = "ui-state-default";
- switch (a.getType()) {
- case reqRightModerator:
- case reqRightPresenter:
- case reqRightWb:
- case reqRightShare:
- case reqRightRemote:
- case reqRightA:
- case reqRightAv:
- case reqRightMute:
- case reqRightExclusive:
- case haveQuestion:
- cls = "ui-state-highlight";
- break;
- case roomEnter:
- case roomExit:
- }
- return cls;
- }
- };
public ActivitiesPanel(String id, RoomPanel room) {
super(id);
@@ -270,28 +158,90 @@ public class ActivitiesPanel extends Panel {
setVisible(!room.getRoom().isHidden(RoomElement.Activities));
setOutputMarkupPlaceholderTag(true);
setMarkupId(id);
- add(container.add(lv).setOutputMarkupPlaceholderTag(true));
add(action);
}
public void add(Activity a, IPartialPageRequestHandler handler) {
+ if (!isVisible()) {
+ return;
+ }
activities.put(a.getId(), a);
- update(handler);
- if (isVisible()) {
- handler.appendJavaScript("Activities.hightlight();");
+ String text = "";
+ final boolean self = getUserId().equals(a.getSender());
+ final String name = self ? getString("1362") : a.getName();
+ final String fmt = ((BasePage)getPage()).isRtl() ? ACTIVITY_FMT_RTL : ACTIVITY_FMT;
+ switch (a.getType()) {
+ case roomEnter:
+ text = String.format(fmt, name, getString("activities.msg.enter"), df.format(a.getCreated()));
+ break;
+ case roomExit:
+ text = String.format(fmt, name, getString("activities.msg.exit"), df.format(a.getCreated()));
+ break;
+ case reqRightModerator:
+ text = String.format(fmt, name, getString("room.action.request.right.moderator"), df.format(a.getCreated()));
+ break;
+ case reqRightPresenter:
+ text = String.format(fmt, name, getString("right.presenter.request"), df.format(a.getCreated()));
+ break;
+ case reqRightWb:
+ text = String.format(fmt, name, getString("694"), df.format(a.getCreated()));
+ break;
+ case reqRightShare:
+ text = String.format(fmt, name, getString("1070"), df.format(a.getCreated()));
+ break;
+ case reqRightRemote:
+ text = String.format(fmt, name, getString("1082"), df.format(a.getCreated()));
+ break;
+ case reqRightA:
+ text = String.format(fmt, name, getString("1603"), df.format(a.getCreated()));
+ break;
+ case reqRightAv:
+ text = String.format(fmt, name, getString("695"), df.format(a.getCreated()));
+ break;
+ case reqRightMute:
+ text = String.format(fmt, name, getString("1399"), df.format(a.getCreated()));
+ break;
+ case reqRightExclusive:
+ text = String.format(fmt, name, getString("1427"), df.format(a.getCreated()));
+ break;
+ case haveQuestion:
+ text = String.format(fmt, name, getString("693"), df.format(a.getCreated()));
+ break;
}
+ final JSONObject aobj = new JSONObject()
+ .put("id", a.getId())
+ .put("uid", a.getUid())
+ .put("cssClass", getClass(a))
+ .put("text", text)
+ .put("find", false);
+
+ switch (a.getType()) {
+ case reqRightModerator:
+ case reqRightPresenter:
+ case reqRightWb:
+ case reqRightShare:
+ case reqRightRemote:
+ case reqRightA:
+ case reqRightAv:
+ case reqRightMute:
+ case reqRightExclusive:
+ aobj.put("accept", room.getClient().hasRight(Right.moderator));
+ aobj.put("decline", room.getClient().hasRight(Right.moderator));
+ break;
+ case haveQuestion:
+ aobj.put("find", !self);
+ case roomEnter:
+ case roomExit:
+ aobj.put("accept", false);
+ aobj.put("decline", false);
+ break;
+ }
+ handler.appendJavaScript(new StringBuilder("Activities.add(").append(aobj.toString()).append(");"));
}
public void remove(String uid, IPartialPageRequestHandler handler) {
activities.remove(uid);
- update(handler);
- }
-
- public void update(IPartialPageRequestHandler handler) {
- if (isVisible()) {
- lv.setList(new ArrayList<>(activities.values()));
- handler.add(container);
- }
+ handler.appendJavaScript(String.format("Activities.remove('%s');", uid));
}
@Override
@@ -299,4 +249,26 @@ public class ActivitiesPanel extends Panel {
super.renderHead(response);
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(ActivitiesPanel.class, "activities.js"))));
}
+
+ private static CharSequence getClass(Activity a) {
+ StringBuilder cls = new StringBuilder();
+ switch (a.getType()) {
+ case reqRightModerator:
+ case reqRightPresenter:
+ case reqRightWb:
+ case reqRightShare:
+ case reqRightRemote:
+ case reqRightA:
+ case reqRightAv:
+ case reqRightMute:
+ case reqRightExclusive:
+ case haveQuestion:
+ cls.append("ui-state-highlight");
+ break;
+ case roomEnter:
+ case roomExit:
+ cls.append("ui-state-default auto-clean");
+ }
+ return cls;
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa1a8f32/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
index ddd0450..bed035f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
@@ -1,7 +1,7 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
var Activities = function() {
- const closedHeight = "20px";
- let activities, openedHeight = "345px", inited = false;
+ const closedHeight = "20px", timeout = 10000;
+ let activities, aclean, area, openedHeight = "345px", inited = false;
function _load() {
const s = Settings.load();
@@ -13,11 +13,16 @@ var Activities = function() {
function _updateClean(s, a) {
const clean = s.activity.clean === true;
a.prop('checked', clean);
+ if (clean) {
+ activities.find('.auto-clean').each(function() {
+ setTimeout(_remove.bind(null, $(this).data().id), timeout);
+ });
+ }
}
function isClosed() {
return activities.height() < 24;
}
- function open() {
+ function _open() {
if (isClosed()) {
$('.control.block .ui-icon', activities).removeClass('ui-icon-caret-1-n').addClass('ui-icon-caret-1-s');
$('.control.block', activities).removeClass('ui-state-highlight');
@@ -25,13 +30,45 @@ var Activities = function() {
activities.resizable('option', 'disabled', false);
}
}
- function close() {
+ function _close() {
if (!isClosed()) {
$('.control.block .ui-icon', activities).removeClass('ui-icon-caret-1-s').addClass('ui-icon-caret-1-n');
activities.animate({height: closedHeight}, 1000);
activities.resizable('option', 'disabled', true);
}
}
+ function _findUser(uid) {
+ const m = '5px', t = 50, u = $('#user' + uid);
+ if (u.length === 1) {
+ u[0].scrollIntoView();
+ u.addClass('ui-state-highlight');
+ for(let i = 0; i < 10; i++) {
+ u.animate({marginTop: '-='+m}, t)
+ .animate({marginTop: '+='+m}, t);
+ }
+ u.removeClass('ui-state-highlight', 1500);
+ }
+ }
+ function _hightlight() {
+ if (!inited) return;
+ if (isClosed()) {
+ $('.control.block', activities).addClass('ui-state-highlight');
+ }
+ }
+ function _getId(id) {
+ return 'activity-' + id;
+ }
+ function _action(name, val) {
+ activityAction($('.room.box').data('room-id'), name, val);
+ }
+ function _remove(id) {
+ $('#' + _getId(id)).remove();
+ }
+ function _clearItem(id) {
+ if (aclean.prop('checked')) {
+ _remove(id);
+ }
+ }
return {
init: function() {
@@ -50,7 +87,9 @@ var Activities = function() {
openedHeight = ui.size.height + "px";
}
});
- const aclean = $('#activity-auto-clean').change(function() {
+ area = activities.find('.area');
+ aclean = $('#activity-auto-clean');
+ aclean.change(function() {
const s = _load();
s.activity.clean = $(this).prop('checked');
Settings.save(s);
@@ -59,50 +98,45 @@ var Activities = function() {
_updateClean(_load(), aclean);
inited = true;
}
- , hightlight: function() {
- if (!inited) return;
- if (isClosed()) {
- $('.control.block', activities).addClass('ui-state-highlight');
- }
- }
, toggle: function() {
if (!inited) return;
if (isClosed()) {
- open();
+ _open();
} else {
- close();
+ _close();
}
}
- , findUser: function(uid) {
- const m = '5px', t = 50, u = $('#user' + uid);
- if (u.length === 1) {
- u[0].scrollIntoView();
- u.addClass('ui-state-highlight');
- for(let i = 0; i < 10; i++) {
- u.animate({marginTop: '-='+m}, t)
- .animate({marginTop: '+='+m}, t);
- }
- u.removeClass('ui-state-highlight', 1500);
+ , findUser: _findUser
+ , add: function(obj) {
+ const _id = _getId(obj.id);
+ area.append($('#activity-stub').clone().attr('id', _id).data(obj));
+ const a = $('#' + _id).addClass(obj.cssClass);
+ a.find('.activity-close,.activity-accept,.activity-decline,.activity-find').addClass(Settings.isRtl ? 'align-left' : 'align-right');
+ const acpt = a.find('.activity-accept');
+ if (obj.accept) {
+ acpt.click(function() { _action('accept', obj.id); });
+ } else {
+ acpt.hide();
}
- }
- };
-}();
-$(function() {
- Wicket.Event.subscribe("/websocket/message", function(jqEvent, msg) {
- try {
- if (msg instanceof Blob) {
- return; //ping
+ const dcln = a.find('.activity-decline');
+ if (obj.decline) {
+ dcln.click(function() { _action('decline', obj.id); });
+ } else {
+ dcln.hide();
}
- const m = jQuery.parseJSON(msg);
- if (m) {
- switch(m.type) {
- case "activity":
- Activities.addMessage(m);
- break;
- }
+ const fnd = a.find('.activity-find');
+ if (obj.find) {
+ fnd.click(function() { _findUser(obj.uid); });
+ } else {
+ fnd.hide();
+ }
+ a.find('.activity-close').click(function() { a.remove(); _action('close', obj.id); });
+ a.find('.activity-text').text(obj.text);
+ _hightlight();
+ if (aclean.prop('checked')) {
+ setTimeout(_remove.bind(null, obj.id), timeout);
}
- } catch (err) {
- //no-op
}
- });
-});
+ , remove: _remove
+ };
+}();