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/06/17 09:43:12 UTC
openmeetings git commit: [OPENMEETINGS-1650] mute sound button is
added to the chat
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 7e90b9173 -> 1fd1eb941
[OPENMEETINGS-1650] mute sound button is added to the chat
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1fd1eb94
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1fd1eb94
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1fd1eb94
Branch: refs/heads/3.3.x
Commit: 1fd1eb9414aa4fdc9055ca02ba991f53dcdae5ad
Parents: 7e90b91
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Jun 17 16:43:00 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Jun 17 16:43:00 2017 +0700
----------------------------------------------------------------------
.../web/app/Application.properties.xml | 2 +
.../web/app/Application_ar.properties.xml | 2 +
.../web/app/Application_bg.properties.xml | 2 +
.../web/app/Application_ca.properties.xml | 2 +
.../web/app/Application_cs.properties.xml | 2 +
.../web/app/Application_da.properties.xml | 2 +
.../web/app/Application_de.properties.xml | 2 +
.../web/app/Application_el.properties.xml | 2 +
.../web/app/Application_es.properties.xml | 2 +
.../web/app/Application_fa.properties.xml | 2 +
.../web/app/Application_fi.properties.xml | 2 +
.../web/app/Application_fr.properties.xml | 2 +
.../web/app/Application_gl.properties.xml | 2 +
.../web/app/Application_hu.properties.xml | 2 +
.../web/app/Application_id.properties.xml | 2 +
.../web/app/Application_it.properties.xml | 2 +
.../web/app/Application_ja.properties.xml | 2 +
.../web/app/Application_ko.properties.xml | 2 +
.../web/app/Application_nl.properties.xml | 2 +
.../web/app/Application_pl.properties.xml | 2 +
.../web/app/Application_pt.properties.xml | 2 +
.../web/app/Application_pt_BR.properties.xml | 2 +
.../web/app/Application_ru.properties.xml | 2 +
.../web/app/Application_sk.properties.xml | 2 +
.../web/app/Application_sv.properties.xml | 2 +
.../web/app/Application_th.properties.xml | 2 +
.../web/app/Application_tr.properties.xml | 2 +
.../web/app/Application_uk.properties.xml | 2 +
.../web/app/Application_zh_CN.properties.xml | 2 +
.../web/app/Application_zh_TW.properties.xml | 2 +
.../apache/openmeetings/web/user/chat/Chat.html | 5 +-
.../apache/openmeetings/web/user/chat/chat.js | 49 +++++++++++++++----
openmeetings-web/src/main/webapp/css/chat.css | 12 +++++
.../src/main/webapp/css/images/sound.png | Bin 0 -> 1855 bytes
.../src/main/webapp/css/images/sound_mute.png | Bin 0 -> 2080 bytes
35 files changed, 115 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 16afa94..35ea920 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 6859add..038e91a 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 88af794..66b69ae 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 498ebdb..4d9e63f 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 3b3358e..eb0529b 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 79e9eeb..636181a 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 cb1839b..ba223f7 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
@@ -1951,4 +1951,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 971a215..b0df46c 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 bc97a19..82a237c 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 5e3778c..6df8e52 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 abda22f..9d835e3 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 b5fd20c..1091c76 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
@@ -1919,4 +1919,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 aabd312..04a4257 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 f44d86e..cd2a345 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
@@ -1914,4 +1914,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 983a232..8f471cd 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 62ec00f..f8a4fd8 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
@@ -1932,4 +1932,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 2c76739..3494f41 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 3ac0cde..fa2d9d1 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
@@ -1932,4 +1932,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 fd4b34f..35f32e5 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 666000d..c5633c9 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 8bc745e..d34799e 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 7a192c7..eae6abb 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 3d22c3f..8a98bef 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
@@ -1931,4 +1931,6 @@
<entry key="bad.password.digit"><![CDATA['Слабый' пароль: обязателена по крайней мере одна цифра]]></entry>
<entry key="bad.password.special"><![CDATA['Слабый' пароль: обязателен по крайней мере один символ из '!@#$%^&*][']]></entry>
<entry key="bad.password.stop"><![CDATA['Слабый' пароль: пароль не должен содержать частей пользовательского email или логина]]></entry>
+ <entry key="sound.enable">Включить звук</entry>
+ <entry key="sound.mute">Выключить звук</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 9c80e9b..ec2b4e1 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 b41985e..a5cc98b 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 6fb64b4..9f3b921 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 b2fc1b4..359654f 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 85efd7a..ca80145 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
@@ -1931,4 +1931,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 263d544..b5d9757 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
@@ -1916,4 +1916,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/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 029be77..6d5f692 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
@@ -1930,4 +1930,6 @@
<entry key="bad.password.digit"><![CDATA['Weak' password: at least 1 digit is required]]></entry>
<entry key="bad.password.special"><![CDATA['Weak' password: at least 1 special symbol '!@#$%^&*][' is required]]></entry>
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+ <entry key="sound.enable">Enable sound</entry>
+ <entry key="sound.mute">Mute sound</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
index ff89822..76024ac 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
@@ -28,9 +28,12 @@
</div>
<form wicket:id="sendForm">
<div style="display: inline-block;" wicket:id="toolbarContainer"></div>
- <div style="display: inline-block; float: right; margin-right: 10px;">
+ <div class="clickable chat-btn ui-state-default ui-corner-all">
<div class="formCancelButton" wicket:id="ajax-cancel-button" wicket:message="title:442"></div>
</div>
+ <div class="clickable chat-btn ui-state-default ui-corner-all">
+ <div class="audio om-icon" wicket:message="data-sound-enabled:sound.mute,data-sound-muted:sound.enable"> </div>
+ </div>
<table style="width: 100%">
<tr>
<td><div id="chatMessage" wicket:id="chatMessage"></div></td>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
index cb040b2..626aae8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
@@ -33,7 +33,7 @@ var Chat = function() {
, emoticon = new CSSEmoticon()
, typingTimer
, doneTypingInterval = 5000 //time in ms, 5 second for example
- , audio
+ , audio, s
;
try {
audio = new Audio('./public/chat_message.mp3');
@@ -43,6 +43,24 @@ var Chat = function() {
play: function() {}
};
}
+ function _load() {
+ s = {};
+ try {
+ s = JSON.parse(localStorage.getItem('openmeetings')) || s;
+ } catch (e) {}
+ if (!s.chat) {
+ s.chat = {};
+ }
+ }
+ function _save() {
+ var _s = JSON.stringify(s);
+ localStorage.setItem('openmeetings', _s);
+ }
+ function _updateBtn(a) {
+ var muted = s.chat.muted === true;
+ a.removeClass('sound' + (muted ? '' : '-mute')).addClass('sound' + (muted ? '-mute' : ''))
+ .attr('title', a.data(muted ? 'sound-enabled' : 'sound-muted'));
+ }
function doneTyping () {
typingTimer = null;
chatActivity('typing_stop', $('.room.box').data('room-id'));
@@ -67,6 +85,15 @@ var Chat = function() {
row = $('<tr></tr>');
}
}
+ _load();
+ var a = $('#chat .audio');
+ _updateBtn(a);
+ $('#chat .chat-btn').hover(function(){ $(this).addClass('ui-state-hover') }, function(){ $(this).removeClass('ui-state-hover') });
+ a.click(function() {
+ s.chat.muted = !s.chat.muted;
+ _updateBtn(a);
+ _save();
+ });
}
function isClosed() {
return $('#chatPanel').height() < 24;
@@ -146,16 +173,18 @@ var Chat = function() {
if ($('#chat').length > 0 && m && m.type == "chat") {
if (isClosed()) {
$('#chatPopup .control.block').addClass('ui-state-highlight');
- var playPromise = audio.play();
+ if (s.chat.muted !== true) {
+ var playPromise = audio.play();
- // In browsers that don’t yet support this functionality,
- // playPromise won’t be defined.
- if (playPromise !== undefined) {
- playPromise.then(function() {
- // Automatic playback started!
- }).catch(function(error) {
- // Automatic playback failed.
- });
+ // In browsers that don’t yet support this functionality,
+ // playPromise won’t be defined.
+ if (playPromise !== undefined) {
+ playPromise.then(function() {
+ // Automatic playback started!
+ }).catch(function(error) {
+ // Automatic playback failed.
+ });
+ }
}
}
var msg, cm;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/openmeetings-web/src/main/webapp/css/chat.css
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/chat.css b/openmeetings-web/src/main/webapp/css/chat.css
index a837b31..38923ce 100644
--- a/openmeetings-web/src/main/webapp/css/chat.css
+++ b/openmeetings-web/src/main/webapp/css/chat.css
@@ -80,3 +80,15 @@
max-height: 70px;
max-width: 500px;
}
+.sound.om-icon {
+ background-image: url(images/sound.png);
+}
+.sound-mute.om-icon {
+ background-image: url(images/sound_mute.png);
+}
+#chat .chat-btn {
+ display: inline-block;
+ float: right;
+ margin-right: 10px;
+ padding: 4px;
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/openmeetings-web/src/main/webapp/css/images/sound.png
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/images/sound.png b/openmeetings-web/src/main/webapp/css/images/sound.png
new file mode 100644
index 0000000..8c2baf0
Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/sound.png differ
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1fd1eb94/openmeetings-web/src/main/webapp/css/images/sound_mute.png
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/images/sound_mute.png b/openmeetings-web/src/main/webapp/css/images/sound_mute.png
new file mode 100644
index 0000000..c683bc6
Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/sound_mute.png differ