From 67808fcb660b98d99b097a7b87ca76846ec1633b Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Wed, 26 Jul 2017 08:49:28 -0700
Subject: [PATCH]  - display time remaining when meeting duration is not zero

---
 bigbluebutton-client/locale/en_US/bbbResources.properties     | 2 ++
 .../src/org/bigbluebutton/main/views/MainToolbar.mxml         | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index b522ee8cea..beed6cd2d3 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 058e6ca7e8..14db08df55 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')}"/>