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-11 14:05:42 -07:00
commit dcc6014ff3
7 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -811,6 +811,10 @@ flexlib|MDIWindow {
paddingLeft : 0;
paddingRight : 0;
paddingTop : 0;
borderThicknessRight : 0;
borderThicknessLeft : 0;
showHeaderSeparator : true;
}
@ -1340,6 +1344,7 @@ users|NameItemRenderer {
}
.usersGridStyle {
borderStyle : none;
selectionColor : #F0F2F6;
}

30
bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/PopUpButtonSkin.as
View File

@ -38,7 +38,7 @@
package org.bigbluebutton.skins {
import flash.display.DisplayObject;
import mx.core.IFlexDisplayObject;
import mx.core.IProgrammaticSkin;
import mx.core.UIComponent;
@ -126,7 +126,7 @@ package org.bigbluebutton.skins {
var arrowColor:uint = getStyle("iconColor");
var arrowColorOver:uint = getStyle("iconColorOver");
var arrowColorDown:uint = getStyle("iconColorDown");
var cornerRadius:Number = getStyle("cornerRadius");
var popUpIcon:IFlexDisplayObject = IFlexDisplayObject(getChildByName("popUpIcon"));
@ -175,7 +175,10 @@ package org.bigbluebutton.skins {
drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorUp, 1);
// left/main button fill
drawRoundRect(borderThickness, borderThickness, w - arrowButtonWidth - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, true), fillColorOver, 1);
drawRoundRect(borderThickness, borderThickness, w - arrowButtonWidth - borderThickness, h - (borderThickness * 2), getRadius(cr1, true), fillColorOver, 1);
// Separator
drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), cr, borderColorOver, 1);
break;
}
@ -183,7 +186,7 @@ package org.bigbluebutton.skins {
case "popUpOverSkin": // for hover on the arrow-button (right) side
{
arrowColor = arrowColorOver;
// button border/edge
drawRoundRect(0, 0, w, h, cr, borderColorOver, 1);
@ -195,6 +198,9 @@ package org.bigbluebutton.skins {
// right button fill
drawRoundRect(dividerPosX + borderThickness, borderThickness, arrowButtonWidth - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, false), fillColorOver, 1);
// Separator
drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), cr, borderColorUp, 1);
break;
}
@ -209,7 +215,10 @@ package org.bigbluebutton.skins {
drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorUp, 1);
// left/main button fill
drawRoundRect(borderThickness, borderThickness, w - arrowButtonWidth - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, true), fillColorDown, 1);
drawRoundRect(borderThickness, borderThickness, w - arrowButtonWidth - borderThickness, h - (borderThickness * 2), getRadius(cr1, true), fillColorDown, 1);
// Separator
drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), cr, borderColorDown, 1);
break;
}
@ -217,7 +226,7 @@ package org.bigbluebutton.skins {
case "popUpDownSkin": // for press on the arrow-button (right) side
{
arrowColor = arrowColorDown;
// button border/edge
drawRoundRect(0, 0, w, h, cr, borderColorDown, 1);
@ -229,6 +238,9 @@ package org.bigbluebutton.skins {
// right button fill
drawRoundRect(dividerPosX + borderThickness, borderThickness, arrowButtonWidth - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, false), fillColorDown, 1);
// Separator
drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), cr, borderColorDown, 1);
break;
}
@ -243,6 +255,12 @@ package org.bigbluebutton.skins {
// button fill
drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorDisabled, 1);
// Separator
drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), cr, borderColorDisabled, 1);
// Separator
drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), cr, borderColorDisabled, 1);
break;
}

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

@ -22,7 +22,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mate="http://mate.asfusion.com/"
xmlns:common="org.bigbluebutton.common.*"
minWidth="300" showCloseButton="false"
minWidth="340" showCloseButton="false"
close="onCancelClicked()"
keyDown="handleKeyDown(event)">
@ -74,7 +74,7 @@ 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:TextArea borderSkin="{null}" editable="false" selectable="false" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.title')}" styleName="titleWindowStyle"
id="titleText" width="100%"/>
id="titleText" width="100%" verticalScrollPolicy="off"/>
<mx:HBox verticalAlign="top" width="100%" paddingTop="20">
<mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.feature')}" fontWeight="bold" />

6
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
View File

@ -530,9 +530,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:VRule styleName="toolbarSeparator" height="10" />
<mx:Label id="meetingNameLbl" minWidth="1" styleName="meetingNameLabelStyle" />
<mx:HBox id="addedBtns" width="100%" horizontalAlign="center">
<mx:HBox id="addedBtnsMicrophone"/>
<mx:HBox id="addedBtnsWebcam"/>
<mx:HBox id="addedBtnsDeskShare"/>
<mx:HBox id="addedBtnsMicrophone" />
<mx:HBox id="addedBtnsWebcam" />
<mx:HBox id="addedBtnsDeskShare" />
</mx:HBox>
<mx:Label id="timeRemainingLabel" visible="false"
text="{ResourceUtil.getInstance().getString('bbb.meeting.timeRemaining')}:"

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

@ -282,13 +282,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.security'));
}
private function displayAlert(error:String, message:String = null):void {
progressBar.setStyle("color", 0xFF0000);
progressBar.label = error;
if (!StringUtils.isEmpty(message)) {
progressBar.label += message;
}
}
private function displayAlert(error:String, message:String = null):void {
progressBar.setStyle("color", 0xFF0000);
progressBar.label = error;
if (!StringUtils.isEmpty(message)) {
progressBar.label += message;
}
}
private function enableControls():void {
enableClosing();
@ -311,11 +311,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function disableClosing():void {
showCloseButton = false;
this.closeButton.enabled = false;
}
private function enableClosing():void {
showCloseButton = true;
this.closeButton.enabled = true;
}
private function handlePresentationRemoved(e:RemovePresentationEvent):void {

11
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ToolbarButtonManager.as
View File

@ -45,13 +45,12 @@ package org.bigbluebutton.modules.screenshare.managers
if ((button != null) && (!buttonShownOnToolbar)) {
button = new ToolbarButton();
/* Test */ //button.tabIndex=4;
var event:ToolbarButtonEvent = new ToolbarButtonEvent(ToolbarButtonEvent.ADD);
event.button = button;
event.module="DeskShare";
globalDispatcher.dispatchEvent(event);
buttonShownOnToolbar = true;
button.enabled = true;
globalDispatcher.dispatchEvent(event);
buttonShownOnToolbar = true;
button.enabled = true;
}
}
@ -59,8 +58,8 @@ package org.bigbluebutton.modules.screenshare.managers
if (buttonShownOnToolbar) {
var event:ToolbarButtonEvent = new ToolbarButtonEvent(ToolbarButtonEvent.REMOVE);
event.button = button;
globalDispatcher.dispatchEvent(event);
buttonShownOnToolbar = false;
globalDispatcher.dispatchEvent(event);
buttonShownOnToolbar = false;
}
}
//OLD - CAN BE DELETED

40
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardTextToolbar.mxml
View File

@ -21,9 +21,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-->
<mx:HBox xmlns="flexlib.containers.*" xmlns:mx="library://ns.adobe.com/flex/mx" xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:mate="http://mate.asfusion.com/" visible="false" alpha="0"
xmlns:views="org.bigbluebutton.modules.whiteboard.views.*"
creationComplete="onCreationComplete()">
xmlns:mate="http://mate.asfusion.com/" visible="false"
xmlns:views="org.bigbluebutton.modules.whiteboard.views.*">
<fx:Declarations>
<mate:Listener type="{MadePresenterEvent.SWITCH_TO_VIEWER_MODE}" method="viewerMode" />
@ -54,36 +53,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var currentlySelectedTextObject:TextObject = null;
private var containerToOverlay:MDIWindow;
private var normalAlpha:Number = 0.55;
private var focusedAlpha:Number = 1.0;
private var hasFocus:Boolean;
[Bindable] private var fontSizes:Array = ["12", "14", "16", "18", "22", "24", "32", "36"];
private function onCreationComplete():void {
this.alpha = normalAlpha;
this.addEventListener(MouseEvent.ROLL_OVER, makeFocused);
this.addEventListener(MouseEvent.ROLL_OUT, makeDim);
/* WARNING: enabling the following code caused some nasty issues with the whiteboard
It is kept here for reference
*/
/*this.textColor = ctextpik.selectedColor = 0x000000;
this.bgColor = cbackpik.selectedColor = 0x000000;
this.backgroundVisible = btnToggleBackground.selected = false;
this.textSizeMenu.label = "14";
this.textSize = Number(textSizeMenu.label);*/
}
/* Following two methods are used for aesthetics when mouse hovers over TextToolbar and when it hovers out of it */
private function makeDim(event:MouseEvent):void {
this.alpha = normalAlpha;
}
private function makeFocused(event:MouseEvent):void {
this.alpha = focusedAlpha;
}
private function onFontSizeChange():void {
setTextSize(Number(textSizeMenu.selectedItem));
}
@ -125,12 +97,19 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function disableTextToolbar(e:Event=null):void{
this.visible = false;
closeMenus()
}
private function closeToolbar(e:StopWhiteboardModuleEvent):void{
closeMenus();
parent.removeChild(this);
}
private function closeMenus() : void {
ctextpik.close();
textSizeMenu.close();
}
public function syncPropsWith(tobj:TextObject):void {
currentlySelectedTextObject = tobj;
@ -172,6 +151,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
public function adjustForZoom(x:Number, y:Number):void {
repositionToolbar();
}
]]>
</fx:Script>