Repository: openmeetings Updated Branches: refs/heads/OPENMEETINGS-1791-quick-poll [created] 3e0687a85
[OPENMEETINGS-1791] polls menu is extracted from Actions Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/613d94f5 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/613d94f5 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/613d94f5 Branch: refs/heads/OPENMEETINGS-1791-quick-poll Commit: 613d94f512c66e1294b979524acac58611d156e4 Parents: 2c4af69 Author: Maxim Solodovnik <[email protected]> Authored: Sat Jan 6 13:27:33 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Jan 6 13:27:33 2018 +0700 ---------------------------------------------------------------------- .../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 + .../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 + .../web/app/Application_zh_CN.properties.xml | 1 + .../web/app/Application_zh_TW.properties.xml | 1 + .../openmeetings/web/room/menu/RoomMenuPanel.java | 13 ++++++++++--- .../openmeetings/web/room/poll/PollResultsDialog.java | 12 ++++++------ 33 files changed, 47 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 16d3bad..9662692 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 3e3d810..a725842 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 0f57dce..50c9934 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 0d89800..75fb4f0 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 268e180..81ad7a7 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 f4323ee..6e3be1b 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 2ee8243..23c6105 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 26a5dcc..c4a2933 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 da6a47c..9572337 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 ec09a5a..8a9f02f 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 @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 38443d0..d46ea44 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 59e6ba6..0ddceda 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 743cbd1..cc4a8a3 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 16d3bad..9662692 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 fab98eb..565a612 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 2f93fc0..e869cd8 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 4a8dd3d..8b70bc7 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 1dcb6be..7886633 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 bc0a118..ba405b7 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 b5dd4d3..5f154cf 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 c667eb1..6a28791 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 ffe2138..fcd4fcb 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 62327f0..5ffd565 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 a6f9406..850824b 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 597abfd..096cc19 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 76b34e7..9bc3f45 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 90d0e7b..e7a4de4 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 07ff504..edd11ee 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 54610be..2040110 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 8d69ecb..ca8855e 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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/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 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); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/613d94f5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java ---------------------------------------------------------------------- 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;
