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

Add file format hint message

Browse Source
This commit is contained in:
syeshchenko 2014-02-05 11:01:23 -08:00
parent 4a0a702165
commit 06bf0fe049
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,6 +387,10 @@ DataGrid {
}
.presentationUploadFileFormatHintTextStyle {
fontWeight: bold;
}
.cameraDisplaySettingsWindowStyle {
borderColor: #b9babc;
borderAlpha: 1;

1
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -132,6 +132,7 @@ bbb.fileupload.okCancelBtn = Close
bbb.fileupload.okCancelBtn.toolTip = Close the File Upload dialog box
bbb.fileupload.genThumbText = Generating thumbnails..
bbb.fileupload.progBarLbl = Progress:
bbb.fileupload.fileFormatHint = *To ensure the best presentation quality it is recommended to convert files into .pdf format before uploading.
bbb.chat.title = Chat
bbb.chat.quickLink.label = Chat Window
bbb.chat.cmpColorPicker.toolTip = Text Color

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

@ -22,7 +22,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml"
xmlns:mate="http://mate.asfusion.com/"
x="168" y="86" layout="absolute" width="700" height="410" styleName="presentationFileUploadWindowStyle"
x="168" y="86" layout="absolute" width="700" height="425" styleName="presentationFileUploadWindowStyle"
initialize="initData();">
<mate:Dispatcher id="globalDispatch" />
@ -130,7 +130,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
var fileSize:Number = fileToUpload.size;
var maxFileSizeBytes:Number = maxFileSize * 1000000;
fileFormatHintLbl.visible = false;
fileFormatHintLbl.includeInLayout = false;
progressReportBox.includeInLayout = true;
progressReportBox.visible = true;
progressBar.visible = true;
progressBar.includeInLayout = true;
if (fileSize > maxFileSizeBytes) {
// Hardcode for now to 30M limit.
// This should be configurable to match what's allowed in nginx. (ralam feb 23, 2010)
@ -161,7 +169,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
fileTxtInput.enabled = false;
presentationNamesLb.visible = false;
}
}
@ -270,7 +277,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:Script>
<mx:VBox width="100%" height="100%">
<mx:VBox width="100%" height="100%" verticalAlign="top">
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.fileupload.title')}" styleName="presentationUploadTitleStyle" paddingBottom="12"/>
<mx:HBox width="100%" paddingTop="5">
<mx:Label id="fileLbl" text="{ResourceUtil.getInstance().getString('bbb.fileupload.fileLbl')}" styleName="presentationUploadChooseFileLabelStyle"/>
@ -284,17 +291,22 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
toolTip="{ResourceUtil.getInstance().getString('bbb.fileupload.uploadBtn.toolTip')}" click="startUpload()"
enabled="false" icon="{bulletGoIcon}"/>
</mx:HBox>
<mx:HBox width="100%" paddingLeft="10" paddingTop="5" paddingBottom="10">
<mx:HBox id="progressReportBox" width="100%" paddingLeft="10" paddingTop="5" paddingBottom="10" includeInLayout="false" visible="false">
<mx:Label id="progBarLbl" text="{ResourceUtil.getInstance().getString('bbb.fileupload.progBarLbl')}"
styleName="presentationUploadProgressBarLabelStyle"
visible="false"/>
<mx:ProgressBar id="progressBar" mode="manual" label="{ResourceUtil.getInstance().getString('bbb.fileupload.progBarLbl')}"
styleName="presentationUploadProgressBarStyle"
labelPlacement="center" width="460" visible="false"/>
</mx:HBox>
<mx:HBox width="100%" height="100%" paddingLeft="5">
<mx:HBox width="328" height="100%" styleName="presentationUploadFileFormatHintBoxStyle">
<mx:Text width="100%" id="fileFormatHintLbl" text="{ResourceUtil.getInstance().getString('bbb.fileupload.fileFormatHint')}" styleName="presentationUploadFileFormatHintTextStyle"/>
</mx:HBox>
</mx:HBox>
<mx:Label id="presentationNamesLb" text="{ResourceUtil.getInstance().getString('bbb.fileupload.presentationNamesLbl')}" styleName="presentationNamesLabelStyle" paddingLeft="5"/>
<mx:Canvas width="90%" height="140" verticalScrollPolicy="off">
<mx:List id="presentationNamesList" width="90%" height="120" left="5" top="5" alternatingItemColors="[#EFEFEF, #FEFEFE]" allowMultipleSelection="false"
<mx:Canvas width="100%" height="140" verticalScrollPolicy="off">
<mx:List width="100%" height="120" left="5" top="5" right="5" alternatingItemColors="[#EFEFEF, #FEFEFE]" allowMultipleSelection="false"
itemRenderer="org.bigbluebutton.modules.present.ui.views.UploadedPresentationRenderer"
dragEnabled="false" dataProvider="{presentationNamesAC}">
</mx:List>