BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update spark labels to have fixed width in pixels making word wrapping work correctly.

Browse Source
This commit is contained in:
Ghazi Triki 2017-09-15 14:36:13 +01:00
parent b4f2fad93b
commit 1b2d228647
10 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
View File

@ -123,7 +123,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<common:AdvancedLabel id="windowTitle"
text="{ResourceUtil.getInstance().getString('bbb.audioSelection.title')}"
styleName="titleWindowStyle"
width="90%" />
maxWidth="{this.width - 40}" />
<mx:Box width="100%" height="56"
verticalAlign="middle" horizontalAlign="center"
verticalScrollPolicy="off" horizontalScrollPolicy="off"

2
bigbluebutton-client/src/org/bigbluebutton/main/views/BBBSettings.mxml
View File

@ -49,7 +49,7 @@
<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.settings.title')}"
styleName="titleWindowStyle"
width="80%" />
width="{this.width - 40}" />
<mx:VBox id="addedComponents" paddingTop="12" height="100%" />

5
bigbluebutton-client/src/org/bigbluebutton/main/views/BrowserPermissionHelper.mxml
View File

@ -65,12 +65,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
paddingBottom="12"
paddingLeft="8"
paddingRight="8"
paddingTop="12">
paddingTop="12"
horizontalAlign="center">
<common:AdvancedLabel text.chromeMic="{ResourceUtil.getInstance().getString('bbb.micPermissions.chrome.title')}"
text.chromeCam="{ResourceUtil.getInstance().getString('bbb.webcamPermissions.chrome.title')}"
text.firefoxMic="{ResourceUtil.getInstance().getString('bbb.micPermissions.firefox.title')}"
styleName="broswerHelperTitleStyle"
width="100%"
maxWidth="{this.width - 40}"
left="0" />
<mx:HBox width="100%" paddingTop="12">
<mx:Text width="200"

2
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
View File

@ -218,7 +218,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:VBox id="webcamDisplay" width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" styleName="cameraDisplaySettingsWindowBackground">
<mx:HBox width="100%" horizontalAlign="center">
<common:AdvancedLabel maxWidth="400"
<common:AdvancedLabel maxWidth="{this.width - 40}"
text="{ResourceUtil.getInstance().getString('bbb.users.settings.webcamSettings')}"
styleName="titleWindowStyle"
id="textArea" />

7
bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
View File

@ -381,7 +381,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:HRule width="100%"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<common:AdvancedLabel textAlign="left"
width="100%"
width="{echoTestText.parent.width - 20}"
height="60"
id="echoTestText"
text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}"
@ -417,8 +417,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:VBox>
<mx:HBox includeIn="flashMicTestFailedState" width="100%" paddingBottom="60" verticalAlign="middle" horizontalAlign="center">
<common:AdvancedLabel textAlign="center"
width="100%"
<common:AdvancedLabel id="flashMicFailLabel"
textAlign="center"
width="{flashMicFailLabel.parent.width - 20}"
height="{txtErrorMessageMock.height}"
text="{ResourceUtil.getInstance().getString('bbb.micSettings.connectingtoecho.error')}"
styleName="micSettingsWindowHearFromHeadsetLabelStyle" />

5
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
View File

@ -301,8 +301,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:HBox>
<mx:HRule width="100%"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<common:AdvancedLabel textAlign="left"
width="100%"
<common:AdvancedLabel id="micSettingLabel"
textAlign="left"
maxWidth="{micSettingLabel.parent.width - 6}"
height="60"
text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}"
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />

8
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileDownloadWindow.mxml
View File

@ -64,11 +64,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
height="100%"
horizontalAlign="center"
paddingTop="15">
<mx:HBox width="100%">
<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.filedownload.title')}"
styleName="titleWindowStyle"
width="100%" />
</mx:HBox>
<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.filedownload.title')}"
styleName="titleWindowStyle"
maxWidth="550" />
<mx:List id="presentationNamesList"
allowMultipleSelection="false"
width="100%"

8
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
View File

@ -370,11 +370,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:VBox width="100%" height="100%" verticalAlign="top" horizontalAlign="center" top="15">
<mx:HBox width="100%">
<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.fileupload.title')}"
styleName="titleWindowStyle"
width="100%" />
</mx:HBox>
<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.fileupload.title')}"
styleName="titleWindowStyle"
maxWidth="550" />
<mx:Box width="100%" height="100%" paddingLeft="5" paddingRight="5" includeIn="normal">
<mx:Box width="100%" height="100%" verticalAlign="middle" horizontalAlign="center" styleName="presentationUploadFileFormatHintBoxStyle">

2
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml
View File

@ -83,7 +83,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:VBox width="100%" height="100%" paddingTop="15">
<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.sharedNotes.createNoteWindow.label')}"
styleName="titleWindowStyle"
width="100%" />
maxWidth="{this.width - 10}" />
<mx:HBox width="100%"
height="100%"
verticalAlign="middle">

2
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/JoinBreakoutRoomWindow.mxml
View File

@ -61,7 +61,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:VBox height="100%" width="100%" paddingTop="15" paddingBottom="15" verticalGap="15" horizontalAlign="center">
<common:AdvancedLabel styleName="titleWindowStyle"
width="100%"
maxWidth="580"
text="{ResourceUtil.getInstance().getString('bbb.users.breakout.confirm')}" />
<mx:Label htmlText="{ResourceUtil.getInstance().getString('bbb.users.breakout.invited')}" paddingTop="4" />
<mx:Canvas>