You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/12/02 20:34:35 UTC
svn commit: r1416242 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/src/modules/admin/roomadmin/
WebContent/src/modules/conference/interviewuserlist/
src/org/apache/openmeetings/axis/services/ src/org/apache/openmeeti...
Author: solomax
Date: Sun Dec 2 19:34:26 2012
New Revision: 1416242
URL: http://svn.apache.org/viewvc?rev=1416242&view=rev
Log:
OPENMEETINGS-478 is implemented (auto videopod selection for interview room)
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/interviewuserlist/interviewListInner.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Sun Dec 2 19:34:26 2012
@@ -6063,4 +6063,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>ТеÑÑиÑование ÑеÑи</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Sun Dec 2 19:34:26 2012
@@ -4607,4 +4607,7 @@ see http://incubator.apache.org/openmeet
<string id="1527" name="network testing link">
<value>Network testing</value>
</string>
+ <string id="1528" name="room_options">
+ <value>Auto select interview video pod</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=1416242&r1=1416241&r2=1416242&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 Sun Dec 2 19:34:26 2012
@@ -70,6 +70,7 @@
this.chatModerated.setValue(false);
this.chatOpened.setValue(false);
this.filesOpened.setValue(false);
+ this.autoVideoSelect.setValue(false);
</handler>
<handler name="ondelete" >
@@ -220,8 +221,9 @@
} else {
this.hideWhiteboard.setValue(false);
}
- this.chatOpened.setValue(obj.chatOpened);
- this.filesOpened.setValue(obj.filesOpened);
+ this.chatOpened.setValue(obj.chatOpened);
+ this.filesOpened.setValue(obj.filesOpened);
+ this.autoVideoSelect.setValue(obj.autoVideoSelect);
if (obj.showMicrophoneStatus != null && obj.showMicrophoneStatus){
this.showMicrophoneStatus.setValue(true);
@@ -332,6 +334,7 @@
this.sendObject["chatModerated"] = parent.chatModerated.getValue();
this.sendObject["chatOpened"] = parent.chatOpened.getValue();
this.sendObject["filesOpened"] = parent.filesOpened.getValue();
+ this.sendObject["autoVideoSelect"] = parent.autoVideoSelect.getValue();
var ownerId = parent.ownerId.getText();
if (ownerId == "") ownerId = 0;
@@ -580,9 +583,12 @@
<labelText labelid="1515" width="200" y="1140" resize="false" x="2" />
<labelCheckbox name="chatOpened" width="270" y="1140" x="180" fontsize="11" />
- <labelText labelid="1516" width="200" y="1160" resize="false" x="2" />
- <labelCheckbox name="filesOpened" width="270" y="1160" x="180" fontsize="11" />
-
+ <labelText labelid="1516" width="200" y="1160" resize="false" x="2" />
+ <labelCheckbox name="filesOpened" width="270" y="1160" x="180" fontsize="11" />
+
+ <labelText labelid="1528" width="200" y="1180" resize="false" x="2" />
+ <labelCheckbox name="autoVideoSelect" width="270" y="1180" x="180" fontsize="11" />
+
<!-- RoomClient List Right Side -->
<labelText labelid="587" width="300" y="40" resize="false"
x="398" fontstyle="bold" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewListInner.lzx Sun Dec 2 19:34:26 2012
@@ -37,6 +37,7 @@
<handler name="oninit">
<![CDATA[
+ if ($debug) Debug.write("!!!!! interviewListTable oninit: ");
this.initList();
]]>
</handler>
@@ -48,21 +49,20 @@
<method name="addItem" args="object">
<![CDATA[
- if ($debug) Debug.write("eventUserList addItem: ",object,object.publicSID);
-
- for (var i=0;i<this._table.innerList.subviews.length;i++) {
- if (this._table.innerList.subviews[i].refObj.publicSID == object.publicSID) {
+ if ($debug) Debug.write("interviewListTable addItem: ",object,object.publicSID);
+ var list = this._table.innerList;
+ for (var i = 0; i < list.subviews.length;i++) {
+ if (list.subviews[i].refObj.publicSID == object.publicSID) {
//if ($debug) Debug.warn("Already on List, do not add twice");
return;
}
}
-
var lastname = object.lastname;
if (object.isSuperModerator) {
lastname += " *";
}
- new lz.interviewUserListItem(this._table.innerList,{
+ new lz.interviewUserListItem(list,{
user_id:object.user_id,
firstname:object.firstname,
isSuperModerator:object.isSuperModerator,
@@ -76,6 +76,21 @@
});
this.sortUserList();
+ if (canvas.currentRoomObj.autoVideoSelect) {
+ if (object.publicSID == canvas.publicSID && !object.interviewPodId
+ && (object.isMod || object.isSuperModerator || object.canDraw))
+ {
+ for (var ii = 1; ii < 3; ++ii) {
+ var obj = getVideoObjectByInterviewPodId(ii);
+ if (!obj) {
+ var interviewBox = canvas._drawarea._videoviewcontent.searchImmediateSubnodes("name", "interviewVideoBox" + ii);
+ //if ($debug) Debug.write("!!!! interviewListInner:: interviewBox = ", ii, interviewBox);
+ interviewBox.sendConfirmation(canvas.publicSID);
+ break;
+ }
+ }
+ }
+ }
]]>
</method>
@@ -121,24 +136,43 @@
this.initList();
</method>
+ <method name="disconnectclient" args="publicSID">
+ <![CDATA[
+ var item = getVideoObjectByPublicSID(publicSID);
+ if (item) {
+ item.destroy();
+ }
+ ]]>
+ </method>
+
<!--- get a Objects List Item
@param string publicSID publicSID
-->
- <method name="getVideoObjectByPublicSID" args="publicSID">
- <![CDATA[
- //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
+ <method name="getVideoObjectByPublicSID" args="publicSID">
+ <![CDATA[
+ for (var i=0;i<this._table.innerList.subviews.length;i++){
+ //if ($debug) Debug.write("getVideoObjectByPublicSID : this._table.innerList.subviews[i]",this._table.innerList.subviews[i]);
+ if (this._table.innerList.subviews[i].refObj.publicSID==publicSID){
+ return this._table.innerList.subviews[i];
+ }
+ }
+ return null;
+ ]]>
+ </method>
- for (var i=0;i<this._table.innerList.subviews.length;i++){
- //if ($debug) Debug.write("getVideoObjectByPublicSID : this._table.innerList.subviews[i]",this._table.innerList.subviews[i]);
- if (this._table.innerList.subviews[i].refObj.publicSID==publicSID){
- return this._table.innerList.subviews[i];
- }
- }
-
- return null;
-
- ]]>
- </method>
+ <method name="getVideoObjectByInterviewPodId" args="interviewPodId">
+ <![CDATA[
+ var list = this._table.innerList.subviews;
+ for (var i = 0; i < list.length; ++i) {
+ //if ($debug) Debug.write("getVideoObjectByInterviewPodId : list[i]", list[i]);
+ if (list[i].refObj.interviewPodId == interviewPodId){
+ if ($debug) Debug.write("getVideoObjectByInterviewPodId : list[i].refObj.interviewPodId", interviewPodId, list[i].refObj.interviewPodId);
+ return list[i];
+ }
+ }
+ return null;
+ ]]>
+ </method>
<method name="selectItem" args="itemObj">
<![CDATA[
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx Sun Dec 2 19:34:26 2012
@@ -228,7 +228,7 @@
</method>
<method name="removeVideoByUser" args="userObject">
- if ($edebug) Debug.write("removeVideoByUser ",userObject);
+ if ($debug) Debug.write("removeVideoByUser ",userObject);
this.closeStreamClient(userObject.publicSID);
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx Sun Dec 2 19:34:26 2012
@@ -67,9 +67,8 @@
</class>
<class name="interviewVideoBox" extends="view" width="322" height="281" bgcolor="0x000000">
-
<attribute name="interviewPodId" value="0" type="number" />
-
+
<method name="startInterView">
if ($debug) Debug.write("startInterView :: ");
var tx = this.getAttributeRelative("x",canvas);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java Sun Dec 2 19:34:26 2012
@@ -704,7 +704,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
} catch (Exception err) {
@@ -765,7 +766,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
} catch (Exception err) {
@@ -833,7 +835,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
} catch (Exception err) {
@@ -903,7 +906,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
return -1L;
@@ -989,7 +993,8 @@ public class RoomWebService {
hideActionsMenu, hideScreenSharing, hideWhiteboard,
false, false,
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
return -1L;
@@ -1129,7 +1134,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
} catch (Exception err) {
@@ -1192,7 +1198,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
} catch (Exception err) {
@@ -1258,7 +1265,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
} catch (Exception err) {
@@ -1343,7 +1351,8 @@ public class RoomWebService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
}
} catch (Exception err) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Sun Dec 2 19:34:26 2012
@@ -191,7 +191,8 @@ public class AppointmentLogic {
false, //showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
log.debug("Appointmentlogic.saveAppointment : Room - " + room_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java Sun Dec 2 19:34:26 2012
@@ -676,7 +676,7 @@ public class Roommanagement {
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened
- , boolean filesOpened) {
+ , boolean filesOpened, boolean autoVideoSelect) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
@@ -721,6 +721,7 @@ public class Roommanagement {
r.setChatModerated(chatModerated);
r.setChatOpened(chatOpened);
r.setFilesOpened(filesOpened);
+ r.setAutoVideoSelect(autoVideoSelect);
// handle SIP Issues
OpenXGReturnObject openXGReturnObject = openXGHttpClient
@@ -1264,7 +1265,8 @@ public class Roommanagement {
Long ownerId, Boolean waitForRecording, Boolean allowRecording,
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions,
Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
- Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened, boolean filesOpened) {
+ Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened, boolean filesOpened
+ , boolean autoVideoSelect) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
@@ -1279,7 +1281,7 @@ public class Roommanagement {
ownerId, waitForRecording, allowRecording, hideTopBar, hideChat,
hideActivitiesAndActions, hideFilesExplorer, hideActionsMenu,
hideScreenSharing, hideWhiteboard, showMicrophoneStatus, chatModerated
- , chatOpened, filesOpened);
+ , chatOpened, filesOpened, autoVideoSelect);
}
@@ -1299,7 +1301,8 @@ public class Roommanagement {
Long ownerId, Boolean waitForRecording, Boolean allowRecording,
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
- Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened, boolean filesOpened) {
+ Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened, boolean filesOpened
+ , boolean autoVideoSelect) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
+ numberOfPartizipants);
@@ -1342,6 +1345,7 @@ public class Roommanagement {
r.setChatModerated(chatModerated);
r.setChatOpened(chatOpened);
r.setFilesOpened(filesOpened);
+ r.setAutoVideoSelect(autoVideoSelect);
if (r.getRooms_id() == null) {
em.persist(r);
@@ -1667,7 +1671,8 @@ public class Roommanagement {
false, //showMicrophoneStatus
false, // chatModerated
false, //chatOpened
- false //filesOpened
+ false, //filesOpened
+ false //autoVideoSelect
);
if (rooms_id != null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Sun Dec 2 19:34:26 2012
@@ -615,7 +615,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
roommanagement.addRoom(3, "public Conference Room", conference_Id,
@@ -631,7 +632,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
roommanagement.addRoom(3, "public Video Only Room", conference_Id,
@@ -647,7 +649,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
roommanagement.addRoom(3, "public Video And Whiteboard Room",
@@ -663,7 +666,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
roommanagement.addRoom(3, "public Restricted Room", restricted_Id,
@@ -679,7 +683,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
roommanagement.addRoom(3, "restricted room with micro option set",
@@ -695,7 +700,8 @@ public class ImportInitvalues {
true, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
roommanagement.addRoom(3, "conference room with micro option set",
@@ -711,7 +717,8 @@ public class ImportInitvalues {
true, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
long room2 = roommanagement.addRoom(3, "private Conference Room",
@@ -727,7 +734,8 @@ public class ImportInitvalues {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
roommanagement.addRoomToOrganisation(3, room2, 1);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Sun Dec 2 19:34:26 2012
@@ -207,6 +207,10 @@ public class Rooms implements Serializab
@Element(data = true, required = false)
private boolean filesOpened = false;
+ @Column(name = "auto_video_select")
+ @Element(data = true, required = false)
+ private boolean autoVideoSelect = false;
+
@OneToMany(fetch = FetchType.LAZY)
@JoinColumn(name = "roomId")
@ElementList(name = "room_moderators", required=false)
@@ -525,4 +529,12 @@ public class Rooms implements Serializab
this.filesOpened = filesOpened;
}
+ public boolean isAutoVideoSelect() {
+ return autoVideoSelect;
+ }
+
+ public void setAutoVideoSelect(boolean autoVideoSelect) {
+ this.autoVideoSelect = autoVideoSelect;
+ }
+
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java Sun Dec 2 19:34:26 2012
@@ -574,7 +574,8 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString()),
Boolean.valueOf(argObjectMap.get("chatModerated").toString()),
Boolean.valueOf(argObjectMap.get("chatOpened").toString()),
- Boolean.valueOf(argObjectMap.get("filesOpened").toString())
+ Boolean.valueOf(argObjectMap.get("filesOpened").toString()),
+ Boolean.valueOf(argObjectMap.get("autoVideoSelect").toString())
);
} else if (rooms_id > 0) {
roomId = roommanagement.updateRoom(
@@ -626,7 +627,8 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString()),
Boolean.valueOf(argObjectMap.get("chatModerated").toString()),
Boolean.valueOf(argObjectMap.get("chatOpened").toString()),
- Boolean.valueOf(argObjectMap.get("filesOpened").toString())
+ Boolean.valueOf(argObjectMap.get("filesOpened").toString()),
+ Boolean.valueOf(argObjectMap.get("autoVideoSelect").toString())
);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Sun Dec 2 19:34:26 2012
@@ -1037,7 +1037,8 @@ public class UserService {
false, // showMicrophoneStatus
false, // chatModerated
false, // chatOpened
- false // filesOpened
+ false, // filesOpened
+ false // autoVideoSelect
);
room = roomDao.get(room_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java Sun Dec 2 19:34:26 2012
@@ -118,6 +118,7 @@ public class RoomForm extends AdminBaseF
add(new CheckBox("chatModerated"));
add(new CheckBox("chatOpened"));
add(new CheckBox("filesOpened"));
+ add(new CheckBox("autoVideoSelect"));
// FIXME: Room user moderator list
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html?rev=1416242&r1=1416241&r2=1416242&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html Sun Dec 2 19:34:26 2012
@@ -173,6 +173,9 @@
<label><wicket:ommessage key="1513" /></label><input type="checkbox" class="formcheckbox" wicket:id="filesOpened" />
</div>
<div class="formelement">
+ <label><wicket:ommessage key="1526" /></label><input type="checkbox" class="formcheckbox" wicket:id="autoVideoSelect" />
+ </div>
+ <div class="formelement">
<!--
FIXME: add user moderator list
<wicket:ommessage key="587" /> <select wicket:id="moderators"/>