diff --git a/bigbluebutton-client/branding/default/style/css/BBBBlack.css b/bigbluebutton-client/branding/default/style/css/BBBBlack.css index ffd3515ad3..b65b9dfb3e 100755 --- a/bigbluebutton-client/branding/default/style/css/BBBBlack.css +++ b/bigbluebutton-client/branding/default/style/css/BBBBlack.css @@ -276,7 +276,7 @@ DataGrid { fontWeight: bold; } -.presentationUploadChooseFileLabelStyle, .presentationNamesLabelStyle { +.presentationNamesLabelStyle { fontFamily: Arial; fontSize: 14; fontWeight: bold; diff --git a/bigbluebutton-client/branding/default/style/css/BBBDefault.css b/bigbluebutton-client/branding/default/style/css/BBBDefault.css index 8481f3f32a..6b3eac466b 100755 --- a/bigbluebutton-client/branding/default/style/css/BBBDefault.css +++ b/bigbluebutton-client/branding/default/style/css/BBBDefault.css @@ -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; diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index 9e4f6002db..399c27f5ae 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -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 diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml old mode 100644 new mode 100755 index d8ebf388b3..3e6e4280a6 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml @@ -22,7 +22,7 @@ with BigBlueButton; if not, see . @@ -171,8 +171,7 @@ with BigBlueButton; if not, see . 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 . 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 . - - - . - - - +