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

Merge pull request #694 from capilkey/fix-issue-1964

Browse Source 
Fix issue 1964 - Meeting name label truncation
This commit is contained in:
Richard Alam 2015-07-13 11:57:46 -04:00
commit 57cc039f9a
3 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bigbluebutton-client/branding/default/style/css/BBBDefault.css
View File

@ -54,6 +54,7 @@ ToolTip {
fontWeight: bold;
fontSize: 15;
fontFamily: Arial;
textAlign: center;
color: #e1e2e5;
}

23
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
View File

@ -28,6 +28,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xmlns:maps="org.bigbluebutton.main.maps.*"
xmlns:api="org.bigbluebutton.main.api.*"
width="100%" height="100%"
horizontalScrollPolicy="off" verticalScrollPolicy="off"
creationComplete="initializeShell()"
xmlns:common="org.bigbluebutton.common.*">
@ -152,7 +153,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
[Bindable] private var toolbarPaddingTop:Number = 4;
[Bindable] private var showFooterOpt:Boolean = true;
[Bindable] private var footerHeight:Number = 24;
[Bindable] private var globalHeight:Number = 0;
[Bindable] private var isTunneling:Boolean = false;
@ -183,22 +183,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
protected function initializeShell():void {
globalDispatcher = new Dispatcher();
systemManager.addEventListener(Event.RESIZE, updateCopyrightLabelDimensions);
copyrightLabel2.addEventListener(FlexEvent.UPDATE_COMPLETE, updateCopyrightLabelDimensions);
updateCopyrightLabelDimensions();
}
private function updateCopyrightLabelDimensions(e:Event = null):void {
var screenRect:Rectangle = systemManager.screen;
if (spacer.width == 0) {
copyrightLabel2.width += (screenRect.width - controlBar.width);
} else {
copyrightLabel2.width += Math.min(spacer.width, copyrightLabel2.measuredWidth - copyrightLabel2.width);
}
globalHeight = screenRect.height;
}
protected function initFullScreen():void {
@ -671,7 +655,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
verticalScrollPolicy="off"
effectsLib="{flexlib.mdi.effects.effectsLib.MDIVistaEffects}"
width="100%"
height="{globalHeight - footerHeight - toolbarHeight - 12}">
height="100%">
<views:LoadingBar id="progressBar" horizontalCenter="0" verticalCenter="0" width="50%" />
<views:BrandingLogo x="{this.width - 300}" y="{this.height - 300}" />
</views:MainCanvas>
@ -681,8 +665,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
htmlText="{ResourceUtil.getInstance().getString('bbb.mainshell.copyrightLabel2',[appVersion])}"
link="onFooterLinkClicked(event)"
id="copyrightLabel2" truncateToFit="true"
width="100%" minWidth="1"
selectable="true" paddingRight="10"/>
<mx:Spacer width="100%" id="spacer" />
<mx:Label
id="lblWebRTC"
text="{'[ '+ResourceUtil.getInstance().getString('bbb.mainshell.notification.webrtc')+' ]'}"

14
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
View File

@ -101,15 +101,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function onCreationComplete():void {
if (this.width < 800) {
meetingNameLbl.visible = false;
shortcutKeysBtn.visible = false;
helpBtn.visible = false;
muteMeBtn.visible = false;
meetingNameLbl.width = 0;
shortcutKeysBtn.width = 0;
helpBtn.width = 0;
}
}
private function checkAccessiblity(e:TimerEvent):void {
@ -158,6 +149,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
var meetingTitle:String = BBB.initUserConfigManager().getMeetingTitle();
if (meetingTitle != null) {
meetingNameLbl.text = meetingTitle;
meetingNameLbl.toolTip = meetingTitle;
}
}
}
@ -355,9 +347,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<views:RecordButton id="recordBtn" tabIndex="{baseIndex+numButtons+10}" />
<mx:VRule strokeWidth="2" height="100%" visible="{muteMeBtn.visible}" includeInLayout="{muteMeBtn.includeInLayout}"/>
<views:MuteMeButton id="muteMeBtn" height="20" tabIndex="{baseIndex+numButtons+11}"/>
<mx:Spacer width="50%"/>
<mx:Label id="meetingNameLbl" styleName="meetingNameLabelStyle" />
<mx:Spacer width="50%"/>
<mx:Label id="meetingNameLbl" width="100%" minWidth="1" styleName="meetingNameLabelStyle" />
<!--
<mx:Button label="DISCONNECT!" click="BBB.initConnectionManager().forceClose()" height="22" toolTip="Click to simulate disconnection" />