diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 87fdb390e8..67b26b6a4d 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -56,6 +56,7 @@ bbb.viewers.viewersGrid.statusItemRenderer.presIcon.toolTip = Presenter
bbb.viewers.presentBtn.toolTip = Select web participant to be presenter.
bbb.viewers.raiseHandBtn.toolTip = Click to raise hand.
bbb.viewers.presentBtn.label = Switch Presenter
+bbb.viewers.kickUserBtn.toolTip = Kick User
# Presentation
## PresentationWindow.mxml
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index c4c30ae8ac..8c559f3104 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -10,14 +10,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
index 886a24cec6..fc900a2511 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
@@ -34,13 +34,8 @@
-
-
-
-
-
@@ -192,12 +187,6 @@
localeWindow.y = point1.y + 25;
}
- private function removeLoadingInfo(e:ModuleLoadEvent):void{
- statusInfo.text = "";
- statusProgress.text = "";
- statusInfo2.text = "";
- }
-
private function handleLogout(e:Event):void{
if (logoutWindow != null) return;
logoutWindow = LoggedOutWindow(PopUpManager.createPopUp( mdiCanvas, LoggedOutWindow, false));
@@ -215,33 +204,12 @@
mdiCanvas.removeAllWindows();
}
- private function updateModuleLoadProgress(e:ModuleLoadEvent):void{
- statusProgress.text = ResourceUtil.getInstance().getString('bbb.mainshell.statusProgress.loaded',[e.moduleName, e.progress]);
- }
-
- private function rtmpTest(e:PortTestEvent):void{
- //statusInfo.text = ResourceUtil.getInstance().getString('bbb.mainshell.statusInfo.testRTMPConnection');
- //statusInfo.text = "Please wait while we test your connection to the server."
- //statusInfo2.text = ResourceUtil.getInstance().getString('bbb.mainshell.statusInfo2.testRTMPConnection');
- //statusProgress.text = ResourceUtil.getInstance().getString('bbb.mainshell.statusProgress.testRTMPConnection', [e.hostname, e.app]);
- }
-
- private function rtmptTest(e:PortTestEvent):void{
- statusProgress.text = ResourceUtil.getInstance().getString('bbb.mainshell.statusProgress.testRTMPTConnection', [e.hostname, e.app]);
- }
-
- private function rtmptFailed(e:PortTestEvent):void{
- statusProgress.text = ResourceUtil.getInstance().getString('bbb.mainshell.statusProgress.cannotConnectServer');
- }
]]>
-
-
-
-
+
+
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
index e1178d1243..1662b64345 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
@@ -162,7 +162,7 @@