diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index e190ea76da..adb6819091 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -164,7 +164,7 @@ bbb.users.usersGrid.mediaItemRenderer.pushToTalk = Unmute {0} bbb.users.usersGrid.mediaItemRenderer.pushToMute = Mute {0} bbb.users.usersGrid.mediaItemRenderer.pushToLock = Lock {0} bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Unlock {0} -bbb.users.usersGrid.mediaItemRenderer.kickUser = Kick {0} +bbb.users.usersGrid.mediaItemRenderer.kickUser = Kick {0} bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam shared bbb.users.usersGrid.mediaItemRenderer.micOff = Microphone off bbb.users.usersGrid.mediaItemRenderer.micOn = Microphone on @@ -180,12 +180,15 @@ bbb.users.emojiStatus.sad = Sad status 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.applause = Applause status bbb.presentation.title = Presentation bbb.presentation.titleWithPres = Presentation: {0} bbb.presentation.quickLink.label = Presentation Window bbb.presentation.fitToWidth.toolTip = Fit Presentation To Width bbb.presentation.fitToPage.toolTip = Fit Presentation To Page -bbb.presentation.uploadPresBtn.toolTip = Upload Presentation +bbb.presentation.uploadPresBtn.toolTip = Upload Presentation bbb.presentation.backBtn.toolTip = Previous slide bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1} bbb.presentation.btnSlideNum.toolTip = Select a slide @@ -264,7 +267,7 @@ bbb.videodock.title = Webcams bbb.videodock.quickLink.label = Webcams Window bbb.video.minimizeBtn.accessibilityName = Minimize the Webcams Window bbb.video.maximizeRestoreBtn.accessibilityName = Maximize the Webcams Window -bbb.video.controls.muteButton.toolTip = Mute or unmute {0} +bbb.video.controls.muteButton.toolTip = Mute or unmute {0} bbb.video.controls.switchPresenter.toolTip = Make {0} presenter bbb.video.controls.ejectUserBtn.toolTip = Eject {0} from meeting bbb.video.controls.privateChatBtn.toolTip = Chat with {0} @@ -402,9 +405,9 @@ ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size bbb.accessibility.clientReady = Ready -bbb.accessibility.chat.chatBox.reachedFirst = You have reached the first message. -bbb.accessibility.chat.chatBox.reachedLatest = You have reached the latest message. -bbb.accessibility.chat.chatBox.navigatedFirst = You have navigated to the first message. +bbb.accessibility.chat.chatBox.reachedFirst = You have reached the first message. +bbb.accessibility.chat.chatBox.reachedLatest = You have reached the latest message. +bbb.accessibility.chat.chatBox.navigatedFirst = You have navigated to the first message. bbb.accessibility.chat.chatBox.navigatedLatest = You have navigated to the latest message. bbb.accessibility.chat.chatBox.navigatedLatestRead = You have navigated to the most recent message you have read. bbb.accessibility.chat.chatwindow.input = Chat input diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as index eb018fbe28..49360001c7 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as +++ b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as @@ -1,13 +1,13 @@ /** * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -* +* * Copyright (c) 2012 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. @@ -24,305 +24,314 @@ package org.bigbluebutton.common [Embed(source="assets/images/page_link.png")] public var page_link:Class; - + [Embed(source="assets/images/users_settings.png")] public var users_settings:Class; - + [Embed(source="assets/images/eject_user.png")] public var eject_user_new:Class; - + [Embed(source="assets/images/audio_muted.png")] public var audio_muted:Class; - + [Embed(source="assets/images/audio.png")] public var audio:Class; - + [Embed(source="assets/images/audio_muted_20.png")] public var audio_muted_20:Class; - + [Embed(source="assets/images/audio_20.png")] public var audio_20:Class; - + [Embed(source="assets/images/webcam_new.png")] public var webcam_new:Class; - + [Embed(source="assets/images/webcam_new_20.png")] public var webcam_new_20:Class; - + [Embed(source="assets/images/sound_new.png")] public var sound_new:Class; - + [Embed(source="assets/images/moderator.png")] public var moderator:Class; - + [Embed(source="assets/images/presenter_new.png")] public var presenter_new:Class; - + [Embed(source="assets/images/webcam_kickuser.png")] public var webcam_kickuser:Class; - + [Embed(source="assets/images/webcam_make_presenter.png")] public var webcam_make_presenter:Class; - + [Embed(source="assets/images/webcam_mute.png")] public var webcam_mute:Class; - + [Embed(source="assets/images/webcam_private_chat.png")] public var webcam_private_chat:Class; - + [Embed(source="assets/images/webcam_unmute.png")] public var webcam_unmute:Class; - + [Embed(source="assets/images/vdoc_bg.jpg")] public var video_dock_bg:Class; - + [Embed(source="assets/images/bandwidth.png")] public var bandwidth:Class; - + [Embed(source="assets/images/statistics.png")] public var stats:Class; - + [Embed(source="assets/images/avatar.png")] public var avatar:Class; - + [Embed(source="assets/images/sign-out.png")] public var signOutIcon:Class; - + [Embed(source="assets/images/chat.png")] public var chatIcon:Class; - + [Embed(source="assets/images/webcam_close.png")] public var webcamClose:Class; - + [Embed(source="assets/images/deskshare_close.png")] public var deskshareClose:Class; - + [Embed(source="assets/images/fit-to-page.png")] public var fitToPage:Class; - + [Embed(source="assets/images/fit-to-width.png")] public var fitToWidth:Class; - + [Embed(source="assets/images/green-circle.png")] public var greenCircle:Class; - + [Embed(source="assets/images/blank-circle.png")] public var blankCircle:Class; - + [Embed(source="assets/images/red-circle.png")] public var redCircle:Class; - + [Embed(source="assets/images/user_gray.png")] - public var user_gray:Class; - + public var user_gray:Class; + [Embed(source="assets/images/user_green.png")] public var user_green:Class; - + [Embed(source="assets/images/Cursor.png")] public var cursorIcon:Class; - + [Embed(source="assets/images/magnifier_reset.png")] public var mag_reset:Class; - + [Embed(source="assets/images/user_orange.png")] public var user_orange:Class; - + [Embed(source="assets/images/user_red.png")] public var user_red:Class; [Embed(source="assets/images/user.png")] - public var user:Class; - + public var user:Class; + [Embed(source="assets/images/administrator.gif")] public var admin:Class; - + [Embed(source="assets/images/participant.gif")] public var participant:Class; - + [Embed(source="assets/images/participant-mute.png")] public var participant_mute:Class; - + [Embed(source="assets/images/mic_muted.png")] public var sound_mute:Class; - + [Embed(source="assets/images/mic_unmuted.png")] public var sound_none:Class; - + [Embed(source="assets/images/sound.png")] - public var sound:Class; + public var sound:Class; [Embed(source="assets/images/cancel.png")] - public var cancel:Class; + public var cancel:Class; [Embed(source="assets/images/user_go.png")] - public var eject_user:Class; + public var eject_user:Class; [Embed(source="assets/images/webcam.png")] - public var webcam:Class; - + public var webcam:Class; + [Embed(source="assets/images/webcam_on.png")] - public var webcamOn:Class; + public var webcamOn:Class; [Embed(source="assets/images/pencil.png")] - public var pencil_icon:Class; - + public var pencil_icon:Class; + [Embed(source="assets/images/shape_square.png")] - public var square_icon:Class; - - [Embed(source="assets/images/undo.png")] - public var undo_icon:Class; - + public var square_icon:Class; + + [Embed(source="assets/images/undo.png")] + public var undo_icon:Class; + [Embed(source="assets/images/hand.png")] - public var hand_icon:Class; - + public var hand_icon:Class; + [Embed(source="assets/images/marker.png")] - public var scribble_icon:Class; + public var scribble_icon:Class; [Embed(source="assets/images/text.png")] - public var text_icon:Class; - + public var text_icon:Class; + [Embed(source="assets/images/ellipse.png")] - public var circle_icon:Class; - + public var circle_icon:Class; + [Embed(source="assets/images/arrow_out.png")] - public var full_screen:Class; - + public var full_screen:Class; + [Embed(source="assets/images/BBBlogo.png")] - public var bbb_logo:Class; - + public var bbb_logo:Class; + [Embed(source="assets/images/deskshare_icon.png")] - public var deskShareIcon:Class; - + public var deskShareIcon:Class; + [Embed(source="assets/images/deskshare_on.png")] - public var deskShareIconOn:Class; + public var deskShareIconOn:Class; [Embed(source="assets/images/control_play_blue.png")] - public var control_play:Class; + public var control_play:Class; [Embed(source="assets/images/shape_move_front.png")] - public var layout:Class; - + public var layout:Class; + [Embed(source="assets/images/table.png")] - public var table:Class; - + public var table:Class; + [Embed(source="assets/images/trash.png")] - public var delete_icon:Class; + public var delete_icon:Class; [Embed(source="assets/images/arrow_right.png")] public var forward:Class; [Embed(source="assets/images/arrow_left.png")] public var backward:Class; - + [Embed(source="assets/images/magnifier.png")] public var magnifier:Class; - + [Embed(source="assets/images/add.png")] public var add:Class; - + [Embed(source="assets/images/bullet_go.png")] public var bulletGo:Class; [Embed(source="assets/images/upload.png")] public var upload:Class; - + [Embed(source="assets/images/annotation.png")] public var whiteboard:Class; - + [Embed(source="assets/images/whiteboard_thick.png")] public var whiteboard_thick:Class; - + [Embed(source="assets/images/whiteboard_thin.png")] public var whiteboard_thin:Class; - + [Embed(source="assets/images/lock.png")] public var locked:Class; - + [Embed(source="assets/images/unlock.png")] public var unlocked:Class; - + [Embed(source="assets/images/lock_20.png")] public var locked_20:Class; - + [Embed(source="assets/images/unlock_20.png")] public var unlocked_20:Class; - + [Embed(source="assets/images/presenter.png")] public var presenter:Class; - + [Embed(source="assets/images/lock_open.png")] public var lock_open:Class; - + [Embed(source="assets/images/lock_close.png")] public var lock_close:Class; - + [Embed(source="assets/images/arrow_in.png")] public var arrow_in:Class; - + [Embed(source="assets/images/shape_handles.png")] public var shape_handles:Class; [Embed(source="assets/images/poll_icon.png")] - public var pollIcon:Class; + public var pollIcon:Class; [Embed(source="assets/images/disk.png")] - public var disk:Class; + public var disk:Class; [Embed(source="assets/images/folder.png")] - public var folder:Class; - + public var folder:Class; + // PLACE CUSTOM IMAGES BELOW [Embed(source="assets/images/line.png")] - public var line_icon:Class; - + public var line_icon:Class; + // [Embed(source="assets/images/text_icon.png")] -// public var text_icon:Class; - +// public var text_icon:Class; + [Embed(source="assets/images/fill_icon.png")] - public var fill_icon:Class; - + public var fill_icon:Class; + [Embed(source="assets/images/transparency_icon.png")] - public var transparency_icon:Class; - + public var transparency_icon:Class; + [Embed(source="assets/images/eraser.png")] - public var eraser_icon:Class; - + public var eraser_icon:Class; + [Embed(source="assets/images/highlighter_icon.png")] - public var highlighter_icon:Class; - + public var highlighter_icon:Class; + [Embed(source="assets/images/pointer_icon_small.png")] - public var select_icon:Class; - + public var select_icon:Class; + [Embed(source="assets/images/triangle.png")] - public var triangle_icon:Class; - + public var triangle_icon:Class; + [Embed(source="assets/images/text_background_icon.png")] - public var toggle_text_background_icon:Class; - + public var toggle_text_background_icon:Class; + [Embed(source="assets/images/grid_icon.png")] - public var grid_icon:Class; - + public var grid_icon:Class; + [Embed(source="assets/images/moderator_white.png")] public var moderator_white:Class; - + [Embed(source="assets/images/presenter_white.png")] public var presenter_white:Class; - + [Embed(source="assets/images/emoji_raiseHand.png")] public var emoji_raiseHand:Class; - + [Embed(source="assets/images/emoji_happy.png")] public var emoji_happy:Class; - + [Embed(source="assets/images/emoji_sad.png")] public var emoji_sad:Class; - + [Embed(source="assets/images/emoji_neutral.png")] public var emoji_neutral:Class; - + [Embed(source="assets/images/emoji_away.png")] public var emoji_away:Class; - + [Embed(source="assets/images/emoji_confused.png")] public var emoji_confused:Class; + + [Embed(source="assets/images/emoji_thumbsUp.png")] + public var emoji_thumbsUp:Class; + + [Embed(source="assets/images/emoji_thumbsDown.png")] + public var emoji_thumbsDown:Class; + + [Embed(source="assets/images/emoji_applause.png")] + public var emoji_applause:Class; } } diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_applause.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_applause.png new file mode 100644 index 0000000000..ad07e3b043 Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_applause.png differ diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_thumbsDown.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_thumbsDown.png new file mode 100644 index 0000000000..55894e70b9 Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_thumbsDown.png differ diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_thumbsUp.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_thumbsUp.png new file mode 100644 index 0000000000..e1be6a2211 Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_thumbsUp.png differ diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as index cf422927c6..69f4839960 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as @@ -17,7 +17,7 @@ * */ package org.bigbluebutton.modules.users.views { - + import com.asfusion.mate.events.Dispatcher; import flash.events.MouseEvent; import mx.containers.Tile; @@ -30,14 +30,14 @@ package org.bigbluebutton.modules.users.views { import org.bigbluebutton.core.managers.UserManager; import org.bigbluebutton.main.model.users.events.EmojiStatusEvent; import org.bigbluebutton.util.i18n.ResourceUtil; - + public class EmojiGrid extends VBox { - private const EMOJIS:Array = ["raiseHand", "happy", "neutral", "sad", "confused", "away"]; - + 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(); @@ -49,7 +49,7 @@ package org.bigbluebutton.modules.users.views { addRemoveEmoji(); this.setStyle("paddingBottom", 10); } - + private function drawEmoji():void { var tile:Tile = new Tile(); tile.width = 134; @@ -71,7 +71,7 @@ package org.bigbluebutton.modules.users.views { } this.addChild(tile); } - + private function addRemoveEmoji():void { var button:Button = new Button(); button.id = "btnnone"; @@ -88,7 +88,7 @@ package org.bigbluebutton.modules.users.views { button.addEventListener(MouseEvent.CLICK, buttonMouseEventHandler); this.addChild(button); } - + protected function buttonMouseEventHandler(event:MouseEvent):void { var clickedButton:Button = event.target as Button; if (!clickedButton.toggle) { @@ -100,11 +100,11 @@ package org.bigbluebutton.modules.users.views { } hide(); } - + protected function mouseDownOutsideHandler(event:FlexMouseEvent):void { hide(); } - + /** * Hides the menu */