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-15 10:46:39 -07:00
commit bbe00830a7
16 changed files with 261 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,10 +38,11 @@
*/
global {
fontFamily : "Source Sans Pro", Arial, sans-serif;
fontSize : 13;
color : #2A2D33;
focusColor : #1070D7;
fontFamily : "Source Sans Pro", Arial, sans-serif;
fontSize : 13;
color : #2A2D33;
focusColor : #1070D7;
selectionColor : #CFE2F7;
}
.defaultShellStyle {
@ -270,17 +271,15 @@ mx|ApplicationControlBar {
.muteMeDefaultButtonStyle {
glowFilterColor : #1070D7;
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone");
disabledIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_Disabled");
iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone");
}
.muteMeOnButtonStyle {
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_White");
disabledIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_Disabled");
iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_White");
}
.muteMeOffButtonStyle {
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_Off");
iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_Off");
}
.quickWindowLinkStyle {
@ -421,6 +420,9 @@ users|RoomActionsRenderer {
}
.breakoutTipBox {
backgroundColor : #CDD4DB;
paddingLeft : 10;
paddingRight : 10;
horizontalAlign : center;
}
@ -1091,10 +1093,9 @@ presentation|UploadedPresentationRenderer {
}
.presentationUploadFileFormatHintBoxStyle, .audioBroswerHintBoxStyle {
backgroundColor : #CDD4DB;
dropShadowEnabled : false;
paddingLeft : 10;
paddingRight : 10;
backgroundColor : #CDD4DB;
paddingLeft : 10;
paddingRight : 10;
}
.presentationUploadFileFormatHintTextStyle, .audioBroswerHintTextStyle {
@ -1169,6 +1170,22 @@ views|ReconnectionPopup {
iconRefresh : Embed(source="assets/swf/refreshing.swf");
}
/*
//------------------------------
// Scrollbar
//------------------------------
*/
mx|ScrollBar {
cornerRadius : 4;
downArrowSkin : ClassReference(null);
thumbSkin : ClassReference("org.bigbluebutton.skins.ScrollThumbSkin");
trackSkin : ClassReference("org.bigbluebutton.skins.ScrollTrackSkin");
upArrowSkin : ClassReference(null);
thumbColor : #BBBDBF;
trackColor : #F5F6F8;
}
/*
//------------------------------
// SharedNotes
@ -1349,9 +1366,7 @@ users|NameItemRenderer {
}
.usersGridStyle {
borderStyle : none;
selectionColor : #FFFFFF;
rollOverColor : #FFFFFF;
borderStyle : none;
}
users|EmojiGrid {
@ -1392,6 +1407,7 @@ users|MoodMenu {
*/
videoconf|UserGraphicHolder {
backgroundColor : #FFFFFF;
iconPresenter : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Video_Presenter");
iconModerator : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Video_Moderator");
iconClose : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Close_Video");
@ -1399,6 +1415,13 @@ videoconf|UserGraphicHolder {
iconExitFullScreen : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Exit_Fullscreen_White");
}
.userGraphicBackground {
backgroundColor : #FFFFFF;
borderStyle : solid;
borderColor : #000000;
borderThickness : 0;
}
.videoToolbarBackgroundTalkingStyle {
backgroundColor : #1070D7;
backgroundAlpha : 0.5;

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.

66
bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ScrollThumbSkin.as Normal file
View File

@ -0,0 +1,66 @@
package org.bigbluebutton.skins {
import flash.display.GradientType;
import mx.skins.Border;
import mx.skins.halo.HaloColors;
import mx.utils.ColorUtil;
public class ScrollThumbSkin extends Border {
//--------------------------------------------------------------------------
//
// Overridden properties
//
//--------------------------------------------------------------------------
//----------------------------------
// measuredWidth
//----------------------------------
/**
* @private
*/
override public function get measuredWidth():Number {
return 8;
}
//----------------------------------
// measuredHeight
//----------------------------------
/**
* @private
*/
override public function get measuredHeight():Number {
return 10;
}
//--------------------------------------------------------------------------
//
// Overridden methods
//
//--------------------------------------------------------------------------
/**
* @private
*/
override protected function updateDisplayList(w:Number, h:Number):void {
super.updateDisplayList(w, h);
// User-defined styles.
var thumbColor:uint = getStyle("thumbColor");
var cornerRadius:Number = getStyle("cornerRadius");
graphics.clear();
var fillAlpha:Number = 1;
if (name == "trackDisabledSkin")
fillAlpha = .2;
// fill
drawRoundRect(0, 0, w, h, cornerRadius, thumbColor, fillAlpha);
}
}
}

79
bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ScrollTrackSkin.as Normal file
View File

@ -0,0 +1,79 @@
/**
* 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.skins {
import mx.skins.Border;
public class ScrollTrackSkin extends Border {
//--------------------------------------------------------------------------
//
// Overridden properties
//
//--------------------------------------------------------------------------
//----------------------------------
// measuredWidth
//----------------------------------
/**
* @private
*/
override public function get measuredWidth():Number {
return 8;
}
//----------------------------------
// measuredHeight
//----------------------------------
/**
* @private
*/
override public function get measuredHeight():Number {
return 5;
}
//--------------------------------------------------------------------------
//
// Overridden methods
//
//--------------------------------------------------------------------------
/**
* @private
*/
override protected function updateDisplayList(w:Number, h:Number):void {
super.updateDisplayList(w, h);
// User-defined styles.
var trackColor:uint = getStyle("trackColor");
var cornerRadius:Number = getStyle("cornerRadius");
graphics.clear();
var fillAlpha:Number = 1;
if (name == "trackDisabledSkin")
fillAlpha = .2;
// fill
drawRoundRect(0, 0, w, h, cornerRadius, trackColor, fillAlpha);
}
}
}

10
bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
View File

@ -106,7 +106,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
leftWindowWidth = 245;
rightWindowHeight = this.height * 0.6;
rightWindowWidth = (this.width / 20) * 6;
centerWindowHeight = this.height - 10;
centerWindowHeight = this.height / 2;
centerWindowWidth = this.width / 2;
var position:String = window.getPrefferedPosition();
@ -199,12 +199,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (y < 0) y = 1;
break;
case DESKTOP_SHARING_PUBLISH:
y = (this.height - win.height) - 43;
x = 8;
x = centerWindowWidth - win.width / 2;
y = centerWindowHeight - win.height / 2;
break;
case DESKTOP_SHARING_VIEW:
x = 1;
y = 1;
x = centerWindowWidth - win.width / 2;
y = centerWindowHeight - win.height / 2;
break;
case ABSOLUTE:
// don't reposition the window

33
bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
View File

@ -29,7 +29,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
resizable="false"
showCloseButton="true"
implements="org.bigbluebutton.common.IBbbModuleWindow"
width="210" minWidth="0"
width="210" height="220" minWidth="0"
resize="onResize()">
<fx:Script>
@ -57,7 +57,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
_updateTimer.addEventListener(TimerEvent.TIMER, timerHandler);
_updateTimer.start();
height = panel.measuredHeight + borderMetrics.top + borderMetrics.bottom;
runBandwidthMeasurement();
}
@ -87,20 +86,20 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
]]>
</fx:Script>
<mx:Panel id="panel" width="100%" paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10" headerHeight="10">
<mx:VBox verticalGap="0" width="100%" height="100%">
<mx:HBox backgroundColor="haloOrange" width="100%" horizontalAlign="center"><mx:Label fontWeight="bold" text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.upload')}"/></mx:HBox>
<mx:HBox visible="false" includeInLayout="false" horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.total')}: "/><mx:Label id="labelTotalUpload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.current')}: "/><mx:Label id="labelCurrentUpload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox visible="false" includeInLayout="false" horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.available')}: "/><mx:Label id="labelAvailableUpload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.latency')}: "/><mx:Label id="labelUploadLatency" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox backgroundColor="haloOrange" width="100%" horizontalAlign="center"><mx:Label fontWeight="bold" text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.download')}"/></mx:HBox>
<mx:HBox visible="false" includeInLayout="false" horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.total')}: "/><mx:Label id="labelTotalDownload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.current')}: "/><mx:Label id="labelCurrentDownload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox visible="false" includeInLayout="false" horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.available')}: "/><mx:Label id="labelAvailableDownload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.latency')}: "/><mx:Label id="labelDownloadLatency" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0" width="100%" ><mx:Spacer width="100%"/><mx:Button id="labelRefresh" icon="{getStyle('iconRefresh')}" width="16" height="16" click="runBandwidthMeasurement()" /></mx:HBox>
</mx:VBox>
</mx:Panel>
<mx:VBox verticalGap="0" width="100%" height="100%"
paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10"
verticalScrollPolicy="off" horizontalScrollPolicy="off">
<mx:HBox backgroundColor="haloOrange" width="100%" horizontalAlign="center"><mx:Label fontWeight="bold" text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.upload')}"/></mx:HBox>
<mx:HBox visible="false" includeInLayout="false" horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.total')}: "/><mx:Label id="labelTotalUpload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.current')}: "/><mx:Label id="labelCurrentUpload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox visible="false" includeInLayout="false" horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.available')}: "/><mx:Label id="labelAvailableUpload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.latency')}: "/><mx:Label id="labelUploadLatency" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox backgroundColor="haloOrange" width="100%" horizontalAlign="center"><mx:Label fontWeight="bold" text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.download')}"/></mx:HBox>
<mx:HBox visible="false" includeInLayout="false" horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.total')}: "/><mx:Label id="labelTotalDownload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.current')}: "/><mx:Label id="labelCurrentDownload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox visible="false" includeInLayout="false" horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.available')}: "/><mx:Label id="labelAvailableDownload" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0"><mx:Label text="{ResourceUtil.getInstance().getString('bbb.bwmonitor.latency')}: "/><mx:Label id="labelDownloadLatency" fontWeight="bold" text="-"/></mx:HBox>
<mx:HBox horizontalGap="0" width="100%" ><mx:Spacer width="100%"/><mx:Button id="labelRefresh" icon="{getStyle('iconRefresh')}" click="runBandwidthMeasurement()" /></mx:HBox>
</mx:VBox>
</CustomMdiWindow>

3
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/UserRenderer.mxml
View File

@ -33,6 +33,5 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
color="{data.me ? 0x003399 : 0x000000}"/>
-->
<mx:Label id="nameLabel" textAlign="left" text="{data.name}"
fontWeight="{'normal'}"
color="{0x000000}"/>
fontWeight="{'normal'}"/>
</mx:HBox>

66
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/MuteMeButton.mxml
View File

@ -20,20 +20,21 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
$Id: $
-->
<mx:Button xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:flc="flexlib.controls.*"
xmlns:mate="http://mate.asfusion.com/"
visible="false"
includeInLayout="false"
creationComplete="onCreationComplete()"
toolTip="{UsersUtil.amIMuted() ? ResourceUtil.getInstance().getString('bbb.users.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.users.pushToMute.toolTip')}"
click="toggleMuteMeState()"
mouseOver="mouseOverHandler()"
mouseOut="mouseOutHandler()"
height="30"
styleName="muteMeDefaultButtonStyle"
implements="org.bigbluebutton.common.IBbbToolbarComponent">
<flc:CanvasButton xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:flc="flexlib.controls.*"
xmlns:mate="http://mate.asfusion.com/"
visible="false"
includeInLayout="false"
creationComplete="onCreationComplete()"
toolTip="{UsersUtil.amIMuted() ? ResourceUtil.getInstance().getString('bbb.users.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.users.pushToMute.toolTip')}"
click="toggleMuteMeState()"
mouseOver="mouseOverHandler()"
mouseOut="mouseOutHandler()"
height="30"
width="40"
styleName="muteMeDefaultButtonStyle"
implements="org.bigbluebutton.common.IBbbToolbarComponent">
<fx:Declarations>
<mate:Listener type="{LocaleChangeEvent.LOCALE_CHANGED}"
@ -57,9 +58,8 @@ $Id: $
<fx:Script>
<![CDATA[
import flash.filters.BitmapFilterQuality;
import flash.filters.GlowFilter;
import mx.core.mx_internal;
import spark.filters.GlowFilter;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
@ -82,8 +82,6 @@ $Id: $
private var muteMeRolled:Boolean = false;
use namespace mx_internal;
public function getAlignment():String {
return MainToolbar.ALIGN_LEFT;
}
@ -96,9 +94,9 @@ $Id: $
//rest rolledOver when the data changes because onRollOut wont be called if the row moves
if (UsersUtil.isMe(e.message.userID)) {
if (e.message.talking) {
currentIcon.filters = [new GlowFilter(getStyle("glowFilterColor"), 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
muteMeBtnImg.filters = [new GlowFilter(getStyle("glowFilterColor"), 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
} else {
currentIcon.filters = [];
muteMeBtnImg.filters = [];
}
}
}
@ -124,7 +122,7 @@ $Id: $
if (UsersUtil.isMe(event.payload.userID)) {
LOGGER.debug("User has joined the conference using flash");
updateMuteMeBtn();
currentIcon.filters = [];
muteMeBtnImg.filters = [];
}
}
@ -155,19 +153,27 @@ $Id: $
selected = true;
styleName = "muteMeOnButtonStyle";
toolTip = ResourceUtil.getInstance().getString("bbb.users.muteMeBtnTxt.talk");
muteMeBtnImg.source = getStyle("iconAudio");
} else {
selected = true;
styleName = "muteMeOffButtonStyle";
toolTip = ResourceUtil.getInstance().getString("bbb.users.muteMeBtnTxt.mute");
muteMeBtnImg.source = getStyle("iconAudio");
}
} else {
if (myVoiceUser.muted) {
selected = true;
styleName = "muteMeOffButtonStyle";
toolTip = ResourceUtil.getInstance().getString("bbb.users.muteMeBtnTxt.muted");
muteMeBtnImg.source = getStyle("iconAudio");
} else {
selected = false;
styleName = "muteMeDefaultButtonStyle";
muteMeBtnImg.source = getStyle("iconAudio");
}
}
}
@ -182,19 +188,27 @@ $Id: $
selected = true;
styleName = "muteMeOnButtonStyle";
toolTip = ResourceUtil.getInstance().getString("bbb.users.muteMeBtnTxt.talk");
muteMeBtnImg.source = getStyle("iconAudio");
} else {
selected = true;
styleName = "muteMeOffButtonStyle";
toolTip = ResourceUtil.getInstance().getString("bbb.users.muteMeBtnTxt.mute");
muteMeBtnImg.source = getStyle("iconAudio");
}
} else {
if (event.payload.muted) {
selected = true;
styleName = "muteMeOffButtonStyle";
toolTip = ResourceUtil.getInstance().getString("bbb.users.muteMeBtnTxt.muted");
muteMeBtnImg.source = getStyle("iconAudio");
} else {
selected = false;
styleName = "muteMeOnButtonStyle";
muteMeBtnImg.source = getStyle("iconAudio");
}
}
}
@ -225,4 +239,12 @@ $Id: $
]]>
</fx:Script>
</mx:Button>
<mx:HBox id="hboxMuteMe"
horizontalAlign="center"
verticalAlign="middle"
horizontalCenter="0"
verticalCenter="0"
width="100%">
<mx:Image id="muteMeBtnImg" />
</mx:HBox>
</flc:CanvasButton>

4
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/PublishWindowManager.as
View File

@ -20,13 +20,9 @@
package org.bigbluebutton.modules.screenshare.managers {
import com.asfusion.mate.events.Dispatcher;
import flash.events.TimerEvent;
import flash.utils.Timer;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.common.IBbbModuleWindow;
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.common.events.CloseWindowEvent;
import org.bigbluebutton.common.events.OpenWindowEvent;
import org.bigbluebutton.modules.screenshare.services.ScreenshareService;

1
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
View File

@ -26,7 +26,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
implements="org.bigbluebutton.common.IBbbModuleWindow"
xmlns:mate="http://mate.asfusion.com/"
xmlns:common="org.bigbluebutton.common.*"
backgroundColor="#C0C0C0"
initialize="init()"
creationComplete="onCreationComplete()"
verticalScrollPolicy="off" horizontalScrollPolicy="off"

1
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml
View File

@ -26,7 +26,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
implements="org.bigbluebutton.common.IBbbModuleWindow"
xmlns:mate="http://mate.asfusion.com/"
xmlns:dspub="org.bigbluebutton.common.*"
backgroundColor="#C0C0C0"
initialize="init()"
creationComplete="onCreationComplete()"
verticalScrollPolicy="off" horizontalScrollPolicy="off"

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

@ -277,7 +277,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:TextArea width="100%" borderSkin="{null}" editable="false"
id="textArea" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.breakoutRooms')}"
styleName="titleWindowStyle"/>
<mx:Canvas width="100%" styleName="breakoutTipBox" backgroundColor="0xcccccc">
<mx:Canvas width="100%" styleName="breakoutTipBox">
<mx:Text horizontalCenter="0" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.dragAndDropToolTip')}"/>
</mx:Canvas>

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

@ -775,15 +775,15 @@ $Id: $
</mx:VBox>
<mx:ControlBar width="100%" horizontalAlign="right">
<mx:VBox>
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.roomMuted.text')}" visible="{roomMuted}" includeInLayout="{roomMuted}" />
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.roomLocked.text')}" visible="{roomLocked}" includeInLayout="{roomLocked}" />
</mx:VBox>
<mx:Button id="emojiStatusBtn" icon="{getStyle('iconMood')}" width="30" height="30"
accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.emojiStatusBtn.toolTip')}"
toolTip="{ResourceUtil.getInstance().getString('bbb.users.emojiStatusBtn.toolTip')}" click="openEmojiStatusMenu()" />
<mx:Button id="settingsBtn" icon="{getStyle('iconSettings')}" width="30" height="30"
toolTip="{ResourceUtil.getInstance().getString('bbb.users.settings.buttonTooltip')}" click="openSettings()" />
<mx:VBox>
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.roomMuted.text')}" visible="{roomMuted}" includeInLayout="{roomMuted}" />
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.roomLocked.text')}" visible="{roomLocked}" includeInLayout="{roomLocked}" />
</mx:VBox>
</mx:ControlBar>
</mdi:CustomMdiWindow>

8
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphic.as
View File

@ -15,18 +15,16 @@ package org.bigbluebutton.modules.videoconf.views
protected var _origHeight:Number = 240;
protected var _background:Canvas;
protected const BORDER_THICKNESS:int = 0;
protected var BORDER_THICKNESS:int = 0;
public function UserGraphic() {
super();
_background = new Canvas();
_background.setStyle("backgroundColor", "white");
_background.setStyle("borderStyle", "solid");
_background.setStyle("borderColor", "#000000");
_background.setStyle("borderThickness", BORDER_THICKNESS);
_background.styleName = "userGraphicBackground";
_background.horizontalScrollPolicy = "off";
_background.verticalScrollPolicy = "off";
BORDER_THICKNESS = _background.getStyle("borderThickness");
addChild(_background);
}

7
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
View File

@ -26,7 +26,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xmlns:views="org.bigbluebutton.modules.videoconf.views.*"
initialize="init()"
creationComplete="onCreationComplete()"
backgroundColor="white" width="320" height="240"
width="320" height="240"
mouseOver="onCanvasMouseOver()" mouseOut="onCanvasMouseOut()" >
<fx:Declarations>
@ -41,12 +41,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<fx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import mx.core.UIComponent;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.common.Role;
import org.bigbluebutton.core.EventConstants;
import org.bigbluebutton.core.Options;