diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index 2b427761e6..4a1f8c3f9c 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -444,6 +444,7 @@
+
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 18c3c7c3d5..ea9d8c5089 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 6e8d9cbd35..ddf2e12460 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"
/>
+
+
+Help for using new screenshare.
+
+
+
+
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 da7e8f3fc5..0813997de0 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 eb49840c52..6529e729d5 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 .
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 .
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 .
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;
+ }
]]>
+
+
+
+
+