diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index b522ee8cea22eb57eac93ef5c9c410c5bdbfe442..beed6cd2d37a694b3e58ede39d0131b97dc6510e 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -784,6 +784,8 @@ bbb.lockSettings.feature=Feature bbb.lockSettings.locked=Locked bbb.lockSettings.lockOnJoin=Lock On Join +bbb.meeting.timeRemaining = Time remaining + bbb.users.breakout.breakoutRooms = Breakout Rooms bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms bbb.users.breakout.timer = <b>{0}</b> diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml index 058e6ca7e8fa25bcab180f6d1a269a50b996f688..14db08df5508d52084dddd5d4290de39468c16ae 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml @@ -193,6 +193,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. private function handleRemainingTimeUpdate(e:BreakoutRoomEvent):void { if (! timeRemaining.visible) { timeRemaining.visible = true; + timeRemainingLabel.visible = true; } TimerUtil.setCountDownTimer(timeRemaining, e.durationInMinutes); } @@ -542,6 +543,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. <mx:VRule styleName="toolbarSeparator" height="10" /> <mx:Label id="meetingNameLbl" minWidth="1" styleName="meetingNameLabelStyle" /> <mx:HBox id="addedBtns" width="100%" horizontalAlign="center"/> + <mx:Label id="timeRemainingLabel" visible="false" + text="{ResourceUtil.getInstance().getString('bbb.meeting.timeRemaining')}: " + toolTip="{ResourceUtil.getInstance().getString('bbb.meeting.timeRemaining')}"/> <mx:Label id="timeRemaining" visible="false" text="{ResourceUtil.getInstance().getString('bbb.users.breakout.calculatingRemainingTime')}" toolTip="{ResourceUtil.getInstance().getString('bbb.users.breakout.timer.toolTip')}"/>