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

Merge branch '090-guest-role' into mconf-live0.6.2

Browse Source 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
This commit is contained in:
Felipe Cecagno 2015-01-25 21:01:10 -02:00
commit 25ff17d906
14 changed files with 2602 additions and 2600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
View File

@ -97,7 +97,6 @@ class CollectorActor(dispatcher: IDispatcher) extends Actor {
case msg: UndoWhiteboardRequest => handleUndoWhiteboardRequest(msg)
case msg: EnableWhiteboardRequest => handleEnableWhiteboardRequest(msg)
case msg: IsWhiteboardEnabledRequest => handleIsWhiteboardEnabledRequest(msg)
case msg: GetAllMeetingsRequest => handleGetAllMeetingsRequest(msg)
case msg: GetStreamPath => handleGetStreamPath(msg)
case msg: UserRequestToEnter => handleUserRequestToEnter(msg)
case msg: GetGuestPolicy => handleGetGuestPolicy(msg)
@ -105,6 +104,7 @@ class CollectorActor(dispatcher: IDispatcher) extends Actor {
case msg: GetGuestsWaiting => handleGetGuestsWaiting(msg)
case msg: RespondToGuest => handleRespondToGuest(msg)
case msg: KickGuest => handleKickGuest(msg)
case msg: GetAllMeetingsRequest => handleGetAllMeetingsRequest(msg)
//OUT MESSAGES
case msg: MeetingCreated => handleMeetingCreated(msg)
@ -184,13 +184,13 @@ class CollectorActor(dispatcher: IDispatcher) extends Actor {
case msg: UndoWhiteboardEvent => handleUndoWhiteboardEvent(msg)
case msg: WhiteboardEnabledEvent => handleWhiteboardEnabledEvent(msg)
case msg: IsWhiteboardEnabledReply => handleIsWhiteboardEnabledReply(msg)
case msg: GetAllMeetingsReply => handleGetAllMeetingsReply(msg)
case msg: GuestRequestedToEnter => handleGuestRequestedToEnter(msg)
case msg: GetGuestPolicyReply => handleGetGuestPolicyReply(msg)
case msg: GuestPolicyChanged => handleGuestPolicyChanged(msg)
case msg: GetGuestsWaitingReply => handleGetGuestsWaitingReply(msg)
case msg: ResponseToGuest => handleResponseToGuest(msg)
case msg: GuestKicked => handleGuestKicked(msg)
case msg: GetAllMeetingsReply => handleGetAllMeetingsReply(msg)
case _ => // do nothing
}
@ -2203,11 +2203,6 @@ class CollectorActor(dispatcher: IDispatcher) extends Actor {
val json = WhiteboardMessageToJsonConverter.isWhiteboardEnabledReplyToJson(msg)
dispatcher.dispatch(json)
}
private def handleGetAllMeetingsReply(msg: GetAllMeetingsReply) {
val json = MeetingMessageToJsonConverter.getAllMeetingsReplyToJson(msg)
println("***** DISPATCHING GET ALL MEETINGS REPLY OUTMSG *****************")
dispatcher.dispatch(json)
}
private def handleGetStreamPath(msg: GetStreamPath) {
val payload = new java.util.HashMap[String, Any]()
@ -2396,4 +2391,10 @@ class CollectorActor(dispatcher: IDispatcher) extends Actor {
// println("***** DISPATCHING GUEST KICKED *****************")
dispatcher.dispatch(buildJson(header, payload))
}
private def handleGetAllMeetingsReply(msg: GetAllMeetingsReply) {
val json = MeetingMessageToJsonConverter.getAllMeetingsReplyToJson(msg)
println("***** DISPATCHING GET ALL MEETINGS REPLY OUTMSG *****************")
dispatcher.dispatch(json)
}
}

4
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
View File

@ -79,7 +79,6 @@ object MessageNames {
val UNDO_WHITEBOARD = "undo_whiteboard_request"
val ENABLE_WHITEBOARD = "enable_whiteboard_request"
val IS_WHITEBOARD_ENABLED = "is_whiteboard_enabled_request"
val GET_ALL_MEETINGS_REQUEST = "get_all_meetings_request"
val GET_STREAM_PATH = "get_stream_path_request"
val USER_REQUEST_TO_ENTER = "user_request_to_enter"
var GET_GUEST_POLICY = "get_guest_policy"
@ -88,6 +87,7 @@ object MessageNames {
val RESPOND_TO_GUEST = "respond_to_guest"
val RESPOND_TO_ALL_GUESTS = "respond_to_all_guests"
val KICK_GUEST = "kick_guest"
val GET_ALL_MEETINGS_REQUEST = "get_all_meetings_request"
// OUT MESSAGES
val MEETING_CREATED = "meeting_created_message"
@ -169,7 +169,6 @@ object MessageNames {
val MEETING_DESTROYED_EVENT = "meeting_destroyed_event"
val KEEP_ALIVE_REPLY = "keep_alive_reply"
val USER_LISTEN_ONLY = "user_listening_only"
val GET_ALL_MEETINGS_REPLY = "get_all_meetings_reply"
val GET_STREAM_PATH_REPLY = "get_stream_path_reply"
val GUEST_REQUESTED_TO_ENTER = "guest_requested_to_enter"
var GET_GUEST_POLICY_REPLY = "get_guest_policy_reply"
@ -177,4 +176,5 @@ object MessageNames {
val GET_GUESTS_WAITING_REPLY = "get_guests_waiting_reply"
val RESPONSE_TO_GUEST = "response_to_guest"
val GUEST_KICKED = "guest_kicked"
val GET_ALL_MEETINGS_REPLY = "get_all_meetings_reply"
}

11
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
View File

@ -663,11 +663,6 @@ case class IsWhiteboardEnabledReply(
version:String = Versions.V_0_0_1
) extends IOutMessage
case class GetAllMeetingsReply(
meetings: Array[MeetingInfo],
version:String = Versions.V_0_0_1
) extends IOutMessage
case class GuestRequestedToEnter (
meetingID: String,
recorded: Boolean,
@ -708,6 +703,11 @@ case class GuestKicked(
guestID: String
) extends IOutMessage
case class GetAllMeetingsReply(
meetings: Array[MeetingInfo],
version:String = Versions.V_0_0_1
) extends IOutMessage
case class PatchDocumentReply(
meetingID: String,
recorded: Boolean,
@ -756,3 +756,4 @@ case class GetStreamPathReply(
streamName: String,
streamPath: String
) extends IOutMessage

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

@ -99,7 +99,7 @@ ToolTip {
fontFamily: Arial;
}
Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle, .cameraDisplaySettingsWindowProfileComboStyle, .cameraDisplaySettingsWindowCameraSelector, .languageSelectorStyle, .testJavaLinkButtonStyle, .recordButtonStyleNormal, .recordButtonStyleStart, .recordButtonStyleStop, .micSettingsWindowHelpButtonStyle, .bandwidthButtonStyle, .settingsButtonStyle {
Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle, .cameraDisplaySettingsWindowProfileComboStyle, .cameraDisplaySettingsWindowCameraSelector, .languageSelectorStyle, .testJavaLinkButtonStyle, .recordButtonStyleNormal, .recordButtonStyleStart, .recordButtonStyleStop, .micSettingsWindowHelpButtonStyle, .bandwidthButtonStyle, .settingsButtonStyle, .acceptButtonStyle, .denyButtonStyle {
textIndent: 0;
paddingLeft: 10;
paddingRight: 10;
@ -170,7 +170,15 @@ Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle, .cameraD
}
.settingsButtonStyle {
icon: Embed('assets/images/wrench.png');
icon: Embed('assets/images/ic_settings_16px.png');
}
.acceptButtonStyle {
icon: Embed('assets/images/ic_thumb_up_16px.png');
}
.denyButtonStyle {
icon: Embed('assets/images/ic_thumb_down_16px.png');
}
DataGrid {

BIN
bigbluebutton-client/branding/default/style/css/assets/images/ic_settings_16px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 317 B

BIN
bigbluebutton-client/branding/default/style/css/assets/images/ic_thumb_down_16px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 327 B

BIN
bigbluebutton-client/branding/default/style/css/assets/images/ic_thumb_up_16px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

BIN
bigbluebutton-client/branding/default/style/css/assets/images/wrench.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 610 B

6
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
View File

@ -205,12 +205,6 @@ package org.bigbluebutton.common
[Embed(source="assets/images/control_play_blue.png")]
public var control_play:Class;
[Embed(source="assets/images/accept.png")]
public var accept_user:Class;
[Embed(source="assets/images/cancel.png")]
public var cancel_user:Class;
[Embed(source="assets/images/shape_move_front.png")]
public var layout:Class;

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/accept.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 781 B

7
bigbluebutton-client/src/org/bigbluebutton/main/views/GuestItem.mxml
View File

@ -41,9 +41,6 @@
private var dispatcher:Dispatcher = new Dispatcher();
private var images:Images = new Images();
[Bindable] public var acceptUserIcon:Class = images.accept_user;
[Bindable] public var rejectUserIcon:Class = images.cancel_user;
[Bindable] private var username:String = "";
private var userid:String;
@ -72,7 +69,7 @@
<mx:Label text="{username}" maxWidth="150" />
<mx:Spacer width="100%" />
<mx:Button icon="{rejectUserIcon}" toolTip="{ResourceUtil.getInstance().getString('bbb.guests.denyBtn.toolTip')}" click="onRejectUserBtnClick()" />
<mx:Button icon="{acceptUserIcon}" toolTip="{ResourceUtil.getInstance().getString('bbb.guests.allowBtn.toolTip')}" click="onAcceptUserBtnClick()" />
<mx:Button styleName="denyButtonStyle" toolTip="{ResourceUtil.getInstance().getString('bbb.guests.denyBtn.toolTip')}" click="onRejectUserBtnClick()" />
<mx:Button styleName="acceptButtonStyle" toolTip="{ResourceUtil.getInstance().getString('bbb.guests.allowBtn.toolTip')}" click="onAcceptUserBtnClick()" />
</mx:HBox>

1
bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
View File

@ -55,6 +55,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
this.label = ResourceUtil.getInstance().getString('bbb.mainshell.statusProgress.loading', [numModules]);
this.visible = true;
}
private function moduleLoadProgress(e:ModuleLoadEvent):void{