diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index f8ad1824c02455619d5832d9a77657b417f3e1d1..afa217dda5b691f6b584780cfdc1a67726062d09 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -98,6 +98,7 @@ bbb.presentation.uploadwindow.word = WORD
bbb.presentation.uploadwindow.excel = EXCEL
bbb.presentation.uploadwindow.powerpoint = POWERPOINT
bbb.presentation.uploadwindow.image = IMAGE
+bbb.presentation.uploadwindow.closeLabel = Click OK to close the window
## FileUploadWindow.mxml
bbb.fileupload.title = Upload Presentation
@@ -139,7 +140,7 @@ bbb.chat.fontSize = Font Size
bbb.listeners.title = Listeners{0} {1}
bbb.listeners.muteAllBtn.toolTip = Mute all
bbb.listeners.unmuteAllBtn.toolTip = Unmute all
-bbb.listeners.ejectTooltip = Click to eject user.
+bbb.listeners.ejectTooltip = Kick User
# ListenerItem.mxml
bbb.listenerItem.nameLbl.toolTip = Select this user and click button to mute or unmute.
@@ -148,14 +149,15 @@ bbb.listenerItem.lockImg.toolTip = Click to keep muted or unmuted
bbb.listenerItem.muteUnmute.toolTip = Mute or unmute this listener
# PublishWindow.mxml
-bbb.publishVideo.title = Stream webcam
-bbb.publishVideo.startPublishBtn.toolTip = start streaming
-
+bbb.publishVideo.title = Share your webcam
+bbb.publishVideo.startPublishBtn.toolTip = Start Sharing
+bbb.video.publish.close.tooltip = Stop sharing your video
+bbb.video.publish.close.label = Close
# DesktopPublishWindow.mxml
bbb.desktopPublish.title = Desktop Sharing: Presenter's Preview
bbb.desktopPublish.fullscreen.tooltip = Share your whole screen
-bbb.desktopPublish.fullscreen.label = Fullscreen
+bbb.desktopPublish.fullscreen.label = Full Screen
bbb.desktopPublish.region.tooltip = Share a part of your screen
bbb.desktopPublish.region.label = Region
bbb.desktopPublish.stop.tooltip = Close screen share
@@ -169,9 +171,9 @@ bbb.desktopView.fitToWindow = Fit to Window
bbb.desktopView.actualSize = Display actual size
# ToolbarButton.mxml
-bbb.toolbar.phone.toolTip = Start My Microphone
+bbb.toolbar.phone.toolTip = Share My Microphone
bbb.toolbar.deskshare.toolTip = Share My Desktop
-bbb.toolbar.video.toolTip = Start My Camera
+bbb.toolbar.video.toolTip = Share My Camera
# HighlighterToolbar.mxml
bbb.highlighter.toolbar.pencil = Highlighter
@@ -185,7 +187,3 @@ bbb.highlighter.toolbar.thickness = Change Thickness
# WhiteboardButton.mxml
bbb.highlighter.button.toolTipShow = Show Whiteboard
bbb.highlighter.button.toolTipHide = Hide Whiteboard
-
-# Video PublishWindow.mxml
-bbb.video.publish.close.tooltip = Stop sharing your video
-bbb.video.publish.close.label = Close
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
index 4ea885dee995016f8df4adb584a60fa6145b745e..098d313c975a15d6f6e89623f35a64006a27c8f9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
@@ -54,14 +54,12 @@
private function positionWindow(window:IBbbModuleWindow):void{
leftWindowHeight = this.height/3;
- leftWindowWidth = (this.width / 20) * 3;
+ leftWindowWidth = 245;
rightWindowHeight = this.height * 0.6;
rightWindowWidth = (this.width / 20) * 6;
centerWindowHeight = this.height - 10;
centerWindowWidth = this.width / 2;
- if (leftWindowWidth < 225) leftWindowWidth = 225;
-
var position:String = window.getPrefferedPosition();
var win:MDIWindow = window as MDIWindow;
var x:Number;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
index 122b978560e0567ec9e52407ea1de47549253371..62bf600ec4ae921be45d47a6ea29b2b43a897818 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
@@ -21,7 +21,8 @@ $Id: $
-->
<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml" width="100%"
- horizontalScrollPolicy="off" creationComplete="onCreationComplete()">
+ horizontalScrollPolicy="off" creationComplete="onCreationComplete()"
+ horizontalAlign="left">
<mx:Script>
<![CDATA[
@@ -116,15 +117,13 @@ $Id: $
<mx:Button id="muteBtn" width="20" height="20" visible="true" enabled="{data.moderator}"
toolTip="{data.moderator ? ResourceUtil.getInstance().getString('bbb.listenerItem.muteUnmute.toolTip') : ''}"
icon="{data.muted ? muteIcon : unmuteIcon}" click="muteUser()"/>
- <mx:Label id="nameLabel" textAlign="left" text="{data.callerName}" width="120"
+ <mx:Label id="nameLabel" textAlign="left" text="{data.callerName}" minWidth="120"
toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.nameLbl.toolTip')}"/>
<mx:Button id="muteCB" width="20" height="20" visible="true" enabled="{data.moderator}"
toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.lockImg.toolTip')}"
icon="{data.locked ? lockedIcon : unlockedIcon}" click="lockMuteUser()"/>
- <mx:Spacer width="25%" />
<mx:Image id="talkImg" source="{talkIcon}" visible="{data.talking}"
toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.talkImg.toolTip')}"/>
- <mx:Spacer width="100%" />
<mx:Button id="kickUserBtn" icon="{ejectIcon}" width="20" height="20" visible="false"
toolTip="{ResourceUtil.getInstance().getString('bbb.listeners.ejectTooltip')}"
click="handleEjectButtonClick()"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml
index d1b792e594f45bfa47149cc4cef7f817e7a2393a..5a0213c1478cb0eec7e53ecd4825329c92bfb422 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml
@@ -267,7 +267,7 @@
progressBar.setStyle("color", 0xFF0000);
progressLbl.setStyle("color", 0xFF0000);
progressBar.label = error + message;
- progressLbl.text = "Click OK to close the window";
+ progressLbl.text = ResourceUtil.getInstance().getString('bbb.presentation.uploadwindow.closeLabel');
okCancelBtn.label = "Ok";
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
index 9bd630d0c343c4d49324691fecc1431fca71a643..729c1330dcc1410dd40f21120999a0fb6ce1d1da 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
@@ -194,7 +194,7 @@
<mx:State name="dispVideoOptionsControlBar">
<mx:AddChild>
<mx:ControlBar id="videoOptionsBar">
- <mx:Button id="btnStartPublish" toolTip="start streaming" icon="{camIcon}" click="startPublishing()" />
+ <mx:Button id="btnStartPublish" toolTip="{{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.toolTip')}" icon="{camIcon}" click="startPublishing()" />
<mx:ComboBox id="cmbCameraSelector" dataProvider="{Camera.names}" width="150" visible="false" />
<mx:ComboBox id="cmbResolution" dataProvider="{resolutions}" width="20%" visible="false" />
</mx:ControlBar>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/RoleItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/RoleItemRenderer.mxml
index 43c3a67c857d45d37c6506cf7de8c32662974a31..e622c21155d8a22c187763892831bc963ed24869 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/RoleItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/RoleItemRenderer.mxml
@@ -21,7 +21,8 @@
-->
<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml"
- verticalScrollPolicy="off" horizontalScrollPolicy="off">
+ verticalScrollPolicy="off" horizontalScrollPolicy="off"
+ horizontalAlign="center">
<mx:Script>
<![CDATA[
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/StatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/StatusItemRenderer.mxml
index b489e72a95b23e7fb249e9c991a12a92f681c493..5d45097e992e97c35c632bce68c3a4ab73319f5b 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/StatusItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/StatusItemRenderer.mxml
@@ -110,10 +110,9 @@
width="18" height="18" enabled="false"
toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip')}"/>
<mx:Image id="presIcon" visible="{data.presenter}" source="{presenterIcon}" toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.statusItemRenderer.presIcon.toolTip')}"/>
- <mx:Spacer width="80%" />
+
<mx:Button id="kickUserBtn" icon="{kickIcon}"
width="20" height="20" visible="false"
toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.kickUserBtn.toolTip')}"
click="kickUser()"/>
- <mx:Spacer width="10%" />
</mx:HBox>