From 815be28d0bc2ce4be840c29c0c445cd1623e0efd Mon Sep 17 00:00:00 2001 From: Chad Pilkey Date: Tue, 27 Jan 2015 14:19:02 -0800 Subject: [PATCH] Revert "Revert "Added Java check to the configuration notifications"" This reverts commit 82545a03f38a6971827d1736bc12d79b4b087291. --- .../branding/default/style/css/BBBDefault.css | 13 +- .../css/assets/images/chromePluginBlocked.png | Bin 0 -> 7322 bytes .../locale/en_US/bbbResources.properties | 11 +- .../resources/config.xml.template | 4 +- .../resources/prod/BigBlueButton.html | 5 + .../prod/bbb-deskshare-applet-0.9.0.jar | Bin 187188 -> 178639 bytes .../bbb-deskshare-applet-unsigned-0.9.0.jar | Bin 161833 -> 161833 bytes .../resources/prod/lib/bbb_api_bridge.js | 9 +- .../resources/prod/lib/bbb_deskshare.js | 5 +- .../resources/prod/lib/deployJava.js | 2 + .../main/api/ExternalApiCallbacks.as | 9 + .../main/views/ClientStatusItemRenderer.mxml | 2 +- .../main/views/MainApplicationShell.mxml | 5 +- .../main/views/WarningButton.mxml | 20 +- .../events/DeskshareAppletLaunchedEvent.as | 14 ++ .../deskshare/maps/DeskshareEventMap.mxml | 26 +-- .../modules/deskshare/utils/JavaCheck.as | 104 ++++++++++ .../view/components/DesktopPublishWindow.mxml | 196 ++++++++++-------- .../deskshare/client/DeskShareApplet.java | 11 +- 19 files changed, 308 insertions(+), 128 deletions(-) create mode 100755 bigbluebutton-client/branding/default/style/css/assets/images/chromePluginBlocked.png mode change 100644 => 100755 bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar mode change 100644 => 100755 bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar create mode 100755 bigbluebutton-client/resources/prod/lib/deployJava.js create mode 100755 bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/events/DeskshareAppletLaunchedEvent.as create mode 100755 bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as mode change 100644 => 100755 deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java diff --git a/bigbluebutton-client/branding/default/style/css/BBBDefault.css b/bigbluebutton-client/branding/default/style/css/BBBDefault.css index a0b514a76a..25eaf44f81 100755 --- a/bigbluebutton-client/branding/default/style/css/BBBDefault.css +++ b/bigbluebutton-client/branding/default/style/css/BBBDefault.css @@ -451,17 +451,26 @@ DataGrid { } -.presentationUploadFileFormatHintBoxStyle, .desktopShareUsingChromeOnMacHintBoxStyle { +.presentationUploadFileFormatHintBoxStyle { backgroundColor: #D4D4D4; dropShadowEnabled: false; paddingLeft: 10; paddingRight: 10 } -.presentationUploadFileFormatHintTextStyle, .desktopShareUsingChromeOnMacHintTextStyle { +.presentationUploadFileFormatHintTextStyle { fontWeight: bold; } +.desktopShareTextStyle { + fontSize: 11; + fontWeight: bold; +} + +.chromeJavaHelpImage { + imageSource: Embed(source='assets/images/chromePluginBlocked.png'); +} + .cameraDisplaySettingsWindowStyle { borderColor: #b9babc; borderAlpha: 1; diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/chromePluginBlocked.png b/bigbluebutton-client/branding/default/style/css/assets/images/chromePluginBlocked.png new file mode 100755 index 0000000000000000000000000000000000000000..5631ba46a343a45634dbc6468926b5f9475b3f9a GIT binary patch literal 7322 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 to install the latest Java to use the desktop sharing feature. +bbb.clientstatus.java.oldversion = You have an old Java installed, please click HERE to install the latest Java to use the desktop sharing feature. bbb.window.minimizeBtn.toolTip = Minimize bbb.window.maximizeRestoreBtn.toolTip = Maximize bbb.window.closeBtn.toolTip = Close @@ -265,10 +269,9 @@ bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently bbb.desktopPublish.minimizeBtn.toolTip = Minimize bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window -bbb.desktopPublish.javaRequiredLabel = Requires Java 7u51 (or later) to run. -bbb.desktopPublish.javaTestLinkLabel = Test Java -bbb.desktopPublish.javaTestLinkLabel.tooltip = Test Your Java Version -bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Test Your Java Version +bbb.desktopPublish.chromeHint.title = Chrome may need your permission. +bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'. +bbb.desktopPublish.chromeHint.button = Retry bbb.desktopView.title = Desktop Sharing bbb.desktopView.fitToWindow = Fit to Window bbb.desktopView.actualSize = Display actual size diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template index 0603d44b31..fb8bd184d0 100755 --- a/bigbluebutton-client/resources/config.xml.template +++ b/bigbluebutton-client/resources/config.xml.template @@ -10,7 +10,7 @@ - + +