BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the maximum number of breakout rooms from 5 to 8.

Browse Source
This commit is contained in:
Ghazi Triki 2017-09-13 12:31:45 +01:00
parent ea8995b828
commit 11568de672
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml
View File

@ -25,7 +25,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xmlns:mx="library://ns.adobe.com/flex/mx" xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:mate="http://mate.asfusion.com/" xmlns:mate="http://mate.asfusion.com/"
xmlns:common="org.bigbluebutton.common.*" xmlns:common="org.bigbluebutton.common.*"
width="630" height="630" width="630"
close="onCloseClicked()" close="onCloseClicked()"
visible="false" visible="false"
showCloseButton="false"> showCloseButton="false">
@ -36,6 +36,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import mx.collections.ArrayCollection; import mx.collections.ArrayCollection;
import mx.controls.Alert; import mx.controls.Alert;
import mx.managers.PopUpManager;
import org.bigbluebutton.core.PopUpUtil; import org.bigbluebutton.core.PopUpUtil;
import org.bigbluebutton.core.UsersUtil; import org.bigbluebutton.core.UsersUtil;
@ -139,10 +140,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
var perRoom:int = users.length / rooms; var perRoom:int = users.length / rooms;
var remaining:int = users.length % rooms; var remaining:int = users.length % rooms;
var user:User2x; var user:User2x;
var listHeight : int = rooms <= 5 ? 140 : 100;
roomsContainer.removeAllChildren(); roomsContainer.removeAllChildren();
for (var r:int = 0; r < rooms; r++) { for (var r:int = 0; r < rooms; r++) {
var list:BreakoutList = roomsContainer.addChild(new BreakoutList()) as BreakoutList; var list:BreakoutList = roomsContainer.addChild(new BreakoutList()) as BreakoutList;
list.users = new ArrayCollection(); list.users = new ArrayCollection();
list.height = listHeight;
list.roomName = ResourceUtil.getInstance().getString('bbb.users.breakout.room') + " " + (r + 1).toString(); list.roomName = ResourceUtil.getInstance().getString('bbb.users.breakout.room') + " " + (r + 1).toString();
list.usersList.accessibilityName = ResourceUtil.getInstance().getString('bbb.users.breakout.room') + " " + (r + 1).toString(); list.usersList.accessibilityName = ResourceUtil.getInstance().getString('bbb.users.breakout.room') + " " + (r + 1).toString();
for (var i:int = 0; i < perRoom; i++) { for (var i:int = 0; i < perRoom; i++) {
@ -154,6 +157,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
} }
var unassignedList:BreakoutList = roomsContainer.addChild(new BreakoutList()) as BreakoutList; var unassignedList:BreakoutList = roomsContainer.addChild(new BreakoutList()) as BreakoutList;
unassignedList.users = new ArrayCollection([me]); unassignedList.users = new ArrayCollection([me]);
unassignedList.height = listHeight;
unassignedList.roomName = ResourceUtil.getInstance().getString('bbb.users.breakout.notAssigned'); unassignedList.roomName = ResourceUtil.getInstance().getString('bbb.users.breakout.notAssigned');
unassignedList.usersList.accessibilityName = ResourceUtil.getInstance().getString('bbb.users.breakout.notAssigned'); unassignedList.usersList.accessibilityName = ResourceUtil.getInstance().getString('bbb.users.breakout.notAssigned');
unassignedList.notAssignedUsers = true; unassignedList.notAssignedUsers = true;
@ -248,7 +252,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
roomsProvider = new Array(); roomsProvider = new Array();
this.mode = mode; this.mode = mode;
this.recordingEnabled = record; this.recordingEnabled = record;
for (var i:int = 2; i <= 5; i++) { for (var i:int = 2; i <= 8; i++) {
roomsProvider.push(i.toString() + " " + ResourceUtil.getInstance().getString('bbb.users.breakout.rooms')); roomsProvider.push(i.toString() + " " + ResourceUtil.getInstance().getString('bbb.users.breakout.rooms'));
} }
roomsCombo.selectedIndex = 0; roomsCombo.selectedIndex = 0;
@ -269,6 +273,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
assignUsersForInvitation(); assignUsersForInvitation();
visible = true; visible = true;
} }
PopUpManager.centerPopUp(this);
} }
]]> ]]>
</fx:Script> </fx:Script>
@ -304,6 +309,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:CheckBox id="recordCheckbox" <mx:CheckBox id="recordCheckbox"
accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.breakout.recordCheckbox.accessibilityName')}"/> accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.breakout.recordCheckbox.accessibilityName')}"/>
</mx:HBox> </mx:HBox>
<mx:Tile id="roomsContainer" styleName="roomsContainer" width="100%" height="100%"/> <mx:Tile id="roomsContainer" styleName="roomsContainer" width="100%" height="100%"/>
<mx:HBox width="100%" horizontalAlign="right" verticalGap="15"> <mx:HBox width="100%" horizontalAlign="right" verticalGap="15">

2
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
View File

@ -737,7 +737,7 @@ $Id: $
</mx:HBox> </mx:HBox>
<views:BBBDataGrid id="roomsGrid" editable="false" sortableColumns="false" <views:BBBDataGrid id="roomsGrid" editable="false" sortableColumns="false"
rowCount="{breakoutRoomsList.length}" rowCount="{breakoutRoomsList.length &lt; 6 ? breakoutRoomsList.length : 5}"
dataProvider="{breakoutRoomsList}" dataTipFunction="breakoutRoomsToolTip" dataProvider="{breakoutRoomsList}" dataTipFunction="breakoutRoomsToolTip"
dragEnabled="false" width="100%" height="100%" draggableColumns="false" dragEnabled="false" width="100%" height="100%" draggableColumns="false"
accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}"> accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}">