Revision: 4594
Author: solomax666
Date: Sat Nov 19 12:16:05 2011
Log: - close and delete poll functionality is added
http://code.google.com/p/openmeetings/source/detail?r=4594
Modified:
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/bulgarian.xml
/trunk/singlewebapp/WebContent/languages/catalan.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/danish.xml
/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/dutch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/slovak.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/src/base/contentviews/confirmDeleteWindow.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/polls/resultPollWin.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Sat Nov 19 12:16:05
2011
@@ -4252,10 +4252,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Sat Nov 19
12:16:05 2011
@@ -4256,4 +4256,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Thu Nov
17 07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sat Nov
19 12:16:05 2011
@@ -4251,10 +4251,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Thu
Nov 17 07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Sat
Nov 19 12:16:05 2011
@@ -4263,4 +4263,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Sat Nov 19 12:16:05
2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Sat Nov 19 12:16:05
2011
@@ -4256,4 +4256,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Fri Nov
18 02:08:05 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Sat Nov
19 12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>Neue Nachricht(en)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Fri Nov 18
02:08:05 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>Neue Nachricht(en)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Sat Nov 19 12:16:05
2011
@@ -4253,4 +4253,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Sat Nov 19
12:16:05 2011
@@ -4250,10 +4250,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Sat Nov 19 12:16:05
2011
@@ -4251,10 +4251,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Sat Nov 19 12:16:05
2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Sat Nov 19 12:16:05
2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Sat Nov 19 12:16:05
2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Sat Nov 19 12:16:05
2011
@@ -4330,4 +4330,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Thu Nov
17 07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Sat Nov
19 12:16:05 2011
@@ -4257,10 +4257,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Sat Nov 19
12:16:05 2011
@@ -4251,10 +4251,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Sat Nov 19
12:16:05 2011
@@ -4257,10 +4257,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Sat Nov 19 12:16:05
2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Sat Nov 19
12:16:05 2011
@@ -4265,4 +4265,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Sat Nov 19
12:16:05 2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Thu Nov 17 07:53:53
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Sat Nov 19 12:16:05
2011
@@ -4257,4 +4257,16 @@
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Sat Nov 19
12:16:05 2011
@@ -4250,10 +4250,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Sat Nov 19
12:16:05 2011
@@ -4251,10 +4251,22 @@
<string id="1415" name="chart_pie">
<value>Pie Chart</value>
</string>
- <string id="1416" name="sign_up_validation">
+ <string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
<string id="1417" name="chat_notification">
<value>New message(s)</value>
</string>
+ <string id="1418" name="poll_close">
+ <value>Close Poll</value>
+ </string>
+ <string id="1419" name="poll_close_confirm">
+ <value>Are you sure you want to close this Poll? No one will be able
to vote</value>
+ </string>
+ <string id="1420" name="poll_delete">
+ <value>Delete Poll</value>
+ </string>
+ <string id="1421" name="poll_delete_confirm">
+ <value>Are you sure you want to delete this Poll? The results will be
deleted as well.</value>
+ </string>
</language>
=======================================
---
/trunk/singlewebapp/WebContent/src/base/contentviews/confirmDeleteWindow.lzx
Mon Oct 12 03:48:00 2009
+++
/trunk/singlewebapp/WebContent/src/base/contentviews/confirmDeleteWindow.lzx
Sat Nov 19 12:16:05 2011
@@ -5,9 +5,8 @@
docking="true" width="264" x="450" y="20" height="200">
<attribute name="refObj" value="null" />
-
-
<attribute name="messagelabelid" value="153" type="number" />
+ <attribute name="confirmlabelid" value="154" type="number" />
<handler name="oninit">
lz.ModeManager.makeModal(this);
@@ -20,7 +19,7 @@
<labelText labelid="$once{ parent.messagelabelid }" y="22" x="4"
width="$once{ parent.width - 8 }" multiline="true"/>
- <simpleLabelButton labelid="154" width="100" x="40" y="170">
+ <simpleLabelButton labelid="$once{ parent.confirmlabelid }"
width="100" x="40" y="170">
<handler name="onclick">
//Debug.write("confirm");
this.parent.refObj.confirmDelete();
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/polls/resultPollWin.lzx
Sat Nov 12 03:24:04 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/polls/resultPollWin.lzx
Sat Nov 19 12:16:05 2011
@@ -8,18 +8,22 @@
<attribute name="roomPoll" value="null" />
<attribute name="archPolls" value="null" />
<attribute name="resultpollvotes" value="null" />
+ <attribute name="displayedPoll" value="null" />
<handler name="oninit">
- this.displayResults(roomPoll);
+ displayResults(roomPoll);
</handler>
-
+
<method name="displayResults" args="poll">
<![CDATA[
+ displayedPoll = poll;
this.content.setAttribute("visible", poll != null);
if (poll == null) {
this.head.setAttribute('text',
canvas.getLabelName(41));
+ updateButtons();
return;
}
+ updateButtons();
this.head.setAttribute('text',
(canvas.user_id ==
poll.createdBy.user_id ? canvas
.getLabelName(1411) :
poll.createdBy.login)
@@ -105,18 +109,17 @@
funcname="pollservice.getArchivedPollList" remotecontext="$once{
canvas.thishib }">
<handler name="ondata" args="value">
<![CDATA[
-
-
+ parent.removeAll();
if ($debug)
Debug.write("getArchivedPollList
", value);
- if (value == null) {
-
this.parent.setAttribute("visible", false);
-
this.parent.parent.archPollLbl.setAttribute("visible",
- false);
+ this.parent.parent.archPolls = value;
+ var noArch = (value == null || (value != null
&& value.length == 0));
+ parent.setAttribute("visible", !noArch);
+
parent.parent.archPollLbl.setAttribute("visible", !noArch);
+ if (noArch) {
return;
}
- this.parent.parent.archPolls = value;
if (this.parent.parent.roomPoll !=
null) {
this.parent.addItem(
this.parent.parent.roomPoll.pollName + "("
@@ -131,9 +134,11 @@
]]>
</handler>
</netRemoteCallHib>
+
<handler name="oninit">
this.getArchivedPollList.doCall();
</handler>
+
<handler name="onselect" args="sel">
if ($debug)
Debug.write("onselect ", sel);
@@ -141,6 +146,16 @@
?
this.parent.archPolls[sel.value]
: this.parent.roomPoll);
</handler>
+
+ <method name="removeAll">
+ <![CDATA[
+ var currentCount = this.cblist.getNumItems();
+ if ($debug) Debug.write("currentCount = ",
currentCount);
+ for (var i = 0; i < currentCount; ++i) {
+ this.removeItemAt(0);
+ }
+ ]]>
+ </method>
</resetCombobox>
<labelText x="2" y="42" name="head" fontstyle="bold" />
@@ -159,11 +174,8 @@
<labeldTextListItem labelid="1414" value="0"/>
<labeldTextListItem labelid="1415" value="1"
selected="true" />
<handler name="onselect" args="sel">
- if ($debug)
- Debug.write("onselect ", sel);
+ if ($debug) Debug.write("onselect ",
sel);
var val =
parent.parent._archPolls.getValue();
- if ($debug)
- Debug.write("AAAAA ", val);
parent.parent.displayResults(val > -1
?
parent.parent.archPolls[val]
:
parent.parent.roomPoll);
@@ -173,6 +185,56 @@
<labelText y="146" labelid="40" x="2" />
</view>
+ <method name="updateButtons">
+ <![CDATA[
+ _deletePoll.setAttribute("visible", canvas.ismoderator &&
displayedPoll != null);
+ var hasArch = _archPolls.cblist.getNumItems() > 0;
+ _closePoll.setAttribute("visible", _deletePoll.visible && (!hasArch ||
(hasArch && _archPolls.getValue() == -1)));
+ ]]>
+ </method>
+
+ <simpleLabelButton name="_deletePoll" labelid="1420" width="100"
+ x="2" y="$once{ parent.height-22 }"
+ onclick="new lz.confirmDeleteWindow(parent, {refObj: this,
labelid: 1420, messagelabelid: 1421});"
+ >
+ <netRemoteCallHib name="deletePoll"
funcname="pollservice.deletePoll" remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue"> var poll =
parent.parent.parent.displayedPoll; return poll != null ? poll.roomPollId :
-1; </method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ var p = parent.parent;
+ var archCount =
p._archPolls.cblist.getNumItems();
+ var hasArch = archCount > 0;
+ if (!hasArch || (hasArch &&
p._archPolls.getValue() == -1)) {
+ p.roomPoll = null;
+ }
+ if (archCount) {
+ p.displayResults(null);
+ }
+ p._archPolls.getArchivedPollList.doCall();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+ <method name="confirmDelete">
+ deletePoll.doCall();
+ </method>
+ </simpleLabelButton>
+
+ <simpleLabelButton name="_closePoll" labelid="1418" width="100"
+ x="104" y="$once{ parent.height-22 }"
+ onclick="new lz.confirmDeleteWindow(parent, {refObj: this,
labelid: 1418, confirmlabelid: 85, messagelabelid: 1419});"
+ >
+ <netRemoteCallHib name="closePoll" funcname="pollservice.closePoll"
remotecontext="$once{ canvas.thishib }" >
+ <handler name="ondata" args="value">
+ parent.parent.roomPoll = null;
+
parent.parent._archPolls.getArchivedPollList.doCall();
+ </handler>
+ </netRemoteCallHib>
+ <method name="confirmDelete">
+ if ($debug) Debug.write("parent._archPolls.getValue(); ",
parent._archPolls.getValue());
+ closePoll.doCall();
+ </method>
+ </simpleLabelButton>
+
<simpleLabelButton labelid="25" width="100" x="$once{
parent.width-102 }"
y="$once{ parent.height-22 }" onclick="this.parent.close();" />
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
Sun Nov 13 01:26:51 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/PollManagement.java
Sat Nov 19 12:16:05 2011
@@ -78,16 +78,29 @@
return em.merge(rp);
}
- public void clearRoomPollList(Long room_id){
+ public boolean closePoll(Long room_id){
try {
- log.debug(" :: clearRoomPollList :: ");
+ log.debug(" :: closePoll :: ");
Query q = em.createQuery("UPDATE RoomPoll rp SET rp.archived
= :archived WHERE rp.room.rooms_id = :rooms_id");
q.setParameter("rooms_id", room_id);
q.setParameter("archived", true);
- q.executeUpdate();
+ return q.executeUpdate() > 0;
} catch (Exception err) {
- log.error("[clearRoomPollList]", err);
- }
+ log.error("[closePoll]", err);
+ }
+ return false;
+ }
+
+ public boolean deletePoll(Long poll_id){
+ try {
+ log.debug(" :: deletePoll :: ");
+ Query q = em.createQuery("DELETE FROM RoomPoll rp WHERE rp.roomPollId
= :roomPollId");
+ q.setParameter("roomPollId", poll_id);
+ return q.executeUpdate() > 0;
+ } catch (Exception err) {
+ log.error("[deletePoll]", err);
+ }
+ return false;
}
public RoomPoll getPoll(Long room_id) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
Sun Nov 13 01:26:51 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PollService.java
Sat Nov 19 12:16:05 2011
@@ -55,7 +55,7 @@
if (rc.getIsMod()) {
// will move all existing polls to the archive
-
pollManagement.clearRoomPollList(rc.getRoom_id());
+ pollManagement.closePoll(rc.getRoom_id());
sendNotification(currentcon, "newPoll",
new Object[] {
pollManagement.createPoll(rc,
@@ -72,8 +72,48 @@
return returnValue;
}
- public void clearRoomPollList(Long room_id) {
- pollManagement.clearRoomPollList(room_id);
+ public boolean closePoll() {
+ try {
+ log.debug("closePoll: ");
+
+ IConnection currentcon = Red5.getConnectionLocal();
+ RoomClient rc =
clientListManager.getClientByStreamId(currentcon
+ .getClient().getId());
+
+ log.debug("rc: " + rc.getStreamid() + " " + rc.getUsername() +
" "
+ + rc.getIsMod());
+
+ if (rc.getIsMod()) {
+ // will move all existing polls to the archive
+ return
pollManagement.closePoll(rc.getRoom_id());
+ }
+
+ } catch (Exception err) {
+ log.error("[closePoll]", err);
+ }
+ return false;
+ }
+
+ public boolean deletePoll(Long poll_id) {
+ try {
+ log.debug("closePoll: ");
+
+ IConnection currentcon = Red5.getConnectionLocal();
+ RoomClient rc =
clientListManager.getClientByStreamId(currentcon
+ .getClient().getId());
+
+ log.debug("rc: " + rc.getStreamid() + " " + rc.getUsername() +
" "
+ + rc.getIsMod());
+
+ if (rc.getIsMod()) {
+ // will move all existing polls to the archive
+ return pollManagement.deletePoll(poll_id);
+ }
+
+ } catch (Exception err) {
+ log.error("[closePoll]", err);
+ }
+ return false;
}
public void sendNotification(IConnection current, String clientFunction,
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sat Oct 1 11:15:55 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sat Nov 19 12:16:05 2011
@@ -87,8 +87,6 @@
private UsersDaoImpl usersDao;
@Autowired
private MeetingMemberDaoImpl meetingMemberDao;
- @Autowired
- private PollManagement pollManagement;
// This is the Folder where all executables are written
// for windows platform
@@ -758,16 +756,6 @@
}
this.clientListManager.removeClient(currentClient.getStreamid());
-
- // If this Room is empty clear the Room Poll List
- HashMap<String, RoomClient> rcpList =
this.clientListManager
- .getClientListByRoom(room_id);
- log.debug("roomLeave rcpList size: " + rcpList.size());
- if (rcpList.size() == 0) {
- pollManagement.clearRoomPollList(room_id);
- // log.debug("clearRoomPollList cleared");
- }
-
} catch (Exception err) {
log.error("[roomLeaveByScope]", err);
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
