Merge pull request #3342 from capilkey/add-fourth-ss-pic

Add a fourth help image for mac screenshare

bigbluebutton-client/branding/default/style/css/BBBDefault.css

@@ -570,6 +570,10 @@ TitleWindow {
 	imageSource: Embed(source='assets/images/bbb_mac_safari_3.png');
 }
 
+.publishHelpMacSafari4 {
+	imageSource: Embed(source='assets/images/bbb_mac_safari_4.png');
+}
+
 .publishHelpMacFirefox1 {
 	imageSource: Embed(source='assets/images/bbb_mac_firefox_1.png');
 }
@@ -582,6 +586,10 @@ TitleWindow {
 	imageSource: Embed(source='assets/images/bbb_mac_firefox_3.png');
 }
 
+.publishHelpMacFirefox4 {
+	imageSource: Embed(source='assets/images/bbb_mac_firefox_4.png');
+}
+
 .publishHelpMacChrome1 {
 	imageSource: Embed(source='assets/images/bbb_mac_chrome_1.png');
 }
@@ -594,6 +602,10 @@ TitleWindow {
 	imageSource: Embed(source='assets/images/bbb_mac_chrome_3.png');
 }
 
+.publishHelpMacChrome4 {
+	imageSource: Embed(source='assets/images/bbb_mac_chrome_4.png');
+}
+
 .publishHelpLinuxFirefox1 {
 	imageSource: Embed(source='assets/images/bbb_linux_firefox_1.png');
 }

bigbluebutton-client/locale/en_US/bbbResources.properties

@@ -313,12 +313,15 @@ bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
 bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
 bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
 bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
 bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
 bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
 bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
 bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
 bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
 bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
 bbb.screensharePublish.helpText.LinuxFirefox1 = Placeholder linuxFirefox1
 bbb.screensharePublish.helpText.LinuxFirefox2 = Placeholder linuxFirefox2
 bbb.screensharePublish.helpText.LinuxFirefox3 = Placeholder linuxFirefox3

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

@@ -479,6 +479,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             }
           } else if (os == "Mac") {
             info = "Mac";
+            // Macs need an extra image so extend the width by 200 and show the image
+            this.width = 900;
+            helpBox4.visible = helpBox4.includeInLayout = true;
             if (browser == "Safari") {
               info += "Safari";
             } else if (browser == "Firefox") {
@@ -504,6 +507,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             
             helpImg3.styleName = "publishHelp" + info + "3";
             helpLbl3.text = ResourceUtil.getInstance().getString("bbb.screensharePublish.helpText."+info+"3");
+            
+            helpImg4.styleName = "publishHelp" + info + "4";
+            helpLbl4.text = ResourceUtil.getInstance().getString("bbb.screensharePublish.helpText."+info+"4");
           }
         }
       }
@@ -552,6 +558,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
           <mx:Image id="helpImg3" source="{helpImg3.getStyle('imageSource')}" />
           <mx:Label id="helpLbl3" styleName="desktopShareTextStyle" />
         </mx:VBox>
+        <mx:VBox id="helpBox4" width="30%" horizontalAlign="center" visible="false" includeInLayout="false">
+          <mx:Image id="helpImg4" source="{helpImg4.getStyle('imageSource')}" />
+          <mx:Label id="helpLbl4" styleName="desktopShareTextStyle" />
+        </mx:VBox>
       </mx:HBox>
     </mx:VBox>
     <mx:VBox id="previewBox" width="100%" height="100%" visible="false" horizontalAlign="center" >