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

Merge pull request #371 from SenecaCDOT-BigBlueButton/upload-presentation-window-miscs

Browse Source 
Properly resized upload presentation window, removed unnecessary text
This commit is contained in:
Richard Alam 2014-08-21 15:31:38 -04:00
commit 77dc5b1c1c
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/branding/default/style/css/BBBBlack.css
View File

@ -276,7 +276,7 @@ DataGrid {
fontWeight: bold;
}
.presentationUploadChooseFileLabelStyle, .presentationNamesLabelStyle {
.presentationNamesLabelStyle {
fontFamily: Arial;
fontSize: 14;
fontWeight: bold;

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

@ -378,7 +378,7 @@ DataGrid {
fontWeight: bold;
}
.presentationUploadChooseFileLabelStyle, .presentationNamesLabelStyle {
.presentationNamesLabelStyle {
fontFamily: Arial;
fontSize: 14;
fontWeight: bold;
@ -438,10 +438,6 @@ DataGrid {
}
.presentationUploadFileFormatHintBoxStyle {
borderColor: #707070;
borderAlpha: 1;
borderThickness: 2;
borderStyle: "solid";
backgroundColor: #D4D4D4;
dropShadowEnabled: false;
paddingLeft: 10;

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

@ -162,13 +162,11 @@ bbb.presentation.minimizeBtn.accessibilityName = Minimize the Presentation Windo
bbb.presentation.maximizeRestoreBtn.accessibilityName = Maximize the Presentation Window
bbb.presentation.closeBtn.accessibilityName = Close the Presentation Window
bbb.fileupload.title = Add Files to Your Presentation
bbb.fileupload.fileLbl = Choose File to Upload:
bbb.fileupload.lblFileName.defaultText = No file selected
bbb.fileupload.selectBtn.label = Select File
bbb.fileupload.selectBtn.toolTip = Open dialog box to select a file
bbb.fileupload.uploadBtn = Upload
bbb.fileupload.uploadBtn.toolTip = Upload the selected file
bbb.fileupload.presentationNamesLbl = Uploaded Presentations:
bbb.fileupload.deleteBtn.toolTip = Delete Presentation
bbb.fileupload.showBtn = Show
bbb.fileupload.showBtn.toolTip = Show Presentation

14
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml Normal file → Executable file
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/"
layout="absolute" width="580" height="405" styleName="presentationFileUploadWindowStyle"
layout="absolute" width="580" height="400" styleName="presentationFileUploadWindowStyle"
initialize="initData();">
<mate:Dispatcher id="globalDispatch" />
@ -171,8 +171,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
trace(LOG + "Uploading file : " + presentationName);
progBarLbl.visible = true;
lblFileName.enabled = false;
presentationNamesLb.visible = false;
lblFileName.enabled = false;
var uploadCmd:UploadFileCommand = new UploadFileCommand();
uploadCmd.filename = presentationName;
@ -194,7 +193,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
progressBar.setProgress(0, 100);
progressBar.validateNow();
fileLbl.visible = false;
selectBtn.visible = false;
uploadBtn.visible = false;
selectBtn.enabled = false;
@ -296,9 +294,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:VBox width="100%" height="100%" verticalAlign="top">
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.fileupload.title')}" styleName="presentationUploadTitleStyle" paddingBottom="0"/>
<mx:HBox width="100%" paddingTop="0">
<mx:Label id="fileLbl" text="{ResourceUtil.getInstance().getString('bbb.fileupload.fileLbl')}" styleName="presentationUploadChooseFileLabelStyle"/>
</mx:HBox>
<mx:HBox width="100%" paddingLeft="5" paddingTop="0" verticalAlign="middle">
<mx:Label id="lblFileName" width="{lblFileName.parent.width-selectBtn.width-uploadBtn.width-30}" selectable="false" click="selectFile()" text="{ResourceUtil.getInstance().getString('bbb.fileupload.lblFileName.defaultText')}" />
<mx:Button id="selectBtn" label="{ResourceUtil.getInstance().getString('bbb.fileupload.selectBtn.label')}"
@ -319,9 +314,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Text width="100%" id="fileFormatHintLbl" text="{ResourceUtil.getInstance().getString('bbb.fileupload.fileFormatHint')}" styleName="presentationUploadFileFormatHintTextStyle"/>
</mx:Box>
</mx:Box>
<mx:Label id="presentationNamesLb" text="{ResourceUtil.getInstance().getString('bbb.fileupload.presentationNamesLbl')}" styleName="presentationNamesLabelStyle" paddingLeft="5"/>
<mx:Canvas width="100%" height="130" verticalScrollPolicy="off">
<mx:List width="100%" height="120" left="5" top="5" right="5" id="uploadedFilesList" alternatingItemColors="[#EFEFEF, #FEFEFE]" allowMultipleSelection="false"
<mx:Canvas width="100%" height="142" verticalScrollPolicy="off">
<mx:List width="100%" height="142" left="5" top="5" right="5" id="uploadedFilesList" alternatingItemColors="[#EFEFEF, #FEFEFE]" allowMultipleSelection="false"
itemRenderer="org.bigbluebutton.modules.present.ui.views.UploadedPresentationRenderer"
dragEnabled="false" dataProvider="{presentationNamesAC}">
</mx:List>