Merge remote-tracking branch 'origin/master' into bug5838

java/com.sap.sailing.gwt.ui/RaceBoard.css

@@ -723,8 +723,13 @@ img.openColumn {
 }
 
 .RegattaAndRaceTime-Header .RaceTime-Label {
-	font-size: 15px;
-	margin-top: 5px;
+    font-size: 15px;
+    margin-top: 5px;
+}
+
+.RegattaAndRaceTime-Header .HelpButton {
+    position: absolute;
+    left: -25px;
 }
 
 .compactHeader .RegattaAndRaceTime-Header>* {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/help/HelpButton.gss

@@ -1,14 +1,17 @@
 @def SHADOW_COLOR #21a0e4;
 
 .help-icon {
-    width: 23px;
+    width: 17px;
+    position: absolute;
     height: auto;
+    margin: 3px;
     box-shadow: 0 0 5px SHADOW_COLOR;
     background-color: rgba(33, 160, 228, .4);
     border-radius: 100%;
 }
 
 .help-popup {
+	background-color: white;
     box-shadow: 0 0 10px SHADOW_COLOR;
     border: 0 none;
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/help/HelpButton.java

@@ -1,6 +1,7 @@
 package com.sap.sailing.gwt.common.client.help;
 
 import com.google.gwt.dom.client.Style.Cursor;
+import com.google.gwt.uibinder.client.UiConstructor;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Image;
 
@@ -8,6 +9,10 @@ public class HelpButton extends Composite {
     private final Image icon;
     private final HelpButtonPopup popup;
 
+    public @UiConstructor HelpButton(final String description, final String url) {
+        this(HelpButtonResources.INSTANCE, description, url);
+    }
+    
     public HelpButton(final HelpButtonResources resources, final String description, final String url) {
         resources.style().ensureInjected();
         this.icon = new Image(resources.icon());

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/user/profile/domain/SailorProfileDTO.java

@@ -30,6 +30,7 @@ public class SailorProfileDTO implements Result, Serializable {
     private ArrayList<BadgeDTO> badges = new ArrayList<>();
     private ArrayList<BoatClassDTO> boatclasses = new ArrayList<>();
 
+    @Deprecated //Used for GWT serialization only.
     protected SailorProfileDTO() {
 
     }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/races/RacesViewImpl.ui.xml

@@ -2,7 +2,8 @@
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"
 		xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared"
 		xmlns:mp="urn:import:com.sap.sailing.gwt.home.mobile.partials"
-		xmlns:sp="urn:import:com.sap.sailing.gwt.home.shared.partials">
+		xmlns:sp="urn:import:com.sap.sailing.gwt.home.shared.partials"
+		xmlns:h="urn:import:com.sap.sailing.gwt.common.client.help">
 	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
 	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
 	<ui:style>
@@ -17,10 +18,17 @@
 		.filter > input {
 			width: 100%;
 		}
+		.help {
+	        position: absolute;
+	        left: 138px;
+		}
 	</ui:style>	
 	<g:HTMLPanel>
 		<div class="{res.mediaCss.columns}">
-			<div class="{res.mediaCss.small12} {style.pageTitle}"><ui:text from="{i18n.racesAndTracking}" /></div>
+			<div class="{res.mediaCss.small12} {style.pageTitle}">
+			     <ui:text from="{i18n.racesAndTracking}" />
+			     <h:HelpButton addStyleNames= "{style.help}" ui:field='HelpButton' description='Video Guide' url='https://support.sapsailing.com/hc/en-us/articles/7275243525148-Tracking-Race-Player-Overview' />
+			</div>
 			<sp:filter.RacesByCompetitorTextBoxFilter addStyleNames="{res.mediaCss.small12} {style.filter}" ui:field="competitorFilterUi" />
 		</div>
 		<mp:regattacompetition.RegattaCompetition ui:field="regattaCompetitionUi" />

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties

@@ -2464,6 +2464,6 @@ scoringSchemeHighPointsByWindTiesLastlyBrokenByOtherLeaderboard=High Point Syste
 scoringSchemeHighPointsByWindTiesLastlyBrokenByOtherLeaderboardDescription=The winner of a race gets 1 point, all others 0; ties are broken on last race, then based on another leaderboard
 helptextLinkingRaces=In order to link races to tracked races, you must left-click a race in the table below and after that left-click the corresponding entry in the tracked races table on the right.
 scoringSchemeLowPointA82Only=Low Point System; Tie-Break According to RRS A8.2 (Last Race)
-scoringSchemeLowPointA82OnlyDescription=Low Point System; Tie-Break According to RRS A8.2; If a tie remains after looking at the medal race participation and scores, compare the scores in the last race (including scores excluded), then the second-to-last race, etc., until the tie is broken.=scoringSchemeLowPointSystemFirstThreeWinsA82Only
+scoringSchemeLowPointA82OnlyDescription=Low Point System; Tie-Break According to RRS A8.2; If a tie remains after looking at the medal race participation and scores, compare the scores in the last race (including scores excluded), then the second-to-last race, etc., until the tie is broken.
 scoringSchemeLowPointSystemFirstThreeWinsA82Only=Low Point System, First with three wins in medals is winner; A8.2 tie-break (last race)
 scoringSchemeLowPointSystemFirstThreeWinsA82OnlyDescription=Low Point System. The first in the medal series to win three races wins the medal series. A carry-forward column in the medal series can be used to model wins carried over. Tie-breaking in the opening series is based on A8.2 (last race, then second-to-last, etc.).

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java

@@ -49,6 +49,8 @@ import com.sap.sailing.domain.common.media.MediaTrackWithSecurityDTO;
 import com.sap.sailing.domain.common.security.SecuredDomainType.TrackedRaceActions;
 import com.sap.sailing.gwt.common.authentication.SailingAuthenticationEntryPointLinkFactory;
 import com.sap.sailing.gwt.common.client.NavigatorUtil;
+import com.sap.sailing.gwt.common.client.help.HelpButton;
+import com.sap.sailing.gwt.common.client.help.HelpButtonResources;
 import com.sap.sailing.gwt.settings.client.leaderboard.SingleRaceLeaderboardSettings;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveOwnSettings;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextDefinition;
@@ -117,6 +119,7 @@ import com.sap.sse.common.settings.Settings;
 import com.sap.sse.gwt.client.ErrorReporter;
 import com.sap.sse.gwt.client.async.AsyncActionsExecutor;
 import com.sap.sse.gwt.client.controls.slider.TimeSlider.BarOverlay;
+import com.sap.sse.gwt.client.formfactor.DeviceDetector;
 import com.sap.sse.gwt.client.panels.ResizableFlowPanel;
 import com.sap.sse.gwt.client.player.TimeRangeWithZoomModel;
 import com.sap.sse.gwt.client.player.Timer;
@@ -802,6 +805,14 @@ public class RaceBoardPanel
             final Label raceTimeLabel = computeRaceInformation(raceColumn, fleet);
             raceTimeLabel.setStyleName("RaceTime-Label");
             regattaAndRaceTimeInformationHeader.clear();
+            final FlowPanel helpButtonPanel = new FlowPanel();
+            final HelpButton helpButton = new HelpButton(HelpButtonResources.INSTANCE,
+                    stringMessages.videoGuide(), "https://support.sapsailing.com/hc/en-us/articles/7275243525148-Tracking-Race-Player-Overview");
+            if (!DeviceDetector.isMobile()) {
+                helpButtonPanel.add(helpButton);
+                helpButtonPanel.setStyleName("HelpButton");
+                regattaAndRaceTimeInformationHeader.add(helpButtonPanel);
+            }
             regattaAndRaceTimeInformationHeader.add(regattaNameAnchor);
             regattaAndRaceTimeInformationHeader.add(raceTimeLabel);
             final DataByLogo dataByLogo = new DataByLogo();
@@ -947,5 +958,6 @@ public class RaceBoardPanel
     public String getId() {
         return RaceBoardPerspectiveLifecycle.ID;
     }
+
 }