diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index 2b427761e6f1def4624d26bef81e14aad0232689..4a1f8c3f9c5b7846e6a0838d1a5d72195fa00180 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -444,6 +444,7 @@
<copy file="${PROD_RESOURCES_DIR}/BigBlueButtonTest.html" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/BigBlueButton.html" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/DeskshareStandalone.html" todir="${OUTPUT_DIR}" overwrite="true"/>
+ <copy file="${PROD_RESOURCES_DIR}/screenshare-help.html" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/get_flash_player.gif" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/bbb.gif" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/avatar.png" todir="${OUTPUT_DIR}" overwrite="true"/>
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 18c3c7c3d56ef8cd1b3aa0efae27c826a32cb370..ea9d8c508906997032184fb0fb47faa6f302c9e3 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -300,9 +300,9 @@ bbb.screensharePublish.chromeOnMacUnsupportedHint = Desktop sharing is not curre
bbb.screensharePublish.minimizeBtn.toolTip = Minimize
bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.screensharePublish.chromeHint.title = Chrome needs your permission to run the application.
-bbb.screensharePublish.chromeHint.message = Click Keep button to save the file then click the file to run the application.
-bbb.screensharePublish.chromeHint.button = Retry
+bbb.screensharePublish.help.title = How to use desktop sharing
+bbb.screensharePublish.help.message = Click View button to view instruction on how to user desktop sharing.
+bbb.screensharePublish.help.button = View
bbb.screenshareView.title = Desktop Sharing
bbb.screenshareView.fitToWindow = Fit to Window
bbb.screenshareView.actualSize = Display actual size
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index 6e8d9cbd35231915095550b64b9842046f0e5c21..ddf2e12460872d1f03d6e17878932459b48e07da 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -49,6 +49,7 @@
autoStart="false"
autoFullScreen="false"
baseTabIndex="201"
+ help="http://HOST/client/screenshare-help.html"
/>
<module name="PhoneModule" url="http://HOST/client/PhoneModule.swf?v=VERSION"
diff --git a/bigbluebutton-client/resources/prod/screenshare-help.html b/bigbluebutton-client/resources/prod/screenshare-help.html
new file mode 100644
index 0000000000000000000000000000000000000000..e761162f90fa44c8d5d4969eed8ebe1089a3ef23
--- /dev/null
+++ b/bigbluebutton-client/resources/prod/screenshare-help.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>Help for using new screenshare.</title>
+</head>
+<body>
+</body>
+</html>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
index da7e8f3fc51b8b5db12909ee5cde5555f0c598d6..0813997de0e8f62e504215c67d14313b2844224d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
@@ -26,6 +26,7 @@ package org.bigbluebutton.modules.screenshare.model
[Bindable] public var autoStart:Boolean = false;
[Bindable] public var autoFullScreen:Boolean = false;
[Bindable] public var baseTabIndex:int;
+ [Bindable] public var helpUrl:String;
public function parseOptions():void {
var vxml:XML = BBB.getConfigForModule("ScreenshareModule");
@@ -45,6 +46,9 @@ package org.bigbluebutton.modules.screenshare.model
if (vxml.@showButton != undefined){
showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;
}
+ if (vxml.@help != undefined){
+ helpUrl = vxml.@help;
+ }
}
}
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
index eb49840c528d47f211f12934a19d7088b8c35210..6529e729d50a405f8fe7fe2ddcaa52346f31deaf 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
@@ -62,6 +62,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.modules.screenshare.model.ScreenshareModel;
import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions;
import org.bigbluebutton.util.i18n.ResourceUtil;
+ import org.bigbluebutton.core.BBB;
private static const LOG:String = "SC::ScreensharePublishWIndow - ";
@@ -210,6 +211,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function startPreviewStream(nc:NetConnection, streamId:String, capWidth:Number, capHeight:Number):void{
+ removeHowToHelpArea();
+
trace(LOG + "Viewing stream =[" + streamId + "]");
streaming = true;
@@ -350,10 +353,32 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function isUsingMac():Boolean {
return (Capabilities.os.indexOf("Mac") >= 0);
}
+
+ private function onHelpButtonClicked():void {
+ var option:ScreenshareOptions = new ScreenshareOptions();
+ option.parseOptions();
+ var DEFAULT_HELP_URL:String = option.helpUrl;
+ trace("onHelpButtonClicked - " + DEFAULT_HELP_URL);
+ navigateToURL(new URLRequest(DEFAULT_HELP_URL), "_blank")
+ }
+
+ private function removeHowToHelpArea():void {
+ howToHelpArea.visible = howToHelpArea.includeInLayout = false;
+ }
]]>
</mx:Script>
<!--http://stackoverflow.com/questions/369120/why-does-mxstates-have-trouble-being-resolved-to-a-component-implementation-->
+ <mx:VBox id="howToHelpArea" includeInLayout="true" visible="true" height="100%" width="100%" verticalAlign="middle" horizontalAlign="center">
+ <mx:Text width="80%" textAlign="center" styleName="desktopShareTextStyle" text="{ResourceUtil.getInstance().getString('bbb.screensharePublish.help.title')}" />
+ <mx:Text width="80%" textAlign="center" styleName="desktopShareTextStyle" text="{ResourceUtil.getInstance().getString('bbb.screensharePublish.help.message')}" />
+ <mx:Button id="btnScreenshareView"
+ toolTip="{ResourceUtil.getInstance().getString('bbb.screensharePublish.help.button')}"
+ label="{ResourceUtil.getInstance().getString('bbb.screensharePublish.help.button')}"
+ visible="true"
+ click="onHelpButtonClicked()"
+ tabIndex="{baseIndex+3}"/>
+ </mx:VBox>
<dspub:states>
<mx:State name="dispFullRegionControlBar">
<mx:AddChild>