This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new e3078dc [OPENMEETINGS-1888] reply button is added
e3078dc is described below
commit e3078dc8f250434fe8bab9ae63cf5248ddc431a3
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Oct 24 19:48:26 2018 +0700
[OPENMEETINGS-1888] reply button is added
---
.../web/app/Application.properties.xml | 2 ++
.../web/app/Application_ar.properties.xml | 2 ++
.../web/app/Application_bg.properties.xml | 2 ++
.../web/app/Application_bn.properties.xml | 2 ++
.../web/app/Application_ca.properties.xml | 2 ++
.../web/app/Application_cs.properties.xml | 2 ++
.../web/app/Application_da.properties.xml | 2 ++
.../web/app/Application_de.properties.xml | 2 ++
.../web/app/Application_el.properties.xml | 2 ++
.../web/app/Application_es.properties.xml | 2 ++
.../web/app/Application_fa.properties.xml | 2 ++
.../web/app/Application_fi.properties.xml | 2 ++
.../web/app/Application_fr.properties.xml | 2 ++
.../web/app/Application_gl.properties.xml | 2 ++
.../web/app/Application_he.properties.xml | 2 ++
.../web/app/Application_hu.properties.xml | 2 ++
.../web/app/Application_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/common/MainPanel.java | 4 +++
.../openmeetings/web/user/MessageDialog.html | 2 +-
.../web/user/profile/MessagesContactsPanel.html | 1 +
.../web/user/profile/MessagesContactsPanel.java | 39 +++++++++++++++++-----
.../src/main/webapp/css/raw-general.css | 10 ++++++
37 files changed, 111 insertions(+), 9 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 46266bd..8c0f802 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 5e0cde6..39f1271 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 4581e39..cb1e40d 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index a78019a..6dd1651 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 3fe35e3..367067b 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 435d240..3b69931 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 9b28453..28ab7b3 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 74b0956f..0d9897c 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
@@ -992,4 +992,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index 3682a38..566f14e 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 0839664..6660d86 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
@@ -985,4 +985,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 53a26c2..4dfdb6c 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
@@ -979,4 +979,6 @@ target="_blank">Custom Crypt Mechanism</a>
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index b2cf844..1b6efb7 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index ef115ba..8e6a628 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index faac9f2..82110a5 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index 46266bd..8c0f802 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 0cb1718..25736db 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
@@ -975,4 +975,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
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 a5aa117..54a9fbd 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index bb4a908..5048ee5 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
@@ -988,4 +988,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index ec91d89..d382fb1 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 36a8033..f21b0a6 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 9e8a7ac..3e10f84 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 82d7344..5a17a8b 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index c1320d0..fdee1bd 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 8108433..08e8d9e 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 410ec5e..6755ae3 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Приглашения]]></entry>
<entry key="profile.invitation"><![CDATA[Приглашение]]></entry>
<entry key="poll.clone"><![CDATA[Клонировать]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Ответить]]></entry>
+ <entry key="messages.subject.re"><![CDATA[На:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 68dc222..7e9cde9 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 04acfe8..7b6e707 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index c139fbd..010d883 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index e58a83a..ce15ad6 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index c5408fd..9a78339 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 5d70e0e..634f758 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 6565119..7ea3005 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
@@ -987,4 +987,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="profile.invitations"><![CDATA[Invitations]]></entry>
<entry key="profile.invitation"><![CDATA[Invitation]]></entry>
<entry key="poll.clone"><![CDATA[Clone]]></entry>
+ <entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+ <entry key="messages.subject.re"><![CDATA[Re:]]></entry>
</properties>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 0c09496..0d7a6a3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -456,6 +456,10 @@ public class MainPanel extends Panel {
return chat;
}
+ public MessageDialog getMessageDialog() {
+ return newMessage;
+ }
+
public String getUid() {
return uid;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
index 3ede1a1..402b81f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
@@ -43,7 +43,7 @@
<tr>
<td colspan="2">
<div wicket:id="toolbarContainer"></div>
- <div wicket:id="message"></div>
+ <div class="private message body"
wicket:id="message"></div>
</td>
</tr>
<tr wicket:enclosure="bookedRoom">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
index efdab35..c557c89 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
@@ -60,6 +60,7 @@
<div wicket:id="buttons">
<select wicket:id="msgSelect"></select>
<input wicket:id="toInboxBtn"
type="button" wicket:message="value:1255"/>
+ <input wicket:id="replyBtn"
type="button" wicket:message="value:messages.btn.reply"/>
<input wicket:id="deleteBtn"
type="button" wicket:message="value:80"/>
<input wicket:id="readBtn"
type="button" wicket:message="value:1248"/>
<input wicket:id="unreadBtn"
type="button" wicket:message="value:1247"/>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index e4cd252..7eea2ce 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -53,6 +53,7 @@ import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.OmOrderByBorder;
import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.openmeetings.web.user.MessageDialog;
import org.apache.openmeetings.web.user.rooms.RoomEnterBehavior;
import org.apache.openmeetings.web.util.ContactsHelper;
import org.apache.wicket.AttributeModifier;
@@ -109,11 +110,13 @@ public class MessagesContactsPanel extends UserBasePanel {
private final WebMarkupContainer contacts = new
WebMarkupContainer("contacts");
private final DataViewContainer<PrivateMessage> dataContainer;
private final Set<Long> selectedMessages = new HashSet<>();
+ private Long lastSelected = null;
private final Set<Long> allMessages = new HashSet<>();
private final Set<Long> readMessages = new HashSet<>();
private final Set<Long> unreadMessages = new HashSet<>();
private final Button toInboxBtn = new Button("toInboxBtn");
private final Button deleteBtn = new Button("deleteBtn");
+ private final Button replyBtn = new Button("replyBtn");
private final Button readBtn = new Button("readBtn");
private final Button unreadBtn = new Button("unreadBtn");
private final FixedHeaderTableBehavior fixedTable = new
FixedHeaderTableBehavior("#messagesTable", new Options("height", 100));
@@ -327,14 +330,30 @@ public class MessagesContactsPanel extends UserBasePanel {
add(buttons.setOutputMarkupId(true));
buttons.add(toInboxBtn.add(new AjaxEventBehavior(EVT_CLICK) {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- @Override
- protected void onEvent(AjaxRequestTarget target) {
-
getBean(PrivateMessageDao.class).moveMailsToFolder(selectedMessages,
INBOX_FOLDER_ID);
- selectFolder(selectedFolder,
selectedFolderModel.getObject(), target);
- }
- }));
+ @Override
+ protected void onEvent(AjaxRequestTarget
target) {
+
getBean(PrivateMessageDao.class).moveMailsToFolder(selectedMessages,
INBOX_FOLDER_ID);
+ selectFolder(selectedFolder,
selectedFolderModel.getObject(), target);
+ }
+ }));
+ buttons.add(replyBtn.add(new AjaxEventBehavior(EVT_CLICK) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget
target) {
+ PrivateMessage opm =
getBean(PrivateMessageDao.class).get(lastSelected);
+ if (opm != null) {
+ MessageDialog newDlg =
getMainPanel().getMessageDialog();
+ PrivateMessage pm =
newDlg.reset(true).getModelObject();
+ pm.setTo(opm.getFrom());
+ pm.setSubject(String.format("%s
%s", getString("messages.subject.re"), opm.getSubject()));
+
pm.setMessage(String.format("<br/><blockquote class=\"quote\">%s</blockquote>",
opm.getMessage()));
+ newDlg.open(target);
+ }
+ }
+ }));
buttons.add(deleteBtn.add(new AjaxEventBehavior(EVT_CLICK) {
private static final long serialVersionUID = 1L;
@@ -527,6 +546,7 @@ public class MessagesContactsPanel extends UserBasePanel {
readBtn.setEnabled(!TRASH_FOLDER_ID.equals(selFldr) &&
!selectedMessages.isEmpty());
unreadBtn.setEnabled(!TRASH_FOLDER_ID.equals(selFldr) &&
!selectedMessages.isEmpty());
toInboxBtn.setVisible(!INBOX_FOLDER_ID.equals(selFldr) &&
!SENT_FOLDER_ID.equals(selFldr) && !selectedMessages.isEmpty());
+ replyBtn.setEnabled(lastSelected != null);
target.add(buttons);
}
@@ -540,7 +560,10 @@ public class MessagesContactsPanel extends UserBasePanel {
selectedMessage.addOrReplace(new Label("to", msg == null ? "" :
getEmail(msg.getTo())));
selectedMessage.addOrReplace(new Label("subj", msg == null ? ""
: msg.getSubject()));
selectedMessage.addOrReplace(new Label("body", msg == null ? ""
: msg.getMessage()).setEscapeModelStrings(false));
- if (msg != null) {
+ if (msg == null) {
+ lastSelected = null;
+ } else {
+ lastSelected = id;
Room r = msg.getRoom();
if (r != null) {
Appointment a =
getBean(AppointmentDao.class).getByRoom(r.getId());
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index ec6fca8..be1acf5 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -314,6 +314,16 @@ html, body {
-webkit-border-radius: 8px;
border-radius: 8px;
}
+.private.message.body {
+ border: 0;
+ margin: 0;
+ padding: 0;
+}
+.private.message.body .quote {
+ border-left: 1px solid #cccccc;
+ margin-left: 10px;
+ padding-left: 10px;
+}
.ui-progressbar div {
text-align: center;
padding-top: 7px;
