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

Merge pull request #3216 from ritzalam/add-https-support-for-jws

Browse Source 
Add help on how to use new screenshare
This commit is contained in:
Richard Alam 2016-07-14 15:27:31 -04:00 committed by GitHub
commit 7dc63b9c3a
6 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bigbluebutton-client/build.xml
View File

@ -444,6 +444,7 @@
<copy file="${PROD_RESOURCES_DIR}/BigBlueButtonTest.html" todir="${OUTPUT_DIR}" overwrite="true"/> <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}/BigBlueButton.html" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/DeskshareStandalone.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}/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}/bbb.gif" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/avatar.png" todir="${OUTPUT_DIR}" overwrite="true"/> <copy file="${PROD_RESOURCES_DIR}/avatar.png" todir="${OUTPUT_DIR}" overwrite="true"/>

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

@ -300,9 +300,9 @@ bbb.screensharePublish.chromeOnMacUnsupportedHint = Desktop sharing is not curre
bbb.screensharePublish.minimizeBtn.toolTip = Minimize bbb.screensharePublish.minimizeBtn.toolTip = Minimize
bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize 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.help.title = How to use desktop sharing
bbb.screensharePublish.chromeHint.message = Click Keep button to save the file then click the file to run the application. bbb.screensharePublish.help.message = Click View button to view instruction on how to user desktop sharing.
bbb.screensharePublish.chromeHint.button = Retry bbb.screensharePublish.help.button = View
bbb.screenshareView.title = Desktop Sharing bbb.screenshareView.title = Desktop Sharing
bbb.screenshareView.fitToWindow = Fit to Window bbb.screenshareView.fitToWindow = Fit to Window
bbb.screenshareView.actualSize = Display actual size bbb.screenshareView.actualSize = Display actual size

1
bigbluebutton-client/resources/config.xml.template
View File

@ -49,6 +49,7 @@
autoStart="false" autoStart="false"
autoFullScreen="false" autoFullScreen="false"
baseTabIndex="201" baseTabIndex="201"
help="http://HOST/client/screenshare-help.html"
/> />
<module name="PhoneModule" url="http://HOST/client/PhoneModule.swf?v=VERSION" <module name="PhoneModule" url="http://HOST/client/PhoneModule.swf?v=VERSION"

8
bigbluebutton-client/resources/prod/screenshare-help.html Normal file
View File

@ -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>

4
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
View File

@ -26,6 +26,7 @@ package org.bigbluebutton.modules.screenshare.model
[Bindable] public var autoStart:Boolean = false; [Bindable] public var autoStart:Boolean = false;
[Bindable] public var autoFullScreen:Boolean = false; [Bindable] public var autoFullScreen:Boolean = false;
[Bindable] public var baseTabIndex:int; [Bindable] public var baseTabIndex:int;
[Bindable] public var helpUrl:String;
public function parseOptions():void { public function parseOptions():void {
var vxml:XML = BBB.getConfigForModule("ScreenshareModule"); var vxml:XML = BBB.getConfigForModule("ScreenshareModule");
@ -45,6 +46,9 @@ package org.bigbluebutton.modules.screenshare.model
if (vxml.@showButton != undefined){ if (vxml.@showButton != undefined){
showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false; showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;
} }
if (vxml.@help != undefined){
helpUrl = vxml.@help;
}
} }
} }
} }

25
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
View File

@ -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.ScreenshareModel;
import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions; import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions;
import org.bigbluebutton.util.i18n.ResourceUtil; import org.bigbluebutton.util.i18n.ResourceUtil;
import org.bigbluebutton.core.BBB;
private static const LOG:String = "SC::ScreensharePublishWIndow - "; 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{ private function startPreviewStream(nc:NetConnection, streamId:String, capWidth:Number, capHeight:Number):void{
removeHowToHelpArea();
trace(LOG + "Viewing stream =[" + streamId + "]"); trace(LOG + "Viewing stream =[" + streamId + "]");
streaming = true; streaming = true;
@ -350,10 +353,32 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function isUsingMac():Boolean { private function isUsingMac():Boolean {
return (Capabilities.os.indexOf("Mac") >= 0); 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> </mx:Script>
<!--http://stackoverflow.com/questions/369120/why-does-mxstates-have-trouble-being-resolved-to-a-component-implementation--> <!--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> <dspub:states>
<mx:State name="dispFullRegionControlBar"> <mx:State name="dispFullRegionControlBar">
<mx:AddChild> <mx:AddChild>