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

Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Markos Calderon 2013-03-08 17:05:01 -05:00
commit 86970340d8
3 changed files with 142 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
bigbluebutton-client/branding/default/style/css/BBBDefault.css
View File

@ -395,70 +395,54 @@ DataGrid {
icon: Embed('assets/images/questionmark.png'); icon: Embed('assets/images/questionmark.png');
} }
MDIWindow { MDIWindow { /*None of the following properties are overridden by the MDIWindow class*/
backgroundSize: '100%';
cornerRadius: 5;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
cornerResizeWidth: 2;
cornerResizeHeight: 2;
cornerResizePaddingRight: 2;
cornerResizePaddingBottom: 2;
controlButtonWidth: 10;
controlButtonHeight: 10;
controlButtonGap: 4;
} }
.mdiWindowFocus, .presentationWindowStyleFocus, .videoDockStyleFocus .mdiWindowFocus, .presentationWindowStyleFocus, .videoDockStyleFocus
{ {
headerHeight: 26; headerHeight: 26;
roundedBottomCorners: true; roundedBottomCorners: true;
backgroundAlpha: 1;
backgroundColor: #b9babc; backgroundColor: #b9babc;
backgroundSize: '100%'; backgroundAlpha: 1;
borderStyle: solid; borderStyle: solid;
borderColor: #b9babc; borderColor: #b9babc;
borderAlpha: 1; borderAlpha: 1;
borderThickness: 1; borderThicknessLeft: 3;
borderThicknessLeft: 1; borderThicknessTop: 0;
borderThicknessTop: 1; borderThicknessBottom: 3;
borderThicknessBottom: 1; borderThicknessRight: 3;
borderThicknessRight: 1;
cornerRadius: 0;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
cornerResizeWidth: 2;
cornerResizeHeight: 2;
cornerResizePaddingRight: 2;
cornerResizePaddingBottom: 2;
controlButtonWidth: 10;
controlButtonHeight: 10;
controlButtonGap: 4;
} }
.mdiWindowNoFocus, .presentationWindowStyleNoFocus, .videoDockStyleNoFocus .mdiWindowNoFocus, .presentationWindowStyleNoFocus, .videoDockStyleNoFocus
{ {
headerHeight: 26; headerHeight: 26;
roundedBottomCorners: false; roundedBottomCorners: true;
backgroundAlpha: 0.5;
backgroundColor: #b9babc; backgroundColor: #b9babc;
backgroundSize: '100%'; backgroundAlpha: 0.5;
borderStyle: solid; borderStyle: solid;
borderColor: #b9babc; borderColor: #b9babc;
borderAlpha: 0.5; borderAlpha: 0.5;
borderThickness: 1; borderThicknessLeft: 3;
borderThicknessLeft: 1; borderThicknessTop: 0;
borderThicknessTop: 1; borderThicknessBottom: 3;
borderThicknessBottom: 1; borderThicknessRight: 3;
borderThicknessRight: 1;
cornerRadius: 0;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
cornerResizeWidth: 2;
cornerResizeHeight: 2;
cornerResizePaddingRight: 2;
cornerResizePaddingBottom: 2;
controlButtonWidth: 10;
controlButtonHeight: 10;
controlButtonGap: 4;
} }
.presentationSlideViewStyle { .presentationSlideViewStyle {
@ -477,110 +461,105 @@ MDIWindow {
.videoViewStyleNoFocus .videoViewStyleNoFocus
{ {
headerHeight: 20;
roundedBottomCorners: true;
backgroundColor: #e6e6e6;
backgroundAlpha: 0.5;
borderStyle: solid;
borderColor: #b9babc; borderColor: #b9babc;
borderAlpha: 0.5; borderAlpha: 0.5;
borderThicknessLeft: 5; borderThicknessLeft: 3;
borderThicknessTop: 5; borderThicknessTop: 0;
borderThicknessBottom: 5; borderThicknessBottom: 3;
borderThicknessRight: 5; borderThicknessRight: 3;
roundedBottomCorners: true;
cornerRadius: 5;
headerHeight: 20;
backgroundColor: #b9babc;
backgroundAlpha: 0.5;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
} }
.videoViewStyleFocus .videoViewStyleFocus
{ {
headerHeight: 20;
roundedBottomCorners: true;
backgroundColor: #e6e6e6;
backgroundAlpha: 1;
borderStyle: solid;
borderColor: #b9babc; borderColor: #b9babc;
borderAlpha: 1; borderAlpha: 1;
borderThicknessLeft: 5; borderThicknessLeft: 3;
borderThicknessTop: 5; borderThicknessTop: 0;
borderThicknessBottom: 5; borderThicknessBottom: 3;
borderThicknessRight: 5; borderThicknessRight: 3;
roundedBottomCorners: true;
cornerRadius: 5;
headerHeight: 20;
backgroundColor: #b9babc;
backgroundAlpha: 1;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
} }
.videoPublishStyleNoFocus .videoPublishStyleNoFocus
{ {
borderColor: #b9babc; headerHeight: 20;
borderAlpha: 0.5; roundedBottomCorners: true;
borderThicknessLeft: 5; backgroundColor: #e6e6e6;
borderThicknessTop: 5; backgroundAlpha: 0.5;
borderThicknessBottom: 5;
borderThicknessRight: 5; borderStyle: solid;
roundedBottomCorners: true; borderColor: #b9babc;
cornerRadius: 5; borderAlpha: 0.5;
headerHeight: 20; borderThicknessLeft: 3;
backgroundColor: #b9babc; borderThicknessTop: 0;
backgroundAlpha: 0.5; borderThicknessBottom: 3;
dropShadowEnabled: false; borderThicknessRight: 3;
titleStyleName: "mypanelTitle";
} }
.videoPublishStyleFocus .videoPublishStyleFocus
{ {
borderColor: #b9babc; headerHeight: 20;
borderAlpha: 1; roundedBottomCorners: true;
borderThicknessLeft: 5; backgroundColor: #e6e6e6;
borderThicknessTop: 5; backgroundAlpha: 1;
borderThicknessBottom: 5;
borderThicknessRight: 5; borderStyle: solid;
roundedBottomCorners: true; borderColor: #b9babc;
cornerRadius: 5; borderAlpha: 1;
headerHeight: 20; borderThicknessLeft: 3;
backgroundColor: #b9babc; borderThicknessTop: 0;
backgroundAlpha: 1; borderThicknessBottom: 3;
dropShadowEnabled: false; borderThicknessRight: 3;
titleStyleName: "mypanelTitle";
} }
.videoAvatarStyleNoFocus .videoAvatarStyleNoFocus
{ {
borderColor: #b9babc; headerHeight: 20;
borderAlpha: 0.5; roundedBottomCorners: true;
borderThicknessLeft: 5; backgroundColor: #e6e6e6;
borderThicknessTop: 5; backgroundAlpha: 0.5;
borderThicknessBottom: 5;
borderThicknessRight: 5; borderStyle: solid;
roundedBottomCorners: true; borderColor: #b9babc;
cornerRadius: 5; borderAlpha: 0.5;
headerHeight: 20; borderThicknessLeft: 3;
backgroundColor: #b9babc; borderThicknessTop: 0;
backgroundAlpha: 0.5; borderThicknessBottom: 3;
dropShadowEnabled: false; borderThicknessRight: 3;
titleStyleName: "mypanelTitle";
} }
.videoAvatarStyleFocus .videoAvatarStyleFocus
{ {
borderColor: #b9babc; headerHeight: 20;
borderAlpha: 1; roundedBottomCorners: true;
borderThicknessLeft: 5; backgroundColor: #e6e6e6;
borderThicknessTop: 5; backgroundAlpha: 1;
borderThicknessBottom: 5;
borderThicknessRight: 5; borderStyle: solid;
roundedBottomCorners: true; borderColor: #b9babc;
cornerRadius: 5; borderAlpha: 1;
headerHeight: 20; borderThicknessLeft: 3;
backgroundColor: #b9babc; borderThicknessTop: 0;
backgroundAlpha: 1; borderThicknessBottom: 3;
dropShadowEnabled: false; borderThicknessRight: 3;
titleStyleName: "mypanelTitle";
} }
.mypanelTitle { .mypanelTitle {
color: #5e5f63; color: #5e5f63;
fontFamily: Arial; fontFamily: Arial;
fontSize: 12; fontSize: 12;
fontWeight: bold;
} }
.closeBtnFocus, .closeBtnNoFocus .closeBtnFocus, .closeBtnNoFocus

2
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
View File

@ -587,7 +587,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:Script> </mx:Script>
<mx:HBox width="100%" height="{chatListHeight}" verticalScrollPolicy="off"> <mx:HBox width="100%" height="{chatListHeight}" verticalScrollPolicy="off">
<chat:AdvancedList width="100%" height="{chatListHeight}" id="chatMessagesList" selectable="true" variableRowHeight="true" alternatingItemColors="[#EFEFEF, #FEFEFE]" <chat:AdvancedList width="100%" height="{chatListHeight}" id="chatMessagesList" selectable="false" variableRowHeight="true"
itemRenderer="org.bigbluebutton.modules.chat.views.ChatMessageRenderer" verticalScrollPolicy="auto" wordWrap="true" itemRenderer="org.bigbluebutton.modules.chat.views.ChatMessageRenderer" verticalScrollPolicy="auto" wordWrap="true"
dataProvider="{chatMessages.messages}" dataProvider="{chatMessages.messages}"
tabIndex="{baseIndex}" tabIndex="{baseIndex}"

63
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
View File

@ -21,7 +21,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
--> -->
<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" verticalAlign="top" <mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" verticalAlign="top"
verticalScrollPolicy="off" xmlns:common="org.bigbluebutton.common.*" dataChange="validateNow()" verticalScrollPolicy="off" xmlns:common="org.bigbluebutton.common.*"
creationComplete="onCreationComplete()"> creationComplete="onCreationComplete()">
<mx:Script> <mx:Script>
@ -46,12 +46,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
* do this, we'll get a stale data which will display the chat * do this, we'll get a stale data which will display the chat
* message repeatedly. (ralam Nov 1, 2010) * message repeatedly. (ralam Nov 1, 2010)
*/ */
ChangeWatcher.watch(this, "data", dataChangeHandler); //ChangeWatcher.watch(this, "data", dataChangeHandler);
if (data != null) { //dataChangeHandler(); // call to intialize
chatMsg = data as ChatMessage;
data = null;
chatMsg.translateMessage();
}
/** /**
* The next line will refresh the display so that chat history don't show up as * The next line will refresh the display so that chat history don't show up as
@ -62,13 +58,42 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
validateNow(); validateNow();
} }
private function dataChangeHandler(e:Event = null):void{ //private function dataChangeHandler(e:Event = null):void{
if (data == null) { override public function set data(value:Object):void {
return; //if (data == null) {
} // return;
chatMsg = data as ChatMessage; //}
data = null; super.data = value;
chatMsg.translateMessage();
//chatMsg = data as ChatMessage;
//data = null;
if (data == null) return;
data.translateMessage();
/*
This is setting the backgroundColor style. It changes the value correct and the if
statement works, but the style never takes effect. I have no idea what's wrong.
Chad
*/
//LogUtil.debug ("senderId: " + data.senderId);
//LogUtil.debug("backColor " + this.getStyle("backgroundColor") + "alpha " + this.getStyle("backgroundAlpha"));
if (data.senderId == " ") {
this.setStyle("backgroundColor", 0xff0000);
} else {
this.setStyle("backgroundColor", 0x00ff00);
}
// The visibility check has to go here becasue ORs don't work with databinding
lblTime.visible = (!(data.lastTime == data.time) || !(data.senderId == data.lastSenderId));
// check the visibility of the name as well because events might fire in different order
lblName.visible = !(data.senderId == data.lastSenderId);
//remove the header if not needed to save space
hbHeader.includeInLayout = hbHeader.visible = lblName.visible || lblTime.visible;
validateNow();
} }
private function onRollOver():void{ private function onRollOver():void{
@ -82,16 +107,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
]]> ]]>
</mx:Script> </mx:Script>
<mx:HBox width="100%"> <mx:HBox width="100%" id="hbHeader">
<mx:Label id="lblName" text="{chatMsg.name} " visible="{!(chatMsg.senderId == chatMsg.lastSenderId)}" color="gray" width="100%" textAlign="left"/> <mx:Label id="lblName" text="{data.name} " visible="true" color="gray" width="100%" textAlign="left"/>
<mx:Spacer width="100%"/> <mx:Spacer width="100%"/>
<mx:Text id="lblTime" htmlText="{chatMsg.translateLocale} {rolledOver ? chatMsg.senderTime : chatMsg.time}" textAlign="right" <mx:Text id="lblTime" htmlText="{data.translateLocale} {rolledOver ? data.senderTime : data.time}" textAlign="right"
visible="{!(chatMsg.lastTime == chatMsg.time) || !(chatMsg.senderId == chatMsg.lastSenderId)}" visible="true"
color="gray" width="100%"/> color="gray" width="100%"/>
</mx:HBox> </mx:HBox>
<mx:HBox width="100%"> <mx:HBox width="100%">
<mx:Spacer width="5"/> <mx:Spacer width="5"/>
<mx:Text id="txtMessage" htmlText="{rolledOver ? chatMsg.senderText : chatMsg.translatedText}" link="onLinkClick(event)" color="{chatMsg.senderColor}" <mx:Text id="txtMessage" htmlText="{rolledOver ? data.senderText : data.translatedText}" link="onLinkClick(event)" color="{data.senderColor}"
rollOver="onRollOver()" rollOut="onRollOut()" width="100%" selectable="true"/> rollOver="onRollOver()" rollOut="onRollOut()" width="100%" selectable="true"/>
</mx:HBox> </mx:HBox>
</mx:VBox> </mx:VBox>