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-08-24 10:24:20 -07:00
commit 0ffb80e3eb
18 changed files with 388 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -744,12 +744,24 @@ layout|BroadcastButton {
//------------------------------ //------------------------------
*/ */
.logoutWindowStyle { views|LogoutWindow, views|LoggedOutWindow {
headerHeight : 32; headerHeight : 32;
paddingBottom : 8;
paddingLeft : 8;
paddingRight : 8;
paddingTop : 8;
titleStyleName : "logoutTitleWindowStyle";
/* we need to set transparency duration to avoid the blur effect when two alerts are displayed sequentially */ /* we need to set transparency duration to avoid the blur effect when two alerts are displayed sequentially */
modalTransparencyDuration : 250; modalTransparencyDuration : 250;
} }
.logoutTitleWindowStyle {
color : #05172A;
fontSize : 16;
textAlign : center;
paddingBottom : 8;
}
/* /*
//------------------------------ //------------------------------
// Lock Settings // Lock Settings
@ -1296,9 +1308,10 @@ mx|TitleWindow {
} }
.titleWindowStyle { .titleWindowStyle {
color : #05172A; color : #05172A;
fontSize : 24; fontSize : 24;
textAlign : center; textAlign : center;
paddingBottom : 8;
} }
/* /*

30
bigbluebutton-client/src/org/bigbluebutton/common/AdvancedLabel.as Normal file
View File

@ -0,0 +1,30 @@
/**
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
*
* Copyright (c) 2017 BigBlueButton Inc. and by respective authors (see below).
*
* This program is free software; you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation; either version 3.0 of the License, or (at your option) any later
* version.
*
* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
package org.bigbluebutton.common {
import mx.managers.IFocusManagerComponent;
import spark.components.Label;
public class AdvancedLabel extends Label implements IFocusManagerComponent {
public function AdvancedLabel() {
super();
}
}
}

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

@ -131,11 +131,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</fx:Declarations> </fx:Declarations>
<mx:VBox width="100%" height="100%" paddingBottom="50" paddingLeft="80" paddingRight="80" paddingTop="0" horizontalAlign="center"> <mx:VBox width="100%" height="100%" paddingBottom="50" paddingLeft="80" paddingRight="80" paddingTop="0" horizontalAlign="center">
<mx:TextArea borderSkin="{null}" verticalScrollPolicy="off" <common:AdvancedLabel id="windowTitle"
editable="false" id="windowTitle" text="{ResourceUtil.getInstance().getString('bbb.audioSelection.title')}"
text="{ResourceUtil.getInstance().getString('bbb.audioSelection.title')}" styleName="titleWindowStyle"
styleName="titleWindowStyle" maxWidth="400" />
width="100%" />
<mx:Box width="100%" height="56" <mx:Box width="100%" height="56"
verticalAlign="middle" horizontalAlign="center" verticalAlign="middle" horizontalAlign="center"
verticalScrollPolicy="off" horizontalScrollPolicy="off" verticalScrollPolicy="off" horizontalScrollPolicy="off"

15
bigbluebutton-client/src/org/bigbluebutton/main/views/BBBSettings.mxml
View File

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx" <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:common="org.bigbluebutton.common.*"
xmlns:mate="http://mate.asfusion.com/"
layout="vertical" layout="vertical"
showCloseButton="false" showCloseButton="false"
xmlns:mate="http://mate.asfusion.com/"
minWidth="250" minWidth="250"
creationComplete="init()" > creationComplete="init()">
<fx:Script> <fx:Script>
<![CDATA[ <![CDATA[
@ -44,11 +45,11 @@
]]> ]]>
</fx:Script> </fx:Script>
<mx:TextArea borderSkin="{null}"
text="{ResourceUtil.getInstance().getString('bbb.settings.title')}" <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.settings.title')}"
editable="false" styleName="titleWindowStyle" styleName="titleWindowStyle"
width="100%" /> width="80%" />
<mx:VBox id="addedComponents" paddingTop="12" height="100%" /> <mx:VBox id="addedComponents" paddingTop="12" height="100%" />
<mx:ControlBar width="100%" horizontalAlign="right"> <mx:ControlBar width="100%" horizontalAlign="right">

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

@ -216,9 +216,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</fx:Declarations> </fx:Declarations>
<mx:VBox id="webcamDisplay" width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" styleName="cameraDisplaySettingsWindowBackground"> <mx:VBox id="webcamDisplay" width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" styleName="cameraDisplaySettingsWindowBackground">
<mx:HBox width="100%" horizontalAlign="left"> <mx:HBox width="100%" horizontalAlign="center">
<mx:TextArea width="100%" wordWrap="false" borderSkin="{null}" editable="false" text="{ResourceUtil.getInstance().getString('bbb.users.settings.webcamSettings')}" <common:AdvancedLabel maxWidth="400"
styleName="titleWindowStyle" id="textArea"/> text="{ResourceUtil.getInstance().getString('bbb.users.settings.webcamSettings')}"
styleName="titleWindowStyle"
id="textArea" />
</mx:HBox> </mx:HBox>
<mx:HRule width="100%"/> <mx:HRule width="100%"/>

153
bigbluebutton-client/src/org/bigbluebutton/main/views/ChromeMicPermissionImage.mxml
View File

@ -1,77 +1,76 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
This program is free software; you can redistribute it and/or modify it under the This program is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 3.0 of the License, or (at your option) any later Foundation; either version 3.0 of the License, or (at your option) any later
version. version.
BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along You should have received a copy of the GNU Lesser General Public License along
with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
--> -->
<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx" <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:mate="http://mate.asfusion.com/" xmlns:mate="http://mate.asfusion.com/"
xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:fx="http://ns.adobe.com/mxml/2009"
showCloseButton="false" xmlns:common="org.bigbluebutton.common.*"
verticalScrollPolicy="off" showCloseButton="false"
horizontalScrollPolicy="off" verticalScrollPolicy="off"
horizontalAlign="center" horizontalScrollPolicy="off"
borderAlpha="0.0" horizontalAlign="center"
borderThicknessLeft="0" borderAlpha="0.0"
borderThicknessRight="0" borderThicknessLeft="0"
borderThicknessTop="0" borderThicknessRight="0"
x="20" borderThicknessTop="0"
y="-20"> x="20"
y="-20">
<fx:Declarations>
<mate:Listener type="{WebRTCMediaEvent.WEBRTC_MEDIA_SUCCESS}" method="handleWebRTCMediaSuccessEvent" /> <fx:Declarations>
<mate:Listener type="{WebRTCMediaEvent.WEBRTC_MEDIA_FAIL}" method="handleWebRTCMediaFailEvent" /> <mate:Listener type="{WebRTCMediaEvent.WEBRTC_MEDIA_SUCCESS}" method="handleWebRTCMediaSuccessEvent" />
<mate:Listener type="{WebRTCEchoTestEvent.WEBRTC_ECHO_TEST_FAILED}" method="handleWebRTCEchoTestFailedEvent" /> <mate:Listener type="{WebRTCMediaEvent.WEBRTC_MEDIA_FAIL}" method="handleWebRTCMediaFailEvent" />
</fx:Declarations> <mate:Listener type="{WebRTCEchoTestEvent.WEBRTC_ECHO_TEST_FAILED}" method="handleWebRTCEchoTestFailedEvent" />
</fx:Declarations>
<fx:Script>
<![CDATA[ <fx:Script>
import org.bigbluebutton.core.PopUpUtil; <![CDATA[
import org.bigbluebutton.modules.phone.events.WebRTCEchoTestEvent; import org.bigbluebutton.core.PopUpUtil;
import org.bigbluebutton.modules.phone.events.WebRTCMediaEvent; import org.bigbluebutton.modules.phone.events.WebRTCEchoTestEvent;
import org.bigbluebutton.util.i18n.ResourceUtil; import org.bigbluebutton.modules.phone.events.WebRTCMediaEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
private function handleWebRTCMediaSuccessEvent(e:WebRTCMediaEvent):void {
PopUpUtil.removePopUp(this); private function handleWebRTCMediaSuccessEvent(e:WebRTCMediaEvent):void {
} PopUpUtil.removePopUp(this);
}
private function handleWebRTCMediaFailEvent(e:WebRTCMediaEvent):void {
PopUpUtil.removePopUp(this); private function handleWebRTCMediaFailEvent(e:WebRTCMediaEvent):void {
} PopUpUtil.removePopUp(this);
}
private function handleWebRTCEchoTestFailedEvent(e:WebRTCEchoTestEvent):void {
PopUpUtil.removePopUp(this); private function handleWebRTCEchoTestFailedEvent(e:WebRTCEchoTestEvent):void {
} PopUpUtil.removePopUp(this);
}
]]>
</fx:Script> ]]>
<mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"> </fx:Script>
<mx:TextArea borderSkin="{null}" <mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
editable="false" <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.micPermissions.chrome.title')}"
text="{ResourceUtil.getInstance().getString('bbb.micPermissions.chrome.title')}" styleName="titleWindowStyle"
styleName="titleWindowStyle" width="400"
width="400" left="0" />
left="0"/> <mx:HBox width="100%">
<mx:HBox width="100%"> <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micPermissions.chrome.message1')}"
<mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micPermissions.chrome.message1')}" styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> <mx:Image source="@Embed('assets/chrome-allow-mic-access.png')"/>
<mx:Image source="@Embed('assets/chrome-allow-mic-access.png')"/> </mx:HBox>
</mx:HBox> </mx:VBox>
</mx:VBox> </mx:TitleWindow>
</mx:TitleWindow>

12
bigbluebutton-client/src/org/bigbluebutton/main/views/ChromeWebcamPermissionImage.mxml
View File

@ -23,6 +23,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx" <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mate="http://mate.asfusion.com/" xmlns:mate="http://mate.asfusion.com/"
xmlns:common="org.bigbluebutton.common.*"
showCloseButton="false" showCloseButton="false"
verticalScrollPolicy="off" verticalScrollPolicy="off"
horizontalScrollPolicy="off" horizontalScrollPolicy="off"
@ -57,13 +58,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
]]> ]]>
</fx:Script> </fx:Script>
<mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"> <mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
<mx:TextArea borderSkin="{null}" <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.webcamPermissions.chrome.title')}"
editable="false" styleName="titleWindowStyle"
selectable="false" width="400"
text="{ResourceUtil.getInstance().getString('bbb.webcamPermissions.chrome.title')}" left="0" />
styleName="titleWindowStyle"
width="400"
left="0"/>
<mx:HBox width="100%"> <mx:HBox width="100%">
<mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.webcamPermissions.chrome.message1')}" <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.webcamPermissions.chrome.message1')}"
selectable="false" styleName="webcamPermissionSettingsTextStyle" /> selectable="false" styleName="webcamPermissionSettingsTextStyle" />

28
bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
View File

@ -353,10 +353,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<!-- Audio Settings Title and help button --> <!-- Audio Settings Title and help button -->
<mx:Canvas width="100%" id="flashMicSettingsTitle"> <mx:Canvas width="100%" id="flashMicSettingsTitle">
<mx:TextArea borderSkin="{null}" <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.users.settings.audioSettings')}"
text="{ResourceUtil.getInstance().getString('bbb.users.settings.audioSettings')}" horizontalCenter="0"
editable="false" styleName="titleWindowStyle" id="audioSettingText" styleName="titleWindowStyle"
width="100%" /> id="audioSettingText"
maxWidth="400" />
<mx:LinkButton toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}" <mx:LinkButton toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}"
styleName="helpLinkButtonStyle" styleName="helpLinkButtonStyle"
top="0" right="0" top="0" right="0"
@ -379,10 +380,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:HBox> </mx:HBox>
<mx:HRule width="100%"/> <mx:HRule width="100%"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10"> <mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<mx:TextArea editable="false" textAlign="left" borderSkin="{null}" <common:AdvancedLabel textAlign="left"
width="100%" height="60" id="echoTestText" width="100%"
text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}" height="60"
styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> id="echoTestText"
text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}"
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
<mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}" <mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}"
click="yesButtonClicked()" click="yesButtonClicked()"
toolTip=""/> toolTip=""/>
@ -414,10 +417,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:VBox> </mx:VBox>
<mx:HBox includeIn="flashMicTestFailedState" width="100%" paddingBottom="60" verticalAlign="middle" horizontalAlign="center"> <mx:HBox includeIn="flashMicTestFailedState" width="100%" paddingBottom="60" verticalAlign="middle" horizontalAlign="center">
<mx:TextArea editable="false" textAlign="center" borderSkin="{null}" <common:AdvancedLabel textAlign="center"
width="100%" height="{txtErrorMessageMock.height}" width="100%"
text="{ResourceUtil.getInstance().getString('bbb.micSettings.connectingtoecho.error')}" height="{txtErrorMessageMock.height}"
styleName="micSettingsWindowHearFromHeadsetLabelStyle" /> text="{ResourceUtil.getInstance().getString('bbb.micSettings.connectingtoecho.error')}"
styleName="micSettingsWindowHearFromHeadsetLabelStyle" />
<mx:Text id="txtErrorMessageMock" width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.connectingtoecho.error')}" <mx:Text id="txtErrorMessageMock" width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.connectingtoecho.error')}"
textAlign="center" styleName="micSettingsWindowHearFromHeadsetLabelStyle" textAlign="center" styleName="micSettingsWindowHearFromHeadsetLabelStyle"
visible="false" includeInLayout="false" /> visible="false" includeInLayout="false" />

9
bigbluebutton-client/src/org/bigbluebutton/main/views/LockSettings.mxml
View File

@ -72,10 +72,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<common:TabIndexer startIndex="1" tabIndices="{[titleText, saveBtn, cancelBtn]}"/> <common:TabIndexer startIndex="1" tabIndices="{[titleText, saveBtn, cancelBtn]}"/>
</fx:Declarations> </fx:Declarations>
<mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"> <mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" horizontalAlign="center">
<mx:TextArea borderSkin="{null}" editable="false" selectable="false" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.title')}" styleName="titleWindowStyle" <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.lockSettings.title')}"
id="titleText" width="100%" verticalScrollPolicy="off"/> styleName="titleWindowStyle"
id="titleText"
maxWidth="250" />
<mx:HBox verticalAlign="top" width="100%" paddingTop="20"> <mx:HBox verticalAlign="top" width="100%" paddingTop="20">
<mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.feature')}" fontWeight="bold" /> <mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.feature')}" fontWeight="bold" />
<mx:Label styleName="lockSettingsDefaultLabelStyle" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.locked')}" fontWeight="bold" /> <mx:Label styleName="lockSettingsDefaultLabelStyle" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.locked')}" fontWeight="bold" />

14
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
View File

@ -23,7 +23,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx" xmlns:fx="http://ns.adobe.com/mxml/2009" <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx" xmlns:fx="http://ns.adobe.com/mxml/2009"
title="{ResourceUtil.getInstance().getString('bbb.logout.title')}" showCloseButton="false" creationComplete="init()" title="{ResourceUtil.getInstance().getString('bbb.logout.title')}" showCloseButton="false" creationComplete="init()"
verticalScrollPolicy="off" horizontalScrollPolicy="off" verticalScrollPolicy="off" horizontalScrollPolicy="off"
x="168" y="86" layout="vertical" width="400" height="110" horizontalAlign="center"> x="168" y="86" layout="vertical" width="400" horizontalAlign="center">
<fx:Script> <fx:Script>
<![CDATA[ <![CDATA[
import com.asfusion.mate.events.Dispatcher; import com.asfusion.mate.events.Dispatcher;
@ -89,12 +89,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
} }
public function setReason(reason:String):void { public function setReason(reason:String):void {
var logData:Object = UsersUtil.initLogData(); var logData:Object = UsersUtil.initLogData();
logData.tags = ["connection"]; logData.tags = ["connection"];
logData.message = "User logged out."; logData.message = "User logged out.";
logData.reason = reason; logData.reason = reason;
LOGGER.info(JSON.stringify(logData)); LOGGER.info(JSON.stringify(logData));
switch (reason) { switch (reason) {
case ConnectionFailedEvent.APP_SHUTDOWN: case ConnectionFailedEvent.APP_SHUTDOWN:
message = ResourceUtil.getInstance().getString('bbb.logout.appshutdown'); message = ResourceUtil.getInstance().getString('bbb.logout.appshutdown');

174
bigbluebutton-client/src/org/bigbluebutton/main/views/LogoutWindow.mxml
View File

@ -1,87 +1,87 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below). Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below).
This program is free software; you can redistribute it and/or modify it under the This program is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 3.0 of the License, or (at your option) any later Foundation; either version 3.0 of the License, or (at your option) any later
version. version.
BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along You should have received a copy of the GNU Lesser General Public License along
with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
--> -->
<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx" <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mate="http://mate.asfusion.com/" xmlns:mate="http://mate.asfusion.com/"
verticalScrollPolicy="off" verticalScrollPolicy="off"
horizontalScrollPolicy="off" horizontalScrollPolicy="off"
horizontalAlign="center" horizontalAlign="center"
showCloseButton="false" showCloseButton="false"
creationComplete="onCreationComplete()" creationComplete="onCreationComplete()"
styleName="logoutWindowStyle" width="350"
height="108" title="{ResourceUtil.getInstance().getString('bbb.logout.confirm.title')}">
width="350"
title="{ResourceUtil.getInstance().getString('bbb.logout.confirm.title')}"> <fx:Script>
<![CDATA[
<fx:Script> import com.asfusion.mate.events.Dispatcher;
<![CDATA[
import com.asfusion.mate.events.Dispatcher; import mx.managers.PopUpManager;
import mx.managers.PopUpManager;
import org.as3commons.logging.api.ILogger; import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger; import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.core.UsersUtil; import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.main.events.BBBEvent; import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.main.events.LogoutEvent; import org.bigbluebutton.main.events.LogoutEvent;
import org.bigbluebutton.util.i18n.ResourceUtil; import org.bigbluebutton.util.i18n.ResourceUtil;
private static const LOGGER:ILogger = getClassLogger(LogoutWindow); private static const LOGGER:ILogger = getClassLogger(LogoutWindow);
private var globalDispatcher:Dispatcher = new Dispatcher();; private var globalDispatcher:Dispatcher = new Dispatcher();;
private function onCreationComplete():void { private function onCreationComplete():void {
cancelButton.setFocus(); cancelButton.setFocus();
endMeetingButton.visible = endMeetingButton.includeInLayout = UsersUtil.amIModerator(); endMeetingButton.visible = endMeetingButton.includeInLayout = UsersUtil.amIModerator();
} }
private function endMeetingClickHandler():void { private function endMeetingClickHandler():void {
globalDispatcher.dispatchEvent(new BBBEvent(BBBEvent.CONFIRM_LOGOUT_END_MEETING_EVENT)); globalDispatcher.dispatchEvent(new BBBEvent(BBBEvent.CONFIRM_LOGOUT_END_MEETING_EVENT));
close(); close();
} }
private function confirmButtonClickHandler():void { private function confirmButtonClickHandler():void {
globalDispatcher.dispatchEvent(new LogoutEvent(LogoutEvent.USER_LOGGED_OUT)); globalDispatcher.dispatchEvent(new LogoutEvent(LogoutEvent.USER_LOGGED_OUT));
close(); close();
} }
private function cancelButtonClickHandler():void { private function cancelButtonClickHandler():void {
close(); close();
} }
private function close():void { private function close():void {
PopUpManager.removePopUp(this); PopUpManager.removePopUp(this);
} }
]]> ]]>
</fx:Script> </fx:Script>
<mx:VBox width="100%" height="100%"> <mx:VBox width="100%" height="100%">
<mx:Box width="100%" height="100%" horizontalAlign="center" verticalAlign="middle"> <mx:Box width="100%" height="100%" horizontalAlign="center" verticalAlign="middle">
<mx:Text text="{ResourceUtil.getInstance().getString('bbb.logout.confirm.message')}" /> <mx:Text text="{ResourceUtil.getInstance().getString('bbb.logout.confirm.message')}" />
</mx:Box> </mx:Box>
<mx:HBox width="100%" horizontalAlign="center"> <mx:HBox width="100%" horizontalAlign="center">
<mx:Button id="confimButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.yes')}" click="confirmButtonClickHandler()" /> <mx:Button id="confimButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.yes')}" click="confirmButtonClickHandler()" />
<mx:Button id="cancelButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.no')}" click="cancelButtonClickHandler()" /> <mx:Button id="cancelButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.no')}" click="cancelButtonClickHandler()" />
<mx:Button id="endMeetingButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.endMeeting')}" click="endMeetingClickHandler()" /> <mx:Button id="endMeetingButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.endMeeting')}" click="endMeetingClickHandler()" />
</mx:HBox> </mx:HBox>
</mx:VBox> </mx:VBox>
</mx:TitleWindow> </mx:TitleWindow>

39
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
View File

@ -20,9 +20,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
--> -->
<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx" <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mate="http://mate.asfusion.com/" xmlns:mate="http://mate.asfusion.com/"
width="600" height="380" xmlns:common="org.bigbluebutton.common.*"
creationComplete="onCreationComplete()" width="600" height="380"
creationComplete="onCreationComplete()"
showCloseButton="false" showCloseButton="false"
close="onCancelClicked()"> close="onCancelClicked()">
@ -251,12 +252,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</fx:Script> </fx:Script>
<mx:Canvas id="cnvTitle" width="100%"> <mx:Canvas id="cnvTitle" width="100%">
<mx:TextArea borderSkin="{null}" <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.micSettings.title')}"
editable="false" styleName="titleWindowStyle"
text="{ResourceUtil.getInstance().getString('bbb.micSettings.title')}" horizontalCenter="0"
styleName="titleWindowStyle" maxWidth="450"
width="100%" left="0" />
left="0"/>
<mx:LinkButton toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}" <mx:LinkButton toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}"
styleName="helpLinkButtonStyle" styleName="helpLinkButtonStyle"
top="0" right="0" top="0" right="0"
@ -267,13 +267,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"> <mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
<mx:VBox includeIn="connecting" width="100%" height="100%" verticalAlign="middle"> <mx:VBox includeIn="connecting" width="100%" height="100%" verticalAlign="middle">
<mx:HBox width="100%" height="100%" verticalAlign="middle" horizontalAlign="center"> <mx:HBox width="100%" height="100%" verticalAlign="middle" horizontalAlign="center">
<mx:TextArea id="lblConnectMessage" <common:AdvancedLabel id="lblConnectMessage"
editable="false" textAlign="right"
textAlign="right" width="{lblConnectMessageMock.width + 10}"
borderSkin="{null}" height="{lblConnectDots.height}"
width="{lblConnectMessageMock.width + 10}" styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
height="{lblConnectDots.height}"
styleName="micSettingsWindowSpeakIntoMicLabelStyle"/>
<mx:Text id="lblConnectMessageMock" <mx:Text id="lblConnectMessageMock"
visible="false" visible="false"
includeInLayout="false"/> includeInLayout="false"/>
@ -303,10 +301,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:HBox> </mx:HBox>
<mx:HRule width="100%"/> <mx:HRule width="100%"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10"> <mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<mx:TextArea editable="false" textAlign="left" borderSkin="{null}" <common:AdvancedLabel textAlign="left"
width="100%" height="60" width="100%"
text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}" height="60"
styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}"
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
<mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}" <mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}"
click="yesButtonClicked()" click="yesButtonClicked()"
toolTip=""/> toolTip=""/>

12
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollChoicesModal.mxml
View File

@ -24,7 +24,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
width="350" layout="vertical" width="350" layout="vertical"
showCloseButton="true" showCloseButton="true"
close="PopUpUtil.removePopUp(this)" close="PopUpUtil.removePopUp(this)"
show="{focusManager.setFocus(choiceFirst)}"> show="{focusManager.setFocus(choiceFirst)}" xmlns:common="org.bigbluebutton.common.*">
<fx:Script> <fx:Script>
<![CDATA[ <![CDATA[
import com.asfusion.mate.events.Dispatcher; import com.asfusion.mate.events.Dispatcher;
@ -65,9 +65,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
]]> ]]>
</fx:Script> </fx:Script>
<mx:TextArea id="modalTitle" width="100%" wordWrap="false" borderSkin="{null}" editable="false" <mx:Canvas id="cnvTitle" width="100%">
text="{ResourceUtil.getInstance().getString('bbb.polling.customChoices.title')}" <common:AdvancedLabel id="modalTitle"
styleName="titleWindowStyle"/> maxWidth="300"
horizontalCenter="0"
text="{ResourceUtil.getInstance().getString('bbb.polling.customChoices.title')}"
styleName="titleWindowStyle" />
</mx:Canvas>
<mx:HRule width="100%"/> <mx:HRule width="100%"/>
<mx:VBox width="100%" paddingTop="20" paddingBottom="20" paddingLeft="16" paddingRight="16"> <mx:VBox width="100%" paddingTop="20" paddingBottom="20" paddingLeft="16" paddingRight="16">

11
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollResultsModal.as
View File

@ -12,9 +12,8 @@ package org.bigbluebutton.modules.polling.views
import mx.controls.Button; import mx.controls.Button;
import mx.controls.HRule; import mx.controls.HRule;
import mx.controls.Label; import mx.controls.Label;
import mx.controls.TextArea;
import mx.core.ScrollPolicy;
import org.bigbluebutton.common.AdvancedLabel;
import org.bigbluebutton.core.PopUpUtil; import org.bigbluebutton.core.PopUpUtil;
import org.bigbluebutton.modules.polling.events.PollStoppedEvent; import org.bigbluebutton.modules.polling.events.PollStoppedEvent;
import org.bigbluebutton.modules.polling.events.PollVotedEvent; import org.bigbluebutton.modules.polling.events.PollVotedEvent;
@ -43,14 +42,12 @@ package org.bigbluebutton.modules.polling.views
width = 400; width = 400;
showCloseButton = false; showCloseButton = false;
layout = "vertical"; layout = "vertical";
setStyle("horizontalAlign", "center");
var modalTitle:TextArea = new TextArea(); var modalTitle:AdvancedLabel = new AdvancedLabel();
modalTitle.setStyle("borderSkin", null);
modalTitle.verticalScrollPolicy = ScrollPolicy.OFF;
modalTitle.editable = false;
modalTitle.text = ResourceUtil.getInstance().getString('bbb.polling.pollModal.title'); modalTitle.text = ResourceUtil.getInstance().getString('bbb.polling.pollModal.title');
modalTitle.styleName = "titleWindowStyle"; modalTitle.styleName = "titleWindowStyle";
modalTitle.percentWidth = 100; modalTitle.maxWidth = 300;
addChild(modalTitle); addChild(modalTitle);
var hrule:HRule = new HRule(); var hrule:HRule = new HRule();

158
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileDownloadWindow.mxml
View File

@ -1,79 +1,79 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
This program is free software; you can redistribute it and/or modify it under the This program is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 3.0 of the License, or (at your option) any later Foundation; either version 3.0 of the License, or (at your option) any later
version. version.
BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along You should have received a copy of the GNU Lesser General Public License along
with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
--> -->
<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx" <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mate="http://mate.asfusion.com/" xmlns:mate="http://mate.asfusion.com/"
layout="absolute" xmlns:common="org.bigbluebutton.common.*"
width="580" layout="absolute"
height="410" width="580"
showCloseButton="true" height="410"
close="{globalDispatch.dispatchEvent(new DownloadEvent(DownloadEvent.CLOSE_DOWNLOAD_WINDOW))}" showCloseButton="true"
initialize="initData();"> close="{globalDispatch.dispatchEvent(new DownloadEvent(DownloadEvent.CLOSE_DOWNLOAD_WINDOW))}"
initialize="initData();" >
<fx:Declarations>
<mate:Dispatcher id="globalDispatch" /> <fx:Declarations>
</fx:Declarations> <mate:Dispatcher id="globalDispatch" />
</fx:Declarations>
<fx:Script>
<![CDATA[ <fx:Script>
import mx.collections.ArrayCollection; <![CDATA[
import mx.collections.ArrayCollection;
import org.bigbluebutton.modules.present.events.DownloadEvent;
import org.bigbluebutton.modules.present.model.PresentationModel; import org.bigbluebutton.modules.present.events.DownloadEvent;
import org.bigbluebutton.util.i18n.ResourceUtil; import org.bigbluebutton.modules.present.model.PresentationModel;
import org.bigbluebutton.util.i18n.ResourceUtil;
[Bindable]
private var downloadablePresentations:ArrayCollection; [Bindable]
private var downloadablePresentations:ArrayCollection;
override public function move(x:Number, y:Number):void {
return; override public function move(x:Number, y:Number):void {
} return;
}
private function initData():void {
downloadablePresentations = PresentationModel.getInstance().getDownloadablePresentations(); private function initData():void {
} downloadablePresentations = PresentationModel.getInstance().getDownloadablePresentations();
]]> }
]]>
</fx:Script>
</fx:Script>
<mx:VBox width="100%"
height="100%"> <mx:VBox width="100%"
<mx:TextArea borderSkin="{null}" height="100%"
text="{ResourceUtil.getInstance().getString('bbb.filedownload.title')}" horizontalAlign="center">
editable="false" <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.filedownload.title')}"
styleName="titleWindowStyle" styleName="titleWindowStyle"
width="100%" /> maxWidth="450" />
<mx:List id="presentationNamesList" <mx:List id="presentationNamesList"
allowMultipleSelection="false" allowMultipleSelection="false"
width="100%" width="100%"
height="100%" height="100%"
left="5" left="5"
top="5" top="5"
right="5" right="5"
bottom="5" bottom="5"
itemRenderer="org.bigbluebutton.modules.present.ui.views.DownloadPresentationRenderer" itemRenderer="org.bigbluebutton.modules.present.ui.views.DownloadPresentationRenderer"
dragEnabled="false" dragEnabled="false"
dataProvider="{downloadablePresentations}"> dataProvider="{downloadablePresentations}">
</mx:List> </mx:List>
</mx:VBox> </mx:VBox>
</mx:TitleWindow> </mx:TitleWindow>

11
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
View File

@ -31,7 +31,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
showCloseButton="true" showCloseButton="true"
close="globalDispatch.dispatchEvent(new UploadEvent(UploadEvent.CLOSE_UPLOAD_WINDOW))" close="globalDispatch.dispatchEvent(new UploadEvent(UploadEvent.CLOSE_UPLOAD_WINDOW))"
initialize="initData()" initialize="initData()"
creationComplete="onCreationComplete(event)"> creationComplete="onCreationComplete(event)" xmlns:common="org.bigbluebutton.common.*">
<fx:Declarations> <fx:Declarations>
<mate:Dispatcher id="globalDispatch" /> <mate:Dispatcher id="globalDispatch" />
@ -345,11 +345,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</fx:Script> </fx:Script>
<mx:VBox width="100%" height="100%" verticalAlign="top"> <mx:VBox width="100%" height="100%" verticalAlign="top" horizontalAlign="center">
<mx:TextArea borderSkin="{null}" <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.fileupload.title')}"
text="{ResourceUtil.getInstance().getString('bbb.fileupload.title')}" styleName="titleWindowStyle"
editable="false" styleName="titleWindowStyle" maxWidth="450" />
width="100%"/>
<mx:Box width="100%" height="100%" paddingLeft="5" paddingRight="5"> <mx:Box width="100%" height="100%" paddingLeft="5" paddingRight="5">
<mx:Box width="100%" height="100%" verticalAlign="middle" horizontalAlign="center" styleName="presentationUploadFileFormatHintBoxStyle"> <mx:Box width="100%" height="100%" verticalAlign="middle" horizontalAlign="center" styleName="presentationUploadFileFormatHintBoxStyle">
<mx:Text width="100%" id="fileFormatHintLbl" textAlign="center" text="{ResourceUtil.getInstance().getString('bbb.fileupload.fileFormatHint')}" styleName="presentationUploadFileFormatHintTextStyle"/> <mx:Text width="100%" id="fileFormatHintLbl" textAlign="center" text="{ResourceUtil.getInstance().getString('bbb.fileupload.fileFormatHint')}" styleName="presentationUploadFileFormatHintTextStyle"/>

15
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
View File

@ -808,10 +808,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:ControlBar id="presCtrlBar" name="presCtrlBar" width="100%" verticalAlign="top" styleName="presentationWindowControlsStyle" paddingTop="6" paddingBottom="6"> <mx:ControlBar id="presCtrlBar" name="presCtrlBar" width="100%" verticalAlign="top" styleName="presentationWindowControlsStyle" paddingTop="6" paddingBottom="6">
<!-- Presentation Actions --> <!-- Presentation Actions -->
<mx:HBox width="40%" height="100%" horizontalScrollPolicy="off" verticalAlign="bottom" horizontalAlign="left"> <mx:HBox width="40%" height="100%" horizontalScrollPolicy="off" verticalAlign="bottom" horizontalAlign="left">
<mx:Button id="uploadPres" visible="false" height="30" styleName="presentationUploadButtonStyle" <mx:Button id="uploadPres" visible="false" height="30" styleName="presentationUploadButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.uploadPresBtn.toolTip')}" toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.uploadPresBtn.toolTip')}"
click="onUploadButtonClicked()"/> click="onUploadButtonClicked()"/>
<mx:Button id="pollStartBtn" visible="false" height="30" styleName="pollStartButtonStyle" <mx:Button id="pollStartBtn" visible="false" height="30" styleName="pollStartButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.polling.startButton.tooltip')}" toolTip="{ResourceUtil.getInstance().getString('bbb.polling.startButton.tooltip')}"
click="onPollStartButtonClicked()" includeInLayout="{pollStartBtn.visible}"/> click="onPollStartButtonClicked()" includeInLayout="{pollStartBtn.visible}"/>
<poll:QuickPollButton id="quickPollBtn" height="30" <poll:QuickPollButton id="quickPollBtn" height="30"
@ -822,7 +822,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
styleName="presentationDownloadButtonStyle" styleName="presentationDownloadButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.downloadPresBtn.toolTip')}" toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.downloadPresBtn.toolTip')}"
click="onDownloadButtonClicked()" creationComplete="updateDownloadBtn()"/> click="onDownloadButtonClicked()" creationComplete="updateDownloadBtn()"/>
</mx:HBox> </mx:HBox>
<mx:HBox id="presenterControls" width="30%" height="100%" paddingTop="0" visible="false" includeInLayout="false" horizontalAlign="center" verticalAlign="middle"> <mx:HBox id="presenterControls" width="30%" height="100%" paddingTop="0" visible="false" includeInLayout="false" horizontalAlign="center" verticalAlign="middle">
@ -833,6 +833,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Button id="forwardButton" visible="false" height="30" styleName="presentationForwardButtonStyle" <mx:Button id="forwardButton" visible="false" height="30" styleName="presentationForwardButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.forwardBtn.toolTip')}" click="goToNextSlide()"/> toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.forwardBtn.toolTip')}" click="goToNextSlide()"/>
</mx:HBox> </mx:HBox>
<mx:HBox width="40%" height="100%" horizontalScrollPolicy="off" verticalAlign="middle" horizontalAlign="right"> <mx:HBox width="40%" height="100%" horizontalScrollPolicy="off" verticalAlign="middle" horizontalAlign="right">
<mx:HSlider id="zoomSlider" visible="false" value="{slideView.zoomPercentage}" styleName="presentationZoomSliderStyle" <mx:HSlider id="zoomSlider" visible="false" value="{slideView.zoomPercentage}" styleName="presentationZoomSliderStyle"
minimum="100" maximum="400" dataTipPlacement="top" minimum="100" maximum="400" dataTipPlacement="top"
@ -846,6 +847,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.fitToPage.toolTip')}" toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.fitToPage.toolTip')}"
click="onFitToPage(true)"/> click="onFitToPage(true)"/>
</mx:HBox> </mx:HBox>
<mx:HBox id="pollVoteBox" width="100%" height="100%" visible="false" includeInLayout="false" horizontalAlign="center" /> <mx:HBox id="pollVoteBox" width="100%" height="100%" visible="false" includeInLayout="false" horizontalAlign="center" verticalAlign="middle"/>
</mx:ControlBar> </mx:ControlBar>
</pres:CustomMdiWindow> </pres:CustomMdiWindow>

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

@ -273,10 +273,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
]]> ]]>
</fx:Script> </fx:Script>
<mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"> <mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" horizontalAlign="center">
<mx:TextArea width="100%" borderSkin="{null}" editable="false" <common:AdvancedLabel maxWidth="550"
id="textArea" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}" id="textArea"
styleName="titleWindowStyle"/> text="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}"
styleName="titleWindowStyle" />
<mx:Canvas width="100%" styleName="breakoutTipBox"> <mx:Canvas width="100%" styleName="breakoutTipBox">
<mx:Text horizontalCenter="0" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.dragAndDropToolTip')}"/> <mx:Text horizontalCenter="0" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.dragAndDropToolTip')}"/>
</mx:Canvas> </mx:Canvas>