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:57 UTC
[openmeetings] 02/04: [OPENMEETINGS-1791] quick poll menu item and
labels are added
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 be11b9f4e66f2651490281ac8754257d4176be23
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jan 11 22:05:17 2018 +0700
[OPENMEETINGS-1791] quick poll menu item and labels are added
---
.../apache/openmeetings/web/app/Application.properties.xml | 2 ++
.../openmeetings/web/app/Application_ar.properties.xml | 2 ++
.../openmeetings/web/app/Application_bg.properties.xml | 2 ++
.../openmeetings/web/app/Application_ca.properties.xml | 2 ++
.../openmeetings/web/app/Application_cs.properties.xml | 2 ++
.../openmeetings/web/app/Application_da.properties.xml | 2 ++
.../openmeetings/web/app/Application_de.properties.xml | 2 ++
.../openmeetings/web/app/Application_el.properties.xml | 2 ++
.../openmeetings/web/app/Application_es.properties.xml | 2 ++
.../openmeetings/web/app/Application_fa.properties.xml | 2 ++
.../openmeetings/web/app/Application_fi.properties.xml | 2 ++
.../openmeetings/web/app/Application_fr.properties.xml | 2 ++
.../openmeetings/web/app/Application_gl.properties.xml | 2 ++
.../openmeetings/web/app/Application_he.properties.xml | 2 ++
.../openmeetings/web/app/Application_hu.properties.xml | 2 ++
.../openmeetings/web/app/Application_id.properties.xml | 2 ++
.../openmeetings/web/app/Application_it.properties.xml | 2 ++
.../openmeetings/web/app/Application_ja.properties.xml | 2 ++
.../openmeetings/web/app/Application_ko.properties.xml | 2 ++
.../openmeetings/web/app/Application_nl.properties.xml | 2 ++
.../openmeetings/web/app/Application_pl.properties.xml | 2 ++
.../openmeetings/web/app/Application_pt.properties.xml | 2 ++
.../openmeetings/web/app/Application_pt_BR.properties.xml | 2 ++
.../openmeetings/web/app/Application_ru.properties.xml | 2 ++
.../openmeetings/web/app/Application_sk.properties.xml | 2 ++
.../openmeetings/web/app/Application_sv.properties.xml | 2 ++
.../openmeetings/web/app/Application_th.properties.xml | 2 ++
.../openmeetings/web/app/Application_tr.properties.xml | 2 ++
.../openmeetings/web/app/Application_uk.properties.xml | 2 ++
.../openmeetings/web/app/Application_zh_CN.properties.xml | 2 ++
.../openmeetings/web/app/Application_zh_TW.properties.xml | 2 ++
.../org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 12 ++++++++++++
32 files changed, 74 insertions(+)
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 18c2c3b..38b1d9e 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 496dda7..a578f36 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 f19111e..8152706 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 1cc7942..dc492fd 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 2083d2e..e7d8b30 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 a09489d..dfd7056 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 d09c91f..f17b2cc 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
@@ -1011,4 +1011,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 442242e..89c99f7 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 050d51e..a8458c9 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
@@ -1004,4 +1004,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 7583812..c71b38a 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
@@ -998,4 +998,6 @@ target="_blank">Custom Crypt Mechanism</a>
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 912ae5a..1f6dea4 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 fda19b4..03920a7 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
@@ -998,4 +998,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 c45c788..de449db 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 18c2c3b..38b1d9e 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 b76c80b..9d0c205 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
@@ -994,4 +994,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 2a42eec..91fc993 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 17beae1..b671d17 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
@@ -1007,4 +1007,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 a7ad255..3d4012d 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 87a2985..1ec4b38 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 bdd4173..f94c27d 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 938fa48..b03a26f 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 3cd7ec9..f776aa3 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 6772054..19788aa 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 c6dfc77..2cfaf8a 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
@@ -1007,4 +1007,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="send.on.enter"><![CDATA[Отправить по Enter]]></entry>
<entry key="send.on.ctrl.enter"><![CDATA[Отправить по Ctrl+Enter]]></entry>
<entry key="menu.polls"><![CDATA[Голосования]]></entry>
+ <entry key="menu.polls.quick.title"><![CDATA[Создать быстрый опрос]]></entry>
+ <entry key="menu.polls.quick.descr"><![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 3d67bb6..1f28fae 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 71d8cc9..88b0a70 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 ce97830..68c4d52 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 6cb17c0..6c22637 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 b2757ee..35ad1db 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
@@ -1007,4 +1007,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 75f795e..8acdf99 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
@@ -996,4 +996,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 39c008d..3496640 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
@@ -1006,4 +1006,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<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>
+ <entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
+ <entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></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 fd1ba8e..655c234 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
@@ -107,6 +107,7 @@ public class RoomMenuPanel extends Panel {
private RoomMenuItem applyModerMenuItem;
private RoomMenuItem applyWbMenuItem;
private RoomMenuItem applyAvMenuItem;
+ private RoomMenuItem pollQuickMenuItem;
private RoomMenuItem pollCreateMenuItem;
private RoomMenuItem pollVoteMenuItem;
private RoomMenuItem pollResultMenuItem;
@@ -205,6 +206,15 @@ public class RoomMenuPanel extends Panel {
room.requestRight(Room.Right.video, target);
}
};
+ pollQuickMenuItem = new RoomMenuItem(getString("menu.polls.quick.title"), getString("menu.polls.quick.descr"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ //createPoll.updateModel(target);
+ //createPoll.open(target);
+ }
+ };
pollCreateMenuItem = new RoomMenuItem(getString("24"), getString("1483"), false) {
private static final long serialVersionUID = 1L;
@@ -319,6 +329,7 @@ public class RoomMenuPanel extends Panel {
menu.add(actionsMenu);
pollsMenu.setTop(true);
+ pollsMenu.getItems().add(pollQuickMenuItem);
pollsMenu.getItems().add(pollCreateMenuItem);
pollsMenu.getItems().add(pollResultMenuItem);
pollsMenu.getItems().add(pollVoteMenuItem);
@@ -350,6 +361,7 @@ public class RoomMenuPanel extends Panel {
applyModerMenuItem.setEnabled(!moder);
applyWbMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.whiteBoard));
applyAvMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.audio) || !room.getClient().hasRight(Room.Right.video));
+ pollQuickMenuItem.setEnabled(moder);
pollCreateMenuItem.setEnabled(moder);
pollVoteMenuItem.setEnabled(pollExists && notExternalUser && !pollDao.hasVoted(r.getId(), getUserId()));
pollResultMenuItem.setEnabled(pollExists || !pollDao.getArchived(r.getId()).isEmpty());
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.