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 2018/02/25 15:01:56 UTC
[openmeetings] 01/04: [OPENMEETINGS-1791] polls menu is extracted
from Actions
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 9ee9c31bbc74cd18d580aba5ee3b4612924f8831
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Jan 6 13:27:33 2018 +0700
[OPENMEETINGS-1791] polls menu is extracted from Actions
---
.../apache/openmeetings/web/app/Application.properties.xml | 1 +
.../openmeetings/web/app/Application_ar.properties.xml | 1 +
.../openmeetings/web/app/Application_bg.properties.xml | 1 +
.../openmeetings/web/app/Application_ca.properties.xml | 1 +
.../openmeetings/web/app/Application_cs.properties.xml | 1 +
.../openmeetings/web/app/Application_da.properties.xml | 1 +
.../openmeetings/web/app/Application_de.properties.xml | 1 +
.../openmeetings/web/app/Application_el.properties.xml | 1 +
.../openmeetings/web/app/Application_es.properties.xml | 1 +
.../openmeetings/web/app/Application_fa.properties.xml | 1 +
.../openmeetings/web/app/Application_fi.properties.xml | 1 +
.../openmeetings/web/app/Application_fr.properties.xml | 1 +
.../openmeetings/web/app/Application_gl.properties.xml | 1 +
.../openmeetings/web/app/Application_he.properties.xml | 1 +
.../openmeetings/web/app/Application_hu.properties.xml | 1 +
.../openmeetings/web/app/Application_id.properties.xml | 1 +
.../openmeetings/web/app/Application_it.properties.xml | 1 +
.../openmeetings/web/app/Application_ja.properties.xml | 1 +
.../openmeetings/web/app/Application_ko.properties.xml | 1 +
.../openmeetings/web/app/Application_nl.properties.xml | 1 +
.../openmeetings/web/app/Application_pl.properties.xml | 1 +
.../openmeetings/web/app/Application_pt.properties.xml | 1 +
.../openmeetings/web/app/Application_pt_BR.properties.xml | 1 +
.../openmeetings/web/app/Application_ru.properties.xml | 1 +
.../openmeetings/web/app/Application_sk.properties.xml | 1 +
.../openmeetings/web/app/Application_sv.properties.xml | 1 +
.../openmeetings/web/app/Application_th.properties.xml | 1 +
.../openmeetings/web/app/Application_tr.properties.xml | 1 +
.../openmeetings/web/app/Application_uk.properties.xml | 1 +
.../openmeetings/web/app/Application_zh_CN.properties.xml | 1 +
.../openmeetings/web/app/Application_zh_TW.properties.xml | 1 +
.../apache/openmeetings/web/room/menu/RoomMenuPanel.java | 13 ++++++++++---
.../openmeetings/web/room/poll/PollResultsDialog.java | 12 ++++++------
33 files changed, 47 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 d52e9f5..18c2c3b 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 d98e6e7..496dda7 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 67f6bb3..f19111e 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 1334ef7..1cc7942 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 e7c9f4b..2083d2e 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 eaac5be..a09489d 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 4065c1a..d09c91f 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
@@ -1010,4 +1010,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 79aa33f..442242e 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 6415c2b..050d51e 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
@@ -1003,4 +1003,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 1e19bbb..7583812 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
@@ -997,4 +997,5 @@ target="_blank">Custom Crypt Mechanism</a>
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 2c55743..912ae5a 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 ecb3108..fda19b4 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
@@ -997,4 +997,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 a623a89..c45c788 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 d52e9f5..18c2c3b 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 1d0d32c..b76c80b 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
@@ -993,4 +993,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 cfc4187..2a42eec 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 aad4f40..17beae1 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
@@ -1006,4 +1006,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 2d83344..a7ad255 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 70b97b2..87a2985 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 3ef8c59..bdd4173 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 8ceaeb7..938fa48 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 fe65abd..3cd7ec9 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 ed4bb90..6772054 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 fddc01a..c6dfc77 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
@@ -1006,4 +1006,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Изменить]]></entry>
<entry key="send.on.enter"><![CDATA[Отправить по Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Отправить по Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![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 8a781cb..3d67bb6 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 0411ff0..71d8cc9 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 2edf215..ce97830 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 118c956..6cb17c0 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 ae77f7e..b2757ee 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
@@ -1006,4 +1006,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 3ad56c5..75f795e 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
@@ -995,4 +995,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></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 b095b61..39c008d 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
@@ -1005,4 +1005,5 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="lbl.update"><![CDATA[Update]]></entry>
<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+ <entry key="menu.polls"><![CDATA[Polls]]></entry>
</properties>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 239ffca..fd1ba8e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -101,6 +101,7 @@ public class RoomMenuPanel extends Panel {
private RoomMenuItem exitMenuItem;
private RoomMenuItem filesMenu;
private RoomMenuItem actionsMenu;
+ private RoomMenuItem pollsMenu;
private RoomMenuItem inviteMenuItem;
private RoomMenuItem shareMenuItem;
private RoomMenuItem applyModerMenuItem;
@@ -161,6 +162,8 @@ public class RoomMenuPanel extends Panel {
};
filesMenu = new RoomMenuItem(getString("245"), null, false);
actionsMenu = new RoomMenuItem(getString("635"), null, false);
+ pollsMenu = new RoomMenuItem(getString("menu.polls"), null, false);
+
inviteMenuItem = new RoomMenuItem(getString("213"), getString("1489"), false) {
private static final long serialVersionUID = 1L;
@@ -309,14 +312,17 @@ public class RoomMenuPanel extends Panel {
actionsMenu.getItems().add(applyModerMenuItem);
actionsMenu.getItems().add(applyWbMenuItem);
actionsMenu.getItems().add(applyAvMenuItem);
- actionsMenu.getItems().add(pollCreateMenuItem);
- actionsMenu.getItems().add(pollResultMenuItem);
- actionsMenu.getItems().add(pollVoteMenuItem);
actionsMenu.getItems().add(sipDialerMenuItem);
actionsMenu.getItems().add(downloadPngMenuItem);
actionsMenu.getItems().add(downloadJpgMenuItem);
actionsMenu.getItems().add(downloadPdfMenuItem);
menu.add(actionsMenu);
+
+ pollsMenu.setTop(true);
+ pollsMenu.getItems().add(pollCreateMenuItem);
+ pollsMenu.getItems().add(pollResultMenuItem);
+ pollsMenu.getItems().add(pollVoteMenuItem);
+ menu.add(pollsMenu);
return menu;
}
@@ -337,6 +343,7 @@ public class RoomMenuPanel extends Panel {
filesMenu.setEnabled(!isInterview && room.getSidebar().isShowFiles());
boolean moder = room.getClient().hasRight(Room.Right.moderator);
actionsMenu.setEnabled((moder && !r.isHidden(RoomElement.ActionMenu)) || (!moder && r.isAllowUserQuestions()));
+ pollsMenu.setEnabled((moder && !r.isHidden(RoomElement.ActionMenu)) || (!moder && r.isAllowUserQuestions()));
inviteMenuItem.setEnabled(notExternalUser && moder);
boolean shareVisible = room.screenShareAllowed();
shareMenuItem.setEnabled(shareVisible);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index a621fbe..97576ac 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -230,13 +230,13 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private static Integer[] getValues(RoomPoll p) {
Integer[] values = initValues(p != null && RoomPoll.Type.numeric == p.getType() ? 10 : 2);
- if (p != null && RoomPoll.Type.numeric == p.getType()) {
+ if (p != null) {
for (RoomPollAnswer a : p.getAnswers()) {
- values[a.getPointList() - 1] ++;
- }
- } else if (p != null) {
- for (RoomPollAnswer a : p.getAnswers()) {
- values[a.getAnswer() ? 0 : 1] ++;
+ if (RoomPoll.Type.numeric == p.getType()) {
+ values[a.getPointList() - 1] ++;
+ } else {
+ values[Boolean.FALSE.equals(a.getAnswer()) ? 0 : 1] ++;
+ }
}
}
return values;
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.