From 0f93649f99891258195dc377e1b8d3e50eed7a22 Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Wed, 25 Jul 2018 11:14:05 +0100
Subject: [PATCH] Update UserInactivityWindow style.
---
.../branding/default/style/css/V2Theme.css | 13 +++++++-
.../main/views/InactivityWarningWindow.mxml | 6 ++--
.../main/views/MainApplicationShell.mxml | 4 +--
...tWindow.mxml => UserInactivityWindow.mxml} | 30 ++++++++++---------
4 files changed, 32 insertions(+), 21 deletions(-)
rename bigbluebutton-client/src/org/bigbluebutton/main/views/{UserInactivityAuditWindow.mxml => UserInactivityWindow.mxml} (81%)
diff --git a/bigbluebutton-client/branding/default/style/css/V2Theme.css b/bigbluebutton-client/branding/default/style/css/V2Theme.css
index 9488af8350..602fcb0740 100644
--- a/bigbluebutton-client/branding/default/style/css/V2Theme.css
+++ b/bigbluebutton-client/branding/default/style/css/V2Theme.css
@@ -928,7 +928,7 @@ views|GuestItemRenderer {
/*
//------------------------------
-// Item InactivityWarningWindow
+// InactivityWarningWindow
//------------------------------
*/
@@ -2013,6 +2013,17 @@ users|MoodMenu {
iconMoodNone : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_None");
}
+/*
+//------------------------------
+// UserInactivityWindow
+//------------------------------
+*/
+
+views|UserInactivityWindow {
+ fontSize : 14;
+ headerHeight : 0;
+}
+
/*
//------------------------------
// VideoDock
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml
index d7d6cc9a13..c90670970a 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml
@@ -27,8 +27,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
verticalScrollPolicy="off"
horizontalScrollPolicy="off"
horizontalAlign="center"
- width="500"
- styleName="inactivityWarningTextStyle"
+ minWidth="500"
creationComplete="onCreationComplete()">
<fx:Declarations>
@@ -104,8 +103,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.inactivityWarning.title')}"
styleName="titleWindowStyle"
width="{this.width - 40}" />
-
- <mx:Text id="warningMessage" selectable="false" text="{}" styleName="inactivityWarningTextStyle"/>
+ <mx:Text id="warningMessage" selectable="false"/>
<mx:Button id="cancelButton" click="cancelButtonClicked()" visible="false" styleName="mainActionButton"/>
</mx:VBox>
</mx:TitleWindow>
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 33d9b9bc59..3997c414e7 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -501,8 +501,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function handleUserInactivityAuditEvent(e:BBBEvent):void {
- var inactivityWarning:UserInactivityAuditWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject,
- UserInactivityAuditWindow, true) as UserInactivityAuditWindow;
+ var inactivityWarning:UserInactivityWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject,
+ UserInactivityWindow, true) as UserInactivityWindow;
inactivityWarning.duration = e.payload.duration;
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/UserInactivityAuditWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/UserInactivityWindow.mxml
similarity index 81%
rename from bigbluebutton-client/src/org/bigbluebutton/main/views/UserInactivityAuditWindow.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/main/views/UserInactivityWindow.mxml
index 54ee5745f2..09c9874d58 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/UserInactivityAuditWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/UserInactivityWindow.mxml
@@ -20,17 +20,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-->
-<mx:Panel xmlns:mx="library://ns.adobe.com/flex/mx"
- xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:mate="http://mate.asfusion.com/"
- verticalScrollPolicy="off"
- horizontalScrollPolicy="off"
- horizontalAlign="center"
- width="500"
- height="120"
- styleName="inactivityWarningTextStyle"
- title="{ResourceUtil.getInstance().getString('bbb.userInactivityAudit.title')}"
- creationComplete="onCreationComplete()">
+<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
+ xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:mate="http://mate.asfusion.com/"
+ xmlns:common="org.bigbluebutton.common.*"
+ verticalScrollPolicy="off"
+ horizontalScrollPolicy="off"
+ horizontalAlign="center"
+ minWidth="500"
+ styleName="inactivityWarningTextStyle"
+ creationComplete="onCreationComplete()">
<fx:Script>
<![CDATA[
@@ -92,7 +91,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
]]>
</fx:Script>
<mx:VBox width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" horizontalAlign="center" verticalAlign="middle">
- <mx:Text id="warningMessage" selectable="false" text="{ResourceUtil.getInstance().getString('bbb.userInactivityAudit.message')}" styleName="inactivityWarningTextStyle"/>
- <mx:Button id="cancelButton" click="cancelButtonClicked()" visible="false" styleName="inactivityWarningWindowCancelButtonStyle"/>
+ <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.userInactivityAudit.title')}"
+ styleName="titleWindowStyle"
+ width="{this.width - 40}" />
+ <mx:Text id="warningMessage" selectable="false" text="{ResourceUtil.getInstance().getString('bbb.userInactivityAudit.message')}"/>
+ <mx:Button id="cancelButton" click="cancelButtonClicked()" visible="false" styleName="mainActionButton"/>
</mx:VBox>
-</mx:Panel>
\ No newline at end of file
+</mx:TitleWindow>
\ No newline at end of file
--
GitLab