diff --git a/bigbluebutton-client/branding/default/style/css/V2Theme.css b/bigbluebutton-client/branding/default/style/css/V2Theme.css index 46b59202c8..00c13af26d 100644 --- a/bigbluebutton-client/branding/default/style/css/V2Theme.css +++ b/bigbluebutton-client/branding/default/style/css/V2Theme.css @@ -1,5 +1,6 @@ @namespace mx "library://ns.adobe.com/flex/mx"; @namespace flexlib "http://code.google.com/p/flexlib/"; +@namespace flexlibcontainers "flexlib.mdi.containers.*"; @namespace users "org.bigbluebutton.modules.users.views.*"; @namespace poll "org.bigbluebutton.modules.polling.views.*"; @namespace whiteboard "org.bigbluebutton.modules.whiteboard.views.*"; @@ -42,8 +43,8 @@ global { selectionColor : #1070D7; textSelectedColor : #FFFFFF; focusColor : #1070D7; - rollOverColor : #DBE4ED; - textRollOverColor : #1070D7; + rollOverColor : #0A5EAC; + textRollOverColor : #FFFFFF; } .defaultShellStyle { @@ -394,6 +395,10 @@ mx|Button { //------------------------------ */ +users|BreakoutRoomSettings { + headerHeight : 0; +} + users|RoomActionsRenderer { paddingLeft : 5; paddingRight : 5; @@ -708,7 +713,7 @@ flexlib|MDIWindow { /*None of the following properties are overridden by the MDIWindow class*/ backgroundSize : "100%"; - headerHeight : 40; + headerHeight : 30; cornerRadius : 4; dropShadowEnabled : false; @@ -734,6 +739,11 @@ flexlib|MDIWindow { showHeaderSeparator : true; } +flexlibcontainers|MDIWindowControlsContainer { + paddingRight : 12; + horizontalGap : 12; +} + .mdiMaximizeButtonStyle { upSkin : Embed(source="assets/swf/v2_skin.swf", symbol="MDI_Button_Maximize_Up"); overSkin : Embed(source="assets/swf/v2_skin.swf", symbol="MDI_Button_Maximize_Over"); @@ -867,7 +877,8 @@ mx|Panel { */ presentation|UploadedPresentationRenderer { - iconSave : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Save_Disabled"); + iconSave : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Save_File"); + iconSaveWhite : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Save_File_White"); } .presentationWindowControlsStyle { @@ -943,19 +954,31 @@ presentation|UploadedPresentationRenderer { color : #2A2D33; } -presentation|FileUploadWindow { - iconGo : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Go"); - titleStyleName : "presentationFileUploadWindowTitleStyle"; +.uploadFileButton { + fillColorUp : #1070D7; + fillColorOver : #0A5EAC; + fillColorDown : #1070D7; + fillColorDisabled : #F0F2F6; + color : #FFFFFF; + textRollOverColor : #FFFFFF; + textSelectedColor : #FFFFFF; + borderStyle : none; + borderThickness : 0; } -.presentationFileUploadWindowTitleStyle, .presentationUploadTitleStyle { - fontSize : 18; - fontWeight : bold; +.uploadFileButton { + icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Go"); + disabledIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Go_Disabled"); } -.presentationNamesLabelStyle { - fontSize : 14; - fontWeight : bold; +.presentationNameLabelOver { + color : #FFFFFF; + fontSize : 14; +} + +.presentationNameLabelUp { + color : #05172A; + fontSize : 14; } .presentationUploadChooseFileButtonStyle { @@ -966,6 +989,15 @@ presentation|FileUploadWindow { color : #2A2D33; } + +.presentationDownloadShowButtonStyle { + /* Normal state */ + borderStyle : none; + borderThickness : 0; + color : #1070D7; + textDecoration : underline; +} + .presentationUploadFileFormatHintBoxStyle, .audioBroswerHintBoxStyle { backgroundColor : #CDD4DB; dropShadowEnabled : false; @@ -1087,9 +1119,9 @@ mx|TitleWindow { } .titleWindowStyle { - color : #05172A; - fontSize : 24; - textAlign :center; + color : #05172A; + fontSize : 24; + textAlign : center; } /* @@ -1118,11 +1150,13 @@ mx|ToolTip { */ users|UsersWindow { - iconAudioMuted : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Audio_Muted"); - iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Audio"); - iconLock : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Lock"); - iconMood : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Happy"); - iconSettings : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Settings"); + iconAudioMuted : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Audio_Muted"); + iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Audio"); + iconLock : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Lock"); + iconMood : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Happy"); + iconSettings : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Settings"); + iconClearStatus : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_ClearStatus"); + iconRooms : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Rooms"); } users|StatusItemRenderer { diff --git a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla index 6351acab20..af0a0501e9 100644 Binary files a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla and b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla differ diff --git a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf index 927b376e7b..83047fdcba 100644 Binary files a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf and b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf differ diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/events/PresentationRollEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/events/PresentationRollEvent.as new file mode 100644 index 0000000000..cdd6fa6dea --- /dev/null +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/events/PresentationRollEvent.as @@ -0,0 +1,37 @@ +/** + * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ + * + * Copyright (c) 2010 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 2.1 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 . + * + */ +package org.bigbluebutton.modules.present.events { + import flash.events.Event; + + public class PresentationRollEvent extends Event { + public static const PRESENTATION_ROLL_OVER:String = "PresentationRollOver"; + + public static const PRESENTATION_ROLL_OUT:String = "PresentationRollOut"; + + public static const PRESENTATION_SELECT:String = "PresentationSelect"; + + public var presentationId:String; + + public function PresentationRollEvent(type:String, p:String) { + super(type, true, false); + + presentationId = p; + } + } +} diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/DownloadPresentationRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/DownloadPresentationRenderer.mxml index 2dc79dadce..3258138cc6 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/DownloadPresentationRenderer.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/DownloadPresentationRenderer.mxml @@ -1,30 +1,33 @@ - - - + + - - - + private function downloadPresentation():void { + var downloadEvent:DownloadEvent = new DownloadEvent(DownloadEvent.DOWNLOAD_PRESENTATION); + downloadEvent.fileNameToDownload = data.id as String; + globalDispatch.dispatchEvent(downloadEvent); + } + ]]> + + + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileDownloadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileDownloadWindow.mxml index 262e1a18ad..f11c37e135 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileDownloadWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileDownloadWindow.mxml @@ -21,64 +21,59 @@ with BigBlueButton; if not, see . --> + xmlns:fx="http://ns.adobe.com/mxml/2009" + xmlns:mate="http://mate.asfusion.com/" + layout="absolute" + width="580" + height="410" + showCloseButton="true" + close="{globalDispatch.dispatchEvent(new DownloadEvent(DownloadEvent.CLOSE_DOWNLOAD_WINDOW))}" + initialize="initData();"> - + - - + + override public function move(x:Number, y:Number):void { + return; + } - + private function initData():void { + downloadablePresentations = PresentationModel.getInstance().getDownloadablePresentations(); + } + ]]> - - - - - - - - - - + + + + + + + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml index ad6f426e34..29063cf159 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml @@ -54,8 +54,10 @@ with BigBlueButton; if not, see . . import org.bigbluebutton.modules.present.events.OfficeDocConvertFailedEvent; import org.bigbluebutton.modules.present.events.OfficeDocConvertInvalidEvent; import org.bigbluebutton.modules.present.events.OfficeDocConvertSuccessEvent; + import org.bigbluebutton.modules.present.events.PresentationRollEvent; import org.bigbluebutton.modules.present.events.RemovePresentationEvent; import org.bigbluebutton.modules.present.events.UploadCompletedEvent; import org.bigbluebutton.modules.present.events.UploadEvent; @@ -82,6 +85,7 @@ with BigBlueButton; if not, see . import org.bigbluebutton.modules.present.events.UploadProgressEvent; import org.bigbluebutton.modules.present.events.UploadSecurityErrorEvent; import org.bigbluebutton.modules.present.model.PresentOptions; + import org.bigbluebutton.modules.present.model.Presentation; import org.bigbluebutton.modules.present.model.PresentationModel; import org.bigbluebutton.util.i18n.ResourceUtil; @@ -91,6 +95,8 @@ with BigBlueButton; if not, see . [Bindable] private var presentationNamesAC:ArrayCollection; [BIndable] public var maxFileSize:Number; + + private var dispatcher:Dispatcher; private var thumbnailTimer:Timer = new Timer(5000); private var genThumbText:String = ResourceUtil.getInstance().getString('bbb.fileupload.genThumbText'); @@ -105,6 +111,8 @@ with BigBlueButton; if not, see . protected function onCreationComplete(event:FlexEvent):void { + dispatcher = new Dispatcher(); + this.mx_internal::closeButton.toolTip = ResourceUtil.getInstance().getString('bbb.fileupload.okCancelBtn.toolTip'); } @@ -319,6 +327,28 @@ with BigBlueButton; if not, see . } } + private function onItemRollOver(event:ListEvent):void { + var item:IListItemRenderer = event.itemRenderer; + var presentation:Presentation = item.data as Presentation; + var rollEvent:PresentationRollEvent = new PresentationRollEvent(PresentationRollEvent.PRESENTATION_ROLL_OVER, presentation.id); + dispatcher.dispatchEvent(rollEvent); + } + + private function onItemRollOut(event:ListEvent):void { + var item:IListItemRenderer = event.itemRenderer; + var presentation:Presentation = item.data as Presentation; + var rollEvent:PresentationRollEvent = new PresentationRollEvent(PresentationRollEvent.PRESENTATION_ROLL_OUT, presentation.id); + dispatcher.dispatchEvent(rollEvent); + } + + protected function onItemClick(event:ListEvent):void + { + var item:IListItemRenderer = event.itemRenderer; + var presentation:Presentation = item.data as Presentation; + var rollEvent:PresentationRollEvent = new PresentationRollEvent(PresentationRollEvent.PRESENTATION_SELECT, presentation.id); + dispatcher.dispatchEvent(rollEvent); + } + ]]> @@ -326,34 +356,37 @@ with BigBlueButton; if not, see . - + + + + + + - + enabled="false"/> - + - - - - - + - diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml index c10a183eae..543cc21c44 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml @@ -1,53 +1,104 @@ - - - + + + + + + + + + + + + - var rEvent:RemovePresentationEvent = new RemovePresentationEvent(RemovePresentationEvent.REMOVE_PRESENTATION_EVENT); - rEvent.presentationName = data.id as String; - dispatchEvent(rEvent); - } - ]]> - - - - - - diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as index 7754b39ee6..6b4791bf60 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as @@ -22,7 +22,8 @@ package org.bigbluebutton.modules.sharednotes.maps import com.asfusion.mate.events.Dispatcher; import mx.binding.utils.BindingUtils; - import mx.utils.ObjectUtil; + import mx.utils.ObjectUtil; + import org.as3commons.logging.api.ILogger; import org.as3commons.logging.api.getClassLogger; import org.bigbluebutton.common.events.CloseWindowEvent; @@ -64,7 +65,7 @@ package org.bigbluebutton.modules.sharednotes.maps } private function openAdditionalNotesSet(numAdditionalSharedNotes:Number):void { - var extraNotes = numAdditionalSharedNotes - numExistentsAdditionalNotes(); + var extraNotes : Number = numAdditionalSharedNotes - numExistentsAdditionalNotes(); if (extraNotes > 0) { var e:SharedNotesEvent = new SharedNotesEvent(SharedNotesEvent.REQUEST_ADDITIONAL_NOTES_SET_EVENT); e.payload.numAdditionalSharedNotes = extraNotes; diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml index 4a6c5019bb..76271b5982 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml @@ -25,7 +25,7 @@ with BigBlueButton; if not, see . xmlns:mx="library://ns.adobe.com/flex/mx" xmlns:mate="http://mate.asfusion.com/" xmlns:common="org.bigbluebutton.common.*" - width="630" height="650" + width="630" height="630" close="onCloseClicked()" visible="false" showCloseButton="false"> @@ -276,8 +276,7 @@ with BigBlueButton; if not, see . - + styleName="titleWindowStyle"/> diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml index 881665bc2c..114f612929 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml @@ -344,37 +344,48 @@ } ]]> + + + + - - - - - - + + + + + + + + + + visible="false" + width="20" + height="20" + click="openSettings()" + icon="{getStyle('iconSettings')}" + toolTip="{ResourceUtil.getInstance().getString('bbb.users.settings.buttonTooltip')}"/> - - - + + + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml index 0dc0aa3f4e..67af52f13c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml @@ -190,24 +190,33 @@ dispatchEvent(e); } } - - private function emojiBtnClicked() : void { + + private function emojiBtnClicked():void { if (data.hasEmojiStatus) { dispatchEvent(new EmojiStatusEvent(EmojiStatusEvent.EMOJI_STATUS, "none", data.userId)); - } + } } - + // Need to refresh the roleBtn toolTip text on locale change private function localeChanged(e:Event):void { updateButtons(); } ]]> - - - - + + + + + + + + + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml index afa6a4fd4e..5f22635769 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml @@ -387,7 +387,7 @@ $Id: $ private function openSettings():void { paramsMenuData = []; - paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.clearAllStatus'), handler: resetEmojiStatuses}); + paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.clearAllStatus'), icon: getStyle('iconClearStatus'), handler: resetEmojiStatuses}); if (!roomMuted) { paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.muteAll'), icon: getStyle('iconAudioMuted'), handler: muteAll}); @@ -400,7 +400,7 @@ $Id: $ paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.lockSettings'), icon: getStyle('iconLock'), handler: lockSettings}); if (breakoutOptions.enabled && amIModerator && !UsersUtil.isBreakout()) { if (breakoutRoomsList.length == 0) { - paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.breakoutRooms'), handler: breakoutRooms}); + paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.breakoutRooms'), icon: getStyle('iconRooms'), handler: breakoutRooms}); } else { paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.sendBreakoutRoomsInvitations'), handler: sendBreakoutRoomsInvitations}); }