You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by es...@apache.org on 2012/01/18 23:20:31 UTC
svn commit: r1233095 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/src/modules/admin/roomadmin/
WebContent/src/modules/conference/
WebContent/src/modules/conference/flexibleConferenceRoom/
WebContent/src/modules/conf...
Author: eschwert
Date: Wed Jan 18 22:20:29 2012
New Revision: 1233095
URL: http://svn.apache.org/viewvc?rev=1233095&view=rev
Log:
OPENMEETINGS-20 OPENMEETINGS-25
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoViewContent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Wed Jan 18 22:20:29 2012
@@ -4327,4 +4327,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Wed Jan 18 22:20:29 2012
@@ -4325,4 +4325,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Wed Jan 18 22:20:29 2012
@@ -4332,4 +4332,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Wed Jan 18 22:20:29 2012
@@ -4325,4 +4325,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Wed Jan 18 22:20:29 2012
@@ -4322,4 +4322,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Wed Jan 18 22:20:29 2012
@@ -4325,4 +4325,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Wed Jan 18 22:20:29 2012
@@ -4399,4 +4399,7 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Wed Jan 18 22:20:29 2012
@@ -4332,4 +4332,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Wed Jan 18 22:20:29 2012
@@ -4334,4 +4334,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Wed Jan 18 22:20:29 2012
@@ -4325,4 +4325,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Wed Jan 18 22:20:29 2012
@@ -4326,4 +4326,7 @@ see http://code.google.com/p/openmeeting
<string id="1440" name="hide_screen_sharing">
<value>Hide screen sharing</value>
</string>
+ <string id="1441" name="hide_whiteboard">
+ <value>Hide whiteboard</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx Wed Jan 18 22:20:29 2012
@@ -46,6 +46,7 @@
this.hideFilesExplorer.setValue(false);
this.hideActionsMenu.setValue(false);
this.hideScreenSharing.setValue(false);
+ this.hideWhiteboard.setValue(false);
</handler>
<handler name="ondelete" >
@@ -191,6 +192,12 @@
this.hideScreenSharing.setValue(false);
}
+ if (obj.hideWhiteboard != null && obj.hideWhiteboard){
+ this.hideWhiteboard.setValue(true);
+ } else {
+ this.hideWhiteboard.setValue(false);
+ }
+
this._listRoomModerators.getRoomModeratorsByRoomId.doCall();
]]>
</method>
@@ -287,6 +294,7 @@
this.sendObject["hideScreenSharing"] = parent.hideScreenSharing.getValue();
+ this.sendObject["hideWhiteboard"] = parent.hideWhiteboard.getValue();
var ownerId = parent.ownerId.getText();
if (ownerId == "") ownerId = 0;
@@ -525,6 +533,9 @@
<labelText labelid="1440" width="200" y="1000" resize="false" x="2" />
<labelCheckbox name="hideScreenSharing" width="270" y="1000" x="130" fontsize="11" />
+
+ <labelText labelid="1441" width="200" y="1020" resize="false" x="2" />
+ <labelCheckbox name="hideWhiteboard" width="270" y="1020" x="130" fontsize="11" />
<!-- RoomClient List Right Side -->
<labelText labelid="587" width="300" y="40" resize="false"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoViewContent.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoViewContent.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoViewContent.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoViewContent.lzx Wed Jan 18 22:20:29 2012
@@ -49,4 +49,51 @@
</class>
+<class name="commonVideoViewContentHideWhiteboard" extends="view">
+
+ <!--
+ This method returns a free position for a new video object
+ @param horizontal offset between two video objects
+ -->
+ <method name="getVideoObjectFreePos" args="offsetLength,videoWidth,videoHeight">
+ <![CDATA[
+ var newx = 20;
+ var newy = 0;
+ var posFound = false;
+ while (!posFound) {
+ posFound = true;
+ for (var i=0;i<this.subviews.length;i++){
+ var subview = this.subviews[i];
+ var left = subview.x;
+ var right = subview.x + subview.width;
+ var top = subview.y;
+ var bottom = subview.y + subview.height;
+
+ if( !(newx > right
+ || (newx + videoWidth) < left
+ || newy > bottom
+ || (newy + videoHeight) < top ))
+ {
+ newx = right + offsetLength;
+ posFound = false;
+ }
+ if ((newx + videoWidth) >= this.width) {
+ newx = 20;
+ newy += 10;
+ posFound = false;
+ }
+ }
+ }
+
+ if ((newy + videoHeight) >= parent.height) {
+ newy = 0;
+ }
+
+ var result = [newx, newy];
+ return result;
+ ]]>
+ </method>
+
+</class>
+
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx Wed Jan 18 22:20:29 2012
@@ -118,7 +118,16 @@
y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) - ((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" />
-
+
+ <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-30}" clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn" width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar" visibility="visible"></vscrollbar>
+ </view>
+
<!--
###############################
This is the container for all Videos
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Wed Jan 18 22:20:29 2012
@@ -123,7 +123,8 @@
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height) - ((parent._chatPanelStrict.visibility == 'hidden') ? 0:28)}" />
+ height="${ canvas.height - (parent._chatPanelStrict.height) -
+ ((parent._chatPanelStrict.visibility == 'hidden') ? 0:28)}" />
<!--
###############################
@@ -131,6 +132,15 @@
-->
<commonVideoViewContent name="_videoviewcontent" />
+ <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-30}" clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn" width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar" visibility="visible"></vscrollbar>
+ </view>
+
</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx Wed Jan 18 22:20:29 2012
@@ -117,6 +117,15 @@
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) - 28 }" />
+ <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-30}" clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn" width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar" visibility="visible"></vscrollbar>
+ </view>
+
<!--
###############################
This is the container for all Videos
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Wed Jan 18 22:20:29 2012
@@ -113,6 +113,15 @@
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) - ((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" />
+ <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-30}" clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn" width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar" visibility="visible"></vscrollbar>
+ </view>
+
<!--
###############################
This is the container for all Videos
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx Wed Jan 18 22:20:29 2012
@@ -112,7 +112,16 @@
y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) - ((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" />
-
+
+ <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-30}" clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn" width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar" visibility="visible"></vscrollbar>
+ </view>
+
<!--
###############################
This is the container for all Videos
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx Wed Jan 18 22:20:29 2012
@@ -168,31 +168,51 @@
-->
<method name="getVideoObjectByPublicSID" args="publicSID">
<![CDATA[
- //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID,parent.parent);
-
- //for (var i=0;i<this._videoviewcontent.subviews.length;i++){
- // if ($debug) Debug.write("getVideoObjectByBroadCastId6 broadcastId: ",this._videoviewcontent.subviews[i].broadcastId);
- // if ($debug) Debug.write("getVideoObjectByBroadCastId7 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
- //}
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- for (var i=0;i<videoContainer.subviews.length;i++){
- //if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",this._videoviewcontent.subviews[i].broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId3 broadcastId SEARCH: ",broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId4 obj: ",this._videoviewcontent.subviews[i]);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId5 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
- if (videoContainer.subviews[i].publicSID==publicSID){
- return videoContainer.subviews[i];
- }
- }
-
- if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
-
- return null;
-
+ if(canvas.currentRoomObj.hideWhiteboard){
+ var videoContainer = _videoviewcontent_hideWhiteboard._inn;
+ //if (this.userNewVideoContainer) {
+ // videoContainer = parent.parent._videoviewcontent;
+ //}
+
+ for (var i=0;i<videoContainer.subviews.length;i++){
+ //if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",this._videoviewcontent.subviews[i].broadcastId);
+ //if ($debug) Debug.write("getVideoObjectByBroadCastId3 broadcastId SEARCH: ",broadcastId);
+ //if ($debug) Debug.write("getVideoObjectByBroadCastId4 obj: ",this._videoviewcontent.subviews[i]);
+ //if ($debug) Debug.write("getVideoObjectByBroadCastId5 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
+ if (videoContainer.subviews[i].publicSID==publicSID){
+ return videoContainer.subviews[i];
+ }
+ }
+
+ if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
+
+ return null;
+ }else{
+ //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID,parent.parent);
+
+ //for (var i=0;i<this._videoviewcontent.subviews.length;i++){
+ // if ($debug) Debug.write("getVideoObjectByBroadCastId6 broadcastId: ",this._videoviewcontent.subviews[i].broadcastId);
+ // if ($debug) Debug.write("getVideoObjectByBroadCastId7 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
+ //}
+ var videoContainer = this._videoviewcontent;
+ if (this.userNewVideoContainer) {
+ videoContainer = parent.parent._videoviewcontent;
+ }
+
+ for (var i=0;i<videoContainer.subviews.length;i++){
+ //if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",this._videoviewcontent.subviews[i].broadcastId);
+ //if ($debug) Debug.write("getVideoObjectByBroadCastId3 broadcastId SEARCH: ",broadcastId);
+ //if ($debug) Debug.write("getVideoObjectByBroadCastId4 obj: ",this._videoviewcontent.subviews[i]);
+ //if ($debug) Debug.write("getVideoObjectByBroadCastId5 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
+ if (videoContainer.subviews[i].publicSID==publicSID){
+ return videoContainer.subviews[i];
+ }
+ }
+
+ if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
+
+ return null;
+ }
]]>
</method>
@@ -295,6 +315,34 @@
-->
<method name="getNewVideoObject" args="publicSID">
<![CDATA[
+ if(canvas.currentRoomObj.hideWhiteboard){
+ var obj = this.getVideoObjectByPublicSID(publicSID);
+ if (obj!=null){
+ this.broadCastViewRef = obj;
+ } else {
+
+ var videoContainer = _videoviewcontent_hideWhiteboard._inn;
+ if (this.userNewVideoContainer) {
+ videoContainer = _videoviewcontent_hideWhiteboard._inn;
+ }
+
+ if ($debug) Debug.warn("videoContainer ",videoContainer);
+
+ //Get a Free VideoView Slot
+ var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
+
+ this.broadCastViewRef = new lz.videoObjectBroadcast(videoContainer,{
+ publicSID:publicSID,
+ x:freePos[0],y:freePos[1],
+ hidebyAudioOnly:true
+ });
+ canvas.currentusercolor = this.getColorForUser();
+ this.broadCastViewRef._chatvideoinner.r.destroy();
+ canvas.thishib.setAudienceModus.doCall();
+ this.broadCastViewRef.setAttribute('chatpartnername',hib.userobject.firstname+' '+hib.userobject.lastname);
+ }
+ return this.broadCastViewRef;
+ }else{
var obj = this.getVideoObjectByPublicSID(publicSID);
if (obj!=null){
this.broadCastViewRef = obj;
@@ -321,6 +369,7 @@
this.broadCastViewRef.setAttribute('chatpartnername',hib.userobject.firstname+' '+hib.userobject.lastname);
}
return this.broadCastViewRef;
+ }
]]>
</method>
@@ -331,6 +380,24 @@
-->
<method name="getNewVideoObjectByPos" args="publicSID">
<![CDATA[
+ if(canvas.currentRoomObj.hideWhiteboard){
+ var obj = this.getVideoObjectByPublicSID(publicSID);
+ if (obj!=null){
+ return obj;
+ }
+ var videoContainer = _videoviewcontent_hideWhiteboard._inn;
+ if (this.userNewVideoContainer) {
+ videoContainer = _videoviewcontent_hideWhiteboard._inn;
+ }
+
+ //Get a Free VideoView Slot
+ var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
+
+ return new lz.videoObjectPlayBroadcast(videoContainer,{
+ publicSID:publicSID,
+ x:freePos[0],y:freePos[1]
+ });
+ }else{
var obj = this.getVideoObjectByPublicSID(publicSID);
if (obj!=null){
return obj;
@@ -347,6 +414,7 @@
publicSID:publicSID,
x:freePos[0],y:freePos[1]
});
+ }
]]>
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx Wed Jan 18 22:20:29 2012
@@ -193,7 +193,10 @@
//if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
var videoContainer = parent.parent._videoviewcontent;
-
+ if(canvas.currentRoomObj.hideWhiteboard){
+ videoContainer = _videoviewcontent_hideWhiteboard._inn;
+ }
+
//for (var i=0;i<this._videoviewcontent.subviews.length;i++){
// if ($debug) Debug.write("getVideoObjectByBroadCastId6 broadcastId: ",this._videoviewcontent.subviews[i].broadcastId);
// if ($debug) Debug.write("getVideoObjectByBroadCastId7 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
@@ -383,7 +386,9 @@
this.broadCastViewRef = obj;
} else {
var videoContainer = parent.parent._videoviewcontent;
-
+ if(canvas.currentRoomObj.hideWhiteboard){
+ videoContainer = _videoviewcontent_hideWhiteboard._inn;
+ }
//Get a Free VideoView Slot
var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
@@ -412,7 +417,9 @@
}
var videoContainer = parent.parent._videoviewcontent;
-
+ if(canvas.currentRoomObj.hideWhiteboard){
+ videoContainer = _videoviewcontent_hideWhiteboard._inn;
+ }
//Get a Free VideoView Slot
var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx Wed Jan 18 22:20:29 2012
@@ -130,6 +130,10 @@
return;
}
+ if (canvas.currentRoomObj.hideWhiteboard) {
+ return;
+ }
+
var bounds = this.getBounds();
var parentBounds = canvas.getBounds();
if ( bounds.y < 0 )
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Wed Jan 18 22:20:29 2012
@@ -58,7 +58,7 @@
</class>
<class name="fixedFileExplorerWhiteboardPanel" extends="basePropertyPanelWhiteboard"
- labelid="615">
+ labelid="615" visible="${((canvas.currentRoomObj.hideWhiteboard) ? false:true)}">
<!--
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java Wed Jan 18 22:20:29 2012
@@ -154,7 +154,7 @@ public class AppointmentLogic {
"", // conferencePIN
null, // ownerID
null, null, false, false //
-, false, false, false, false
+, false, false, false, false, false
);
log.debug("Appointmentlogic.saveAppointment : Room - " + room_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java Wed Jan 18 22:20:29 2012
@@ -711,7 +711,7 @@ public class Roommanagement {
* @param hideFilesExplorer TODO
* @param hideActionsMenu TODO
* @param hideScreenSharing TODO
- *
+ * @param hideWhiteboard TODO
* @return id of the newly created room or NULL
*/
public Long addRoom(long user_level, String name, long roomtypes_id,
@@ -723,7 +723,7 @@ public class Roommanagement {
String redirectURL, String sipNumber, String conferencePin,
Long ownerId, Boolean waitForRecording, Boolean allowRecording,
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
- Boolean hideActionsMenu, Boolean hideScreenSharing) {
+ Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
@@ -763,7 +763,8 @@ public class Roommanagement {
r.setHideActionsMenu(hideActionsMenu);
r.setHideFilesExplorer(hideFilesExplorer);
r.setHideScreenSharing(hideScreenSharing);
-
+ r.setHideWhiteboard(hideWhiteboard);
+
// handle SIP Issues
OpenXGReturnObject openXGReturnObject = openXGHttpClient
.openSIPgCreateConference();
@@ -1279,7 +1280,7 @@ public class Roommanagement {
* @param hideFilesExplorer TODO
* @param hideActionsMenu TODO
* @param hideScreenSharing TODO
- *
+ * @param hideWhiteboard TODO
* @return
*/
public Long updateRoom(long user_level, long rooms_id, long roomtypes_id,
@@ -1291,7 +1292,7 @@ public class Roommanagement {
String redirectURL, String sipNumber, String conferencePin,
Long ownerId, Boolean waitForRecording, Boolean allowRecording,
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions,
- Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing) {
+ Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
@@ -1304,7 +1305,7 @@ public class Roommanagement {
roomModerators, allowUserQuestions, isAudioOnly,
isClosed, redirectURL, sipNumber, conferencePin,
ownerId, waitForRecording, allowRecording, hideTopBar, hideChat,
- hideActivitiesAndActions, hideFilesExplorer, hideActionsMenu, hideScreenSharing);
+ hideActivitiesAndActions, hideFilesExplorer, hideActionsMenu, hideScreenSharing, hideWhiteboard);
}
@@ -1322,7 +1323,8 @@ public class Roommanagement {
Boolean allowUserQuestions, Boolean isAudioOnly, Boolean isClosed,
String redirectURL, String sipNumber, String conferencePin,
Long ownerId, Boolean waitForRecording, Boolean allowRecording,
- Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing) {
+ Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
+ Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
+ numberOfPartizipants);
@@ -1359,7 +1361,8 @@ public class Roommanagement {
r.setHideActivitiesAndActions(hideActivitiesAndActions);
r.setHideActionsMenu(hideActionsMenu);
r.setHideFilesExplorer(hideFilesExplorer);
- r.setHideScreenSharing(hideScreenSharing);
+ r.setHideScreenSharing(hideScreenSharing);
+ r.setHideWhiteboard(hideWhiteboard);
if (r.getRooms_id() == null) {
em.persist(r);
@@ -1717,7 +1720,7 @@ public class Roommanagement {
"", // redirectURL
"", // sipNumber
"", // conferencePin
- ownerId, null, null, false, false, false, false, false, false);
+ ownerId, null, null, false, false, false, false, false, false, false);
if (rooms_id != null) {
return this.getRoomById(rooms_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java Wed Jan 18 22:20:29 2012
@@ -519,48 +519,48 @@ public class ImportInitvalues {
if (createRooms) {
roommanagement.addRoom(3, "public Interview Room", interview_Id, "",
new Long(16), true, null, false, false, null, false, null,
- true, false, false, "", "", "", null, null, null, false, false, false, false, false, false);
+ true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
roommanagement.addRoom(3, "public Conference Room", conference_Id, "",
new Long(32), true, null, false, false, null, false, null,
- true, false, false, "", "", "", null, null, null, false, false, false, false, false, false);
+ true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
roommanagement.addRoom(3, "public Video Only Room", conference_Id, "",
new Long(32), true, null, false, false, null, false, null,
- true, false, false, "", "", "", null, null, null, false, false, false, false, false, false);
+ true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
roommanagement.addRoom(3, "public Video And Whiteboard Room",
conference_Id, "", new Long(32), true, null, false, false,
null, false, null, true, false, false, "", "", "", null, null,
- null, false, false, false, false, false, false);
+ null, false, false, false, false, false, false, false);
roommanagement.addRoom(3, "public Restricted Room", restricted_Id, "",
new Long(100), true, null, false, false, null, false, null,
- true, false, false, "", "", "", null, null, null, false, false, false, false, false, false);
+ true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
roommanagement.addRoom(3, "restricted Microphones Room", restr_micro_Id, "",
new Long(100), true, null, false, false, null, false, null,
- true, false, false, "", "", "", null, null, null, false, false, false, false, false, false);
+ true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
roommanagement.addRoom(3, "conference Microphones Room", conf_micro_Id, "",
new Long(32), true, null, false, false, null, false, null,
- true, false, false, "", "", "", null, null, null, false, false, false, false, false, false);
+ true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
long room2 = roommanagement.addRoom(3, "private Conference Room",
conference_Id, "", new Long(32), false, null, false, false,
null, false, null, true, false, false, "", "", "", null, null,
- null, false, false, false, false, false, false);
+ null, false, false, false, false, false, false, false);
roommanagement.addRoomToOrganisation(3, room2, 1);
roommanagement.addRoom(3, "public Audience Room", audience_Id, "",
new Long(32), true, null, false, false, null, false, null,
- true, false, false, "", "", "", null, null, null, false, false, false, false, false, false);
+ true, false, false, "", "", "", null, null, null, false, false, false, false, false, false, false);
long room4 = roommanagement.addRoom(3, "private Audience Room",
audience_Id, "", new Long(32), false, null, false, false, null,
false, null, true, false, false, "", "", "", null, null, null,
- false, false, false, false, false, false);
+ false, false, false, false, false, false, false);
roommanagement.addRoomToOrganisation(3, room4, 1);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/Rooms.java Wed Jan 18 22:20:29 2012
@@ -131,7 +131,11 @@ public class Rooms implements Serializab
@Column(name = "hide_screen_sharing")
private Boolean hideScreenSharing = false;
+
+ @Column(name = "hide_whiteboard")
+ private Boolean hideWhiteboard = false;
+
public String getComment() {
return comment;
}
@@ -350,6 +354,13 @@ public class Rooms implements Serializab
this.hideScreenSharing = hideScreenSharing;
}
+ public Boolean getHideWhiteboard() {
+ return hideWhiteboard;
+ }
+ public void setHideWhiteboard(Boolean hideWhiteboard) {
+ this.hideWhiteboard = hideWhiteboard;
+ }
+
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java Wed Jan 18 22:20:29 2012
@@ -623,7 +623,8 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("hideActivitiesAndActions").toString()),
Boolean.valueOf(argObjectMap.get("hideFilesExplorer").toString()),
Boolean.valueOf(argObjectMap.get("hideActionsMenu").toString()),
- Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString())
+ Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString()),
+ Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString())
);
} else if (rooms_id > 0) {
return roommanagement
@@ -671,7 +672,8 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("hideActivitiesAndActions").toString()),
Boolean.valueOf(argObjectMap.get("hideFilesExplorer").toString()),
Boolean.valueOf(argObjectMap.get("hideActionsMenu").toString()),
- Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString())
+ Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString()),
+ Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString())
);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java Wed Jan 18 22:20:29 2012
@@ -955,7 +955,7 @@ public class UserService {
"", // sipNumber
"", // conferencePIN
null, // ownerId
- null, null, false, false, false, false, false, false);
+ null, null, false, false, false, false, false, false, false);
room = roommanagement.getRoomById(room_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java Wed Jan 18 22:20:29 2012
@@ -272,7 +272,7 @@ public class MethodGateway extends HttpS
name, roomtypes_id, comment, numberOfPartizipants,
ispublic, null, false, false, null, false, null,
true, false, false, "", "", "", null, null, null,
- false, false, false, false, false, false);
+ false, false, false, false, false, false, false);
XStream xStream = new XStream(new XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
Modified: incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java?rev=1233095&r1=1233094&r2=1233095&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java Wed Jan 18 22:20:29 2012
@@ -672,7 +672,7 @@ public class RoomWebService {
return roommanagement.addRoom(user_level, name, roomtypes_id,
comment, numberOfPartizipants, ispublic, null, false,
false, null, false, null, true, false, false, "", "", "",
- null, null, null, false, false, false, false, false, false);
+ null, null, null, false, false, false, false, false, false, false);
} catch (Exception err) {
log.error("[addRoom] ", err);
}
@@ -718,7 +718,7 @@ public class RoomWebService {
return roommanagement.addRoom(user_level, name, roomtypes_id,
comment, numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null, true, false,
- false, "", "", "", null, null, null, false, false, false, false, false, false);
+ false, "", "", "", null, null, null, false, false, false, false, false, false, false);
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
}
@@ -771,7 +771,7 @@ public class RoomWebService {
comment, numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
allowUserQuestions, false, false, "", "", "", null, null,
- null, false, false, false, false, false, false);
+ null, false, false, false, false, false, false, false);
} catch (Exception err) {
log.error("[addRoomWithModerationAndQuestions] ", err);
}
@@ -826,12 +826,86 @@ public class RoomWebService {
comment, numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
allowUserQuestions, isAudioOnly, false, "", "", "", null,
- null, null, false, false, false, false, false, false);
+ null, null, false, false, false, false, false, false, false);
} catch (Exception err) {
log.error("[addRoomWithModerationQuestionsAndAudioType] ", err);
throw new AxisFault(err.getMessage());
}
}
+
+ /**
+ *
+ * adds a new room with options for user questions, audio only and hide
+ *
+ * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param name
+ * Name of the Room
+ * @param roomtypes_id
+ * Type of that room (1 = Conference, 2 = Audience, 3 =
+ * Restricted, 4 = Interview)
+ * @param comment
+ * any comment
+ * @param numberOfPartizipants
+ * the maximum users allowed in this room
+ * @param ispublic
+ * If this room is public (use true if you don't deal with
+ * different Organizations)
+ * @param appointment
+ * is it a Calendar Room (use false by default)
+ * @param isDemoRoom
+ * is it a Demo Room with limited time (use false by default)
+ * @param demoTime
+ * time in seconds after the user will be logged out (only
+ * enabled if isDemoRoom is true)
+ * @param isModeratedRoom
+ * Users have to wait until a Moderator arrives. Use the
+ * becomeModerator param in setUserObjectAndGenerateRoomHash to
+ * set a user as default Moderator
+ * @param allowUserQuestions
+ * enable or disable the button to allow users to apply for
+ * moderation
+ * @param isAudioOnly
+ * enable or disable the video / or audio-only
+ *
+ * @param hideTopBar
+ * hide or show TopBar
+ * @param hideChat
+ * hide or show Chat
+ * @param hideActivitiesAndActions
+ * hide or show Activities And Actions
+ * @param hideFilesExplorer
+ * hide or show Files Explorer
+ * @param hideActionsMenu
+ * hide or show Actions Menu
+ * @param hideScreenSharing
+ * hide or show Screen Sharing
+ * @param hideWhiteboard
+ * hide or show Whiteboard. If whitboard is hidden, video pods and scrollbar appear instead.
+ * @return
+ * @throws AxisFault
+ */
+ public Long addRoomWithModerationQuestionsAudioTypeAndHideOptions(String SID,
+ String name, Long roomtypes_id, String comment,
+ Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
+ Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
+ Boolean allowUserQuestions, Boolean isAudioOnly, Boolean hideTopBar, Boolean hideChat,
+ Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
+ Boolean hideActionsMenu, Boolean hideScreenSharing,
+ Boolean hideWhiteboard) throws AxisFault {
+ try {
+ Long users_id = sessionManagement.checkSession(SID);
+ Long user_level = userManagement.getUserLevelByID(users_id);
+ return roommanagement.addRoom(user_level, name, roomtypes_id,
+ comment, numberOfPartizipants, ispublic, null, appointment,
+ isDemoRoom, demoTime, isModeratedRoom, null,
+ allowUserQuestions, isAudioOnly, false, "", "", "", null,
+ null, null, hideTopBar, hideChat, hideActivitiesAndActions, hideFilesExplorer,
+ hideActionsMenu, hideScreenSharing, hideWhiteboard);
+ } catch (Exception err) {
+ log.error("[addRoomWithModerationQuestionsAudioTypeAndHideOptions] ", err);
+ throw new AxisFault(err.getMessage());
+ }
+ }
/**
* Checks if a room with this exteralRoomId + externalRoomType does exist,
@@ -949,7 +1023,7 @@ public class RoomWebService {
roomtypes_id, name, ispublic, comment,
numberOfPartizipants, null, appointment, false, null,
false, null, true, false, false, "", "", "", null,
- null, null, false, false, false, false, false, false);
+ null, null, false, false, false, false, false, false, false);
}
} catch (Exception err) {
log.error("[addRoom] ", err);
@@ -1000,7 +1074,7 @@ public class RoomWebService {
name, ispublic, comment, numberOfPartizipants, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, true, false, false, "", "", "", null, null, null,
- false, false, false, false, false, false);
+ false, false, false, false, false, false, false);
}
} catch (Exception err) {
log.error("[updateRoomWithModeration] ", err);
@@ -1054,7 +1128,85 @@ public class RoomWebService {
name, ispublic, comment, numberOfPartizipants, null,
appointment, isDemoRoom, demoTime, isModeratedRoom,
null, allowUserQuestions, false, false, "", "", "",
- null, null, null, false, false, false, false, false, false);
+ null, null, null, false, false, false, false, false, false, false);
+ }
+ } catch (Exception err) {
+ log.error("[updateRoomWithModerationAndQuestions] ", err);
+ }
+ return new Long(-1);
+ }
+
+ /**
+ *
+ * update room with options for user questions, audio only and hide
+ *
+ * * @param SID The SID of the User. This SID must be marked as Loggedin
+ * @param room_id
+ * the room id to update
+ * @param name
+ * new name of the room
+ * @param roomtypes_id
+ * new type of room (1 = Conference, 2 = Audience, 3 =
+ * Restricted, 4 = Interview)
+ * @param comment
+ * new comment
+ * @param numberOfPartizipants
+ * new numberOfParticipants
+ * @param ispublic
+ * is public
+ * @param appointment
+ * if the room is an appointment
+ * @param isDemoRoom
+ * is it a Demo Room with limited time? (use false if not sure
+ * what that means)
+ * @param demoTime
+ * time in seconds after the user will be logged out (only
+ * enabled if isDemoRoom is true)
+ * @param isModeratedRoom
+ * Users have to wait until a Moderator arrives. Use the
+ * becomeModerator parameter in setUserObjectAndGenerateRoomHash
+ * to set a user as default Moderator
+ * @param allowUserQuestions
+ * enable or disable the button to allow users to apply for
+ * moderation
+ * @param isAudioOnly
+ * enable or disable the video / or audio-only
+ *
+ * @param hideTopBar
+ * hide or show TopBar
+ * @param hideChat
+ * hide or show Chat
+ * @param hideActivitiesAndActions
+ * hide or show Activities And Actions
+ * @param hideFilesExplorer
+ * hide or show Files Explorer
+ * @param hideActionsMenu
+ * hide or show Actions Menu
+ * @param hideScreenSharing
+ * hide or show Screen Sharing
+ * @param hideWhiteboard
+ * hide or show Whiteboard. If whitboard is hidden, video pods and scrollbar appear instead.
+ * @return
+ * @throws AxisFault
+ */
+ public Long updateRoomWithModerationQuestionsAudioTypeAndHideOptions(String SID, Long room_id,
+ String name, Long roomtypes_id, String comment,
+ Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
+ Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
+ Boolean allowUserQuestions, Boolean isAudioOnly, Boolean hideTopBar, Boolean hideChat,
+ Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
+ Boolean hideActionsMenu, Boolean hideScreenSharing,
+ Boolean hideWhiteboard) {
+ try {
+ Long users_id = sessionManagement.checkSession(SID);
+ Long user_level = userManagement.getUserLevelByID(users_id);
+ if (authLevelManagement.checkWebServiceLevel(user_level)) {
+ return roommanagement.updateRoomInternal(room_id, roomtypes_id,
+ name, ispublic, comment, numberOfPartizipants, null,
+ appointment, isDemoRoom, demoTime, isModeratedRoom,
+ null, allowUserQuestions, false, false, "", "", "",
+ null, null, null, hideTopBar, hideChat, hideActivitiesAndActions, hideFilesExplorer,
+ hideActionsMenu, hideScreenSharing, hideWhiteboard);
}
} catch (Exception err) {
log.error("[updateRoomWithModerationAndQuestions] ", err);