[OPENMEETINGS-1791] quick poll menu item and labels are added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/611e0efa Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/611e0efa Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/611e0efa Branch: refs/heads/OPENMEETINGS-1791-quick-poll Commit: 611e0efa599a76e011fcaf10c4d220eb72d3ea6a Parents: 80e86e2 Author: Maxim Solodovnik <[email protected]> Authored: Thu Jan 11 22:05:17 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jan 11 22:05:17 2018 +0700 ---------------------------------------------------------------------- .../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 ++ .../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 ++ .../web/app/Application_zh_CN.properties.xml | 2 ++ .../web/app/Application_zh_TW.properties.xml | 2 ++ .../openmeetings/web/room/menu/RoomMenuPanel.java | 12 ++++++++++++ 32 files changed, 74 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index 9662692..30ffb2a 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index a725842..1e97c00 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml index 50c9934..2988523 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml index 75fb4f0..0d6ff9a 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml index 81ad7a7..6ee5a24 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml index 6e3be1b..c76cbf0 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml index 23c6105..8aed052 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml index c4a2933..8accabe 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml index 9572337..ddd593c 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml index 8a9f02f..4379bca 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 @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml index d46ea44..261d08f 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml index 0ddceda..4e73081 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml index cc4a8a3..e59f0a3 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml index 9662692..30ffb2a 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml index 565a612..2b0d064 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml index e869cd8..48bce24 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml index 8b70bc7..2a7c7e5 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml index 7886633..743ac0d 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml index ba405b7..9a91612 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml index 5f154cf..daa2f23 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml index 6a28791..d7e5473 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml index fcd4fcb..308d1af 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml index 5ffd565..8bd9035 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml index 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml index 850824b..513f95b 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml index 096cc19..13798aa 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml index 9bc3f45..b71cce7 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml index e7a4de4..eb76409 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml index edd11ee..1c24576 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml index 2040110..b2bcfce 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml index ca8855e..24af473 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/611e0efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- 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());
