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

Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf

Browse Source
This commit is contained in:
Richard Alam 2017-09-13 08:43:45 -07:00
commit 8457aaa767
8 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bigbluebutton-client/branding/default/style/css/V2Theme.css
View File

@ -76,6 +76,7 @@ mx|Application {
horizontalGap : 60;
paddingLeft : 30;
paddingRight : 30;
verticalAlign : top;
}
.audioBroswerHintBoxStyle {

BIN
bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
View File

Binary file not shown.

BIN
bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
View File

Binary file not shown.

8
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
View File

@ -119,7 +119,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<common:TabIndexer id="tabIndexer" startIndex="1" tabIndices="{[windowTitle, closeButton, btnMicrophone, btnListenOnly]}"/>
</fx:Declarations>
<mx:VBox width="100%" height="100%" paddingBottom="50" paddingLeft="80" paddingRight="80" paddingTop="15" horizontalAlign="center">
<mx:VBox width="100%" height="100%" paddingBottom="20" paddingLeft="80" paddingRight="80" paddingTop="15" horizontalAlign="center">
<common:AdvancedLabel id="windowTitle"
text="{ResourceUtil.getInstance().getString('bbb.audioSelection.title')}"
styleName="titleWindowStyle"
@ -132,7 +132,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Text width="100%" textAlign="center" text="{ResourceUtil.getInstance().getString('bbb.clientstatus.webrtc.message')}" styleName="audioBroswerHintTextStyle"/>
</mx:Box>
<mx:HBox width="100%" height="100%" styleName="audioSelectionsStyle">
<mx:VBox id="vboxMic" height="100%" width="30%" horizontalAlign="center" verticalAlign="middle">
<mx:VBox id="vboxMic" width="30%" horizontalAlign="center" verticalAlign="middle">
<mx:Button id="btnMicrophone" buttonMode="true" styleName="btnMicrophoneStyle" width="140" height="140"
click="onMicClick()"
toolTip="{ResourceUtil.getInstance().getString('bbb.audioSelection.btnMicrophone.label')}"
@ -140,7 +140,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.audioSelection.btnMicrophone.label')}"
styleName="audioSubtitle" />
</mx:VBox>
<mx:VBox id="vboxListen" height="100%" width="30%" horizontalAlign="center" verticalAlign="middle">
<mx:VBox id="vboxListen" width="30%" horizontalAlign="center" verticalAlign="middle">
<mx:Button id="btnListenOnly" width="140" height="140" buttonMode="true" styleName="btnListenOnlyStyle"
click="onListenClick()"
toolTip="{ResourceUtil.getInstance().getString('bbb.audioSelection.btnListenOnly.label')}"
@ -148,7 +148,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.audioSelection.btnListenOnly.label')}"
styleName="audioSubtitle" />
</mx:VBox>
<mx:VBox id="vboxPhone" height="100%" width="30%" horizontalAlign="center" verticalAlign="middle">
<mx:VBox id="vboxPhone" width="30%" horizontalAlign="center" verticalAlign="middle">
<mx:Button id="btnPhone"
width="140"
height="140"

1
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
View File

@ -146,6 +146,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
btnStartPublish.mouseEnabled = true;
btnStartPublish.enabled = true;
btnStartPublish.accessibilityName = ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.toolTip');
PopUpUtil.removePopUp(BrowserPermissionHelper);
}
private function videoFailure(reason:String):void {

4
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
View File

@ -118,11 +118,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.core.Options;
import org.bigbluebutton.core.PopUpUtil;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.events.FullscreenToggledEvent;
import org.bigbluebutton.core.events.LockControlEvent;
import org.bigbluebutton.core.events.NewGuestWaitingEvent;
import org.bigbluebutton.core.events.RoundTripLatencyReceivedEvent;
import org.bigbluebutton.core.events.SwitchedLayoutEvent;
import org.bigbluebutton.core.events.FullscreenToggledEvent;
import org.bigbluebutton.core.vo.LockSettingsVO;
import org.bigbluebutton.main.events.AppVersionEvent;
import org.bigbluebutton.main.events.BBBEvent;
@ -668,7 +668,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (browserPermissionHelper) {
browserPermissionHelper.currentState = "chromeCam";
browserPermissionHelper.x = 20;
browserPermissionHelper.y = 20;
browserPermissionHelper.y = 150;
}
}

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

@ -25,24 +25,25 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:mate="http://mate.asfusion.com/"
xmlns:common="org.bigbluebutton.common.*"
width="630" height="630"
width="630"
close="onCloseClicked()"
visible="false"
showCloseButton="false">
<fx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
import mx.collections.ArrayCollection;
import mx.controls.Alert;
import org.bigbluebutton.core.PopUpUtil;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.model.LiveMeeting;
import org.bigbluebutton.core.model.users.User2x;
import org.bigbluebutton.main.events.BreakoutRoomEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
import com.asfusion.mate.events.Dispatcher;
import mx.collections.ArrayCollection;
import mx.controls.Alert;
import mx.managers.PopUpManager;
import org.bigbluebutton.core.PopUpUtil;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.model.LiveMeeting;
import org.bigbluebutton.core.model.users.User2x;
import org.bigbluebutton.main.events.BreakoutRoomEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
[Bindable]
private var roomsProvider:Array;
@ -139,10 +140,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
var perRoom:int = users.length / rooms;
var remaining:int = users.length % rooms;
var user:User2x;
var listHeight : int = rooms <= 5 ? 140 : 100;
roomsContainer.removeAllChildren();
for (var r:int = 0; r < rooms; r++) {
var list:BreakoutList = roomsContainer.addChild(new BreakoutList()) as BreakoutList;
list.users = new ArrayCollection();
list.height = listHeight;
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();
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;
unassignedList.users = new ArrayCollection([me]);
unassignedList.height = listHeight;
unassignedList.roomName = ResourceUtil.getInstance().getString('bbb.users.breakout.notAssigned');
unassignedList.usersList.accessibilityName = ResourceUtil.getInstance().getString('bbb.users.breakout.notAssigned');
unassignedList.notAssignedUsers = true;
@ -248,7 +252,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
roomsProvider = new Array();
this.mode = mode;
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'));
}
roomsCombo.selectedIndex = 0;
@ -269,6 +273,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
assignUsersForInvitation();
visible = true;
}
PopUpManager.centerPopUp(this);
}
]]>
</fx:Script>
@ -304,6 +309,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:CheckBox id="recordCheckbox"
accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.breakout.recordCheckbox.accessibilityName')}"/>
</mx:HBox>
<mx:Tile id="roomsContainer" styleName="roomsContainer" width="100%" height="100%"/>
<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>
<views:BBBDataGrid id="roomsGrid" editable="false" sortableColumns="false"
rowCount="{breakoutRoomsList.length}"
rowCount="{breakoutRoomsList.length &lt; 6 ? breakoutRoomsList.length : 5}"
dataProvider="{breakoutRoomsList}" dataTipFunction="breakoutRoomsToolTip"
dragEnabled="false" width="100%" height="100%" draggableColumns="false"
accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}">