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

Merge branch 'bbb-2x-mconf' into fix-breakout-room-messaging

Browse Source
This commit is contained in:
Richard Alam 2017-07-26 07:58:02 -07:00
commit fe7bd03297
6 changed files with 29 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1141,7 +1141,6 @@ users|StatusItemRenderer {
iconModerator : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Moderator");
iconModeratorOnly : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_ListenOnly");
iconMoodRaiseHand : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_RaiseHand");
iconMood : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Happy");
iconMoodHappy : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Happy");
iconMoodNeutral : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Neutral");
iconMoodSad : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Sad");
@ -1206,19 +1205,14 @@ users|EmojiGrid {
users|MoodMenu {
iconMoodRaiseHand : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_RaiseHand");
iconMoodApplause : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Applause");
iconMoodAgree : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_ThumbsUp");
iconMoodDisagree : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_ThumbsDown");
/* FIXME - start*/
iconMoodSpeakFaster : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
iconMoodSpeakSlower : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
iconMoodSpeakLouder : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Speak_Louder");
iconMoodSpeakSofter : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
/* FIXME - end */
iconMoodBeRightBack : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
iconMoodThumbsUp : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_ThumbsUp");
iconMoodThumbsDown : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_ThumbsDown");
iconMoodAway : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
iconMoodHappy : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Happy");
iconMoodClear : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Clear");
iconMoodNeutral : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Neutral");
iconMoodSad : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Neutral");
iconMoodNeutral : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Sad");
iconMoodConfused : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Confused");
iconMoodNone : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_None");
}
/*

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.

32
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -180,15 +180,18 @@ bbb.users.usersGrid.statusItemRenderer.presenter = Presenter
bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
bbb.users.usersGrid.statusItemRenderer.voiceOnlyUser = Voice Only
bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
bbb.users.usersGrid.statusItemRenderer.agree = Agree
bbb.users.usersGrid.statusItemRenderer.disagree = Disagree
bbb.users.usersGrid.statusItemRenderer.applause = Applause
bbb.users.usersGrid.statusItemRenderer.thumbsUp = Thumbs up
bbb.users.usersGrid.statusItemRenderer.thumbsDown = Thubms down
bbb.users.usersGrid.statusItemRenderer.speakLouder = Speak louder
bbb.users.usersGrid.statusItemRenderer.speakSofter = Speak softer
bbb.users.usersGrid.statusItemRenderer.speakFaster = Speak faster
bbb.users.usersGrid.statusItemRenderer.speakSlower = Speak slower
bbb.users.usersGrid.statusItemRenderer.beRightBack = Be Right Back
bbb.users.usersGrid.statusItemRenderer.laughter = :)
bbb.users.usersGrid.statusItemRenderer.sad = :(
bbb.users.usersGrid.statusItemRenderer.away = Away
bbb.users.usersGrid.statusItemRenderer.confused = Confused
bbb.users.usersGrid.statusItemRenderer.neutral = Neutral
bbb.users.usersGrid.statusItemRenderer.happy = Happy
bbb.users.usersGrid.statusItemRenderer.sad = Sad
bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
@ -209,21 +212,18 @@ bbb.users.usersGrid.mediaItemRenderer.noAudio = Not in audio conference
bbb.users.usersGrid.mediaItemRenderer.promoteUser = Promote {0} to moderator
bbb.users.usersGrid.mediaItemRenderer.demoteUser = Demote {0} to viewer
bbb.users.emojiStatus.clear = Clear
bbb.users.emojiStatus.clear.toolTip = Clear status
bbb.users.emojiStatus.close = Close
bbb.users.emojiStatus.close.toolTip = Close status popup
bbb.users.emojiStatus.raiseHand = Raise hand
bbb.users.emojiStatus.happy = :)
bbb.users.emojiStatus.smile = Smile status
bbb.users.emojiStatus.sad = :(
bbb.users.emojiStatus.confused = Confused status
bbb.users.emojiStatus.neutral = Neutral status
bbb.users.emojiStatus.away = Away status
bbb.users.emojiStatus.thumbsUp = Thumbs Up status
bbb.users.emojiStatus.thumbsDown = Thumbs Down status
bbb.users.emojiStatus.happy = Happy
bbb.users.emojiStatus.neutral = Neutral
bbb.users.emojiStatus.sad = Sad
bbb.users.emojiStatus.confused = Confused
bbb.users.emojiStatus.away = Away
bbb.users.emojiStatus.thumbsUp = Thumbs Up
bbb.users.emojiStatus.thumbsDown = Thumbs Down
bbb.users.emojiStatus.applause = Applause
bbb.users.emojiStatus.agree = I agree
bbb.users.emojiStatus.disagree = I disagree
bbb.users.emojiStatus.none = Clear
bbb.users.emojiStatus.speakLouder = Could you please speak louder?
bbb.users.emojiStatus.speakSofter = Could you please speak softer?
bbb.users.emojiStatus.speakFaster = Could you please speak faster?

126
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
View File

@ -1,126 +0,0 @@
/**
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
*
* Copyright (c) 2015 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.modules.users.views {
import com.asfusion.mate.events.Dispatcher;
import flash.events.MouseEvent;
import mx.containers.HBox;
import mx.containers.VBox;
import mx.controls.Button;
import mx.controls.Label;
import mx.core.ScrollPolicy;
import mx.events.FlexMouseEvent;
import org.bigbluebutton.core.PopUpUtil;
import org.bigbluebutton.core.model.LiveMeeting;
import org.bigbluebutton.main.model.users.events.EmojiStatusEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
// This class is likely to be removed for V2, We need to move the tooltips to MoodeMenu
public class EmojiGrid extends VBox {
private const EMOJIS:Array = ["raiseHand", "happy", "neutral", "sad", "confused", "away", "thumbsUp", "thumbsDown", "applause"];
private var dispatcher:Dispatcher;
private var images:Images;
public function EmojiGrid() {
dispatcher = new Dispatcher();
images = new Images();
addEventListener(FlexMouseEvent.MOUSE_DOWN_OUTSIDE, mouseDownOutsideHandler, false, 0, true);
this.horizontalScrollPolicy = ScrollPolicy.OFF;
this.verticalScrollPolicy = ScrollPolicy.OFF;
drawEmoji();
addRemoveEmoji();
this.setStyle("paddingBottom", 10);
}
private function drawEmoji():void {
var box:VBox = new VBox();
box.styleName = "emojiGridTile";
box.horizontalScrollPolicy = ScrollPolicy.OFF;
this.verticalScrollPolicy = ScrollPolicy.OFF;
for each (var emoji:String in EMOJIS) {
var button:Button = new Button();
button.id = "btn" + emoji;
button.width = 24;
button.height = 24;
button.toggle = true;
button.setStyle("icon", images["emoji_" + emoji]);
button.selected = (LiveMeeting.inst().me.emoji == emoji);
button.toggle = button.selected;
button.toolTip = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.' + emoji);
button.addEventListener(MouseEvent.CLICK, buttonMouseEventHandler);
var label:Label = new Label();
label.text = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.' + emoji);
var hbox:HBox = new HBox();
hbox.setStyle("verticalAlign", "middle");
hbox.addChild(button);
hbox.addChild(label);
box.addChild(hbox);
}
this.addChild(box);
}
private function addRemoveEmoji():void {
var button:Button = new Button();
button.id = "btnnone";
button.height = 24;
if (LiveMeeting.inst().me.emoji != "none") {
button.label = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.clear');
button.toolTip = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.clear.toolTip');
button.accessibilityName = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.clear.toolTip');
} else {
button.label = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.close');
button.toolTip = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.close.toolTip');
button.accessibilityName = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.close.toolTip');
}
button.addEventListener(MouseEvent.CLICK, buttonMouseEventHandler);
this.addChild(button);
}
protected function buttonMouseEventHandler(event:MouseEvent):void {
var clickedButton:Button = event.target as Button;
if (!clickedButton.toggle) {
var emoji:String = String(event.target.id).replace("btn", "");
var e:EmojiStatusEvent = new EmojiStatusEvent(EmojiStatusEvent.EMOJI_STATUS, emoji);
dispatcher.dispatchEvent(e);
} else {
dispatcher.dispatchEvent(new EmojiStatusEvent(EmojiStatusEvent.EMOJI_STATUS, "none"));
}
hide();
}
protected function mouseDownOutsideHandler(event:FlexMouseEvent):void {
hide();
}
/**
* Hides the menu
*/
public function hide():void {
PopUpUtil.removePopUp(this);
}
}
}

31
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MoodMenu.as
View File

@ -19,7 +19,7 @@
package org.bigbluebutton.modules.users.views {
import com.asfusion.mate.events.Dispatcher;
import mx.collections.ArrayCollection;
import mx.containers.VBox;
import mx.controls.Button;
@ -28,29 +28,15 @@ package org.bigbluebutton.modules.users.views {
import mx.events.FlexMouseEvent;
import mx.events.MenuEvent;
import mx.managers.PopUpManager;
import org.as3commons.lang.StringUtils;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.main.model.users.events.EmojiStatusEvent;
import org.bigbluebutton.main.views.WellPositionedMenu;
import org.bigbluebutton.util.i18n.ResourceUtil;
import org.bigbluebutton.util.i18n.ResourceUtil;
public class MoodMenu extends VBox {
private const MOODS:Array = [
"raiseHand",
"applause",
"agree",
"disagree",
"speakFaster",
"speakSlower",
"speakLouder",
"speakSofter",
"beRightBack",
"happy",
"sad",
"confused",
"neutral",
"clear"];
private const MOODS:Array = ["raiseHand", "happy", "neutral", "sad", "confused", "away", "thumbsUp", "thumbsDown", "applause", "none"];
private var dispatcher:Dispatcher;
@ -79,14 +65,11 @@ package org.bigbluebutton.modules.users.views {
private function drawMoodMenu():void {
var moods:ArrayCollection = new ArrayCollection();
for each (var mood:String in MOODS) {
if (mood == "clear" && UsersUtil.myEmoji() == "none") {
if (mood == "none" && UsersUtil.myEmoji() == "none") {
continue;
}
var item:Object = {
label: ResourceUtil.getInstance().getString('bbb.users.emojiStatus.' + mood),
icon: getStyle("iconMood" + StringUtils.capitalize(mood))
};
var item:Object = {label: ResourceUtil.getInstance().getString('bbb.users.emojiStatus.' + mood), icon: getStyle("iconMood" + StringUtils.capitalize(mood))};
moods.addItem(item);
}
@ -96,7 +79,7 @@ package org.bigbluebutton.modules.users.views {
protected function buttonMouseEventHandler(event:MenuEvent):void {
var mood:String = MOODS[event.index];
if (mood == "clear") {
if (mood == "none") {
dispatcher.dispatchEvent(new EmojiStatusEvent(EmojiStatusEvent.EMOJI_STATUS, "none"));
} else {
var e:EmojiStatusEvent = new EmojiStatusEvent(EmojiStatusEvent.EMOJI_STATUS, mood);