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

Add icons to users settings menu and imporve BreakoutRoomSettings window layout.

Browse Source
This commit is contained in:
Ghazi Triki 2017-08-02 13:45:34 +01:00
parent 961b417e65
commit dd9b71717a
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,6 +395,10 @@ mx|Button {
//------------------------------
*/
users|BreakoutRoomSettings {
headerHeight : 0;
}
users|RoomActionsRenderer {
paddingLeft : 5;
paddingRight : 5;
@ -1124,11 +1128,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 {

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.

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

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

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

@ -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});
}