Merge branch 'master' into bug2970

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties

@@ -108,8 +108,8 @@ eventRegattaRaceWinner=Winner
 eventRegattaRaceLeader=Leader
 eventRegattaRacesLegendGps=Tracking
 eventRegattaRacesLegendWind=Wind Data
-eventRegattaRacesLegendVideo=Video Stream
-eventRegattaRacesLegendAudio=Audio Stream
+eventRegattaRacesLegendVideo=Video
+eventRegattaRacesLegendAudio=Audio
 eventSponsorsTitle=Event Sponsorships
 footerJobs=Jobs
 footerCopyright=\u00A9 2015 SAP Sailing Analytics

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties

@@ -108,8 +108,8 @@ eventRegattaRaceWinner=Gewinner
 eventRegattaRaceLeader=Führender
 eventRegattaRacesLegendGps=Tracking
 eventRegattaRacesLegendWind=Winddaten
-eventRegattaRacesLegendVideo=Video Stream
-eventRegattaRacesLegendAudio=Audio Stream
+eventRegattaRacesLegendVideo=Video
+eventRegattaRacesLegendAudio=Audio
 eventSponsorsTitle=Veranstaltungssponsoren
 footerJobs=Jobs
 footerCopyright=\u00A9 2015 SAP Sailing Analytics

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties

@@ -138,8 +138,8 @@ eventRegattaRaceWinner=Winner
 eventRegattaRaceLeader=Leader
 eventRegattaRacesLegendGps=Tracking
 eventRegattaRacesLegendWind=Wind Data
-eventRegattaRacesLegendVideo=Video Stream
-eventRegattaRacesLegendAudio=Audio Stream
+eventRegattaRacesLegendVideo=Video
+eventRegattaRacesLegendAudio=Audio
 eventSponsorsTitle=Event Sponsorships
 footerJobs=Jobs
 footerCopyright=\u00A9 2015 ＳＡＰ帆船

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.gss

@@ -135,6 +135,9 @@
   color: #ccc;
   font-weight: 700;
 }
+.eventregattarace_racetime {
+  white-space: nowrap;
+}
 .eventregattarace_flag {
   display: none;
   width: 9%;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.ui.xml

@@ -23,7 +23,7 @@
         <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemgps}"><ui:text from='{i18n.eventRegattaRacesLegendGps}'/></div>
         <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemwind}"><ui:text from='{i18n.eventRegattaRacesLegendWind}'/></div>
         <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemvideo}"><ui:text from='{i18n.eventRegattaRacesLegendVideo}'/></div>
-        <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemaudio}"><ui:text from='{i18n.eventRegattaRacesLegendAudio}'/></div>
+<!-- <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemaudio}"><ui:text from='{i18n.eventRegattaRacesLegendAudio}'/></div>-->
       </div>
       <g:HTMLPanel ui:field="regattaPhasesPanel" />
     </div>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.java

@@ -16,9 +16,9 @@ import com.sap.sailing.domain.common.dto.CompetitorDTO;
 import com.sap.sailing.domain.common.dto.FleetDTO;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
 import com.sap.sailing.domain.common.dto.RaceDTO;
+import com.sap.sailing.domain.common.dto.RaceDTO.RaceLiveState;
 import com.sap.sailing.gwt.home.client.place.event.EventView;
 import com.sap.sailing.gwt.home.client.place.event.EventView.Presenter;
-import com.sap.sailing.domain.common.dto.RaceDTO.RaceLiveState;
 import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO;
 
 public class EventRegattaRacesRace extends Composite {
@@ -28,10 +28,9 @@ public class EventRegattaRacesRace extends Composite {
     }
 
     @UiField DivElement fleetColor;
-    @UiField SpanElement raceName;
+    @UiField DivElement raceName;
     @UiField SpanElement raceName2;
-    @UiField SpanElement raceState;
-    @UiField SpanElement raceTime;
+    @UiField DivElement raceTime;
     @UiField SpanElement averageRaceWind;
     
     @UiField DivElement raceNotTrackedDiv;
@@ -54,13 +53,13 @@ public class EventRegattaRacesRace extends Composite {
     
     @UiField DivElement featureGPS;
     @UiField DivElement featureWind;
-    @UiField DivElement featureAudio;
+    // @UiField DivElement featureAudio;
     @UiField DivElement featureVideo;
     
     @UiField SpanElement currentLegNo;
     @UiField SpanElement totalLegsCount;
     
-    private final DateTimeFormat raceTimeFormat = DateTimeFormat.getFormat("EEE, h:mm a");
+    private final DateTimeFormat raceTimeFormat = DateTimeFormat.getFormat("EEE, HH:mm");
     
     private final RaceDTO race;
 
@@ -168,11 +167,13 @@ public class EventRegattaRacesRace extends Composite {
         } else {
             featureVideo.setTitle(String.valueOf(race.trackedRaceStatistics.videoTracksCount));
         }
+        /* not used for now 
         if(!race.trackedRaceStatistics.hasAudioData) {
             featureAudio.addClassName(EventRegattaRacesResources.INSTANCE.css().eventregattarace_featureunavailable());
         } else {
             featureAudio.setTitle(String.valueOf(race.trackedRaceStatistics.audioTracksCount));
         }
+        */
     }
     
     private void hideElement(Element el) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.ui.xml

@@ -9,9 +9,11 @@
   <div ui:field="fleetColor" class="{local_res.css.eventregattarace_fleetindicator}"></div>
   <!-- race name  -->
   <div class="{local_res.css.eventregattarace_details} {local_res.css.eventregattarace_name}">
-      <span ui:field="raceName" class="{local_res.css.eventregattarace_nameshort}"></span>
-      <ui:text from='{i18n.eventRegattaRaceRace}'/>&nbsp;<span ui:field="raceName2" /><br></br>
-      <span ui:field="raceState" />&nbsp;<span ui:field="raceTime" />
+      <div ui:field="raceName" class="{local_res.css.eventregattarace_nameshort}"></div>
+      <div>
+	      <div><ui:text from='{i18n.eventRegattaRaceRace}'/>&nbsp;<span ui:field="raceName2" /></div>
+	      <div ui:field="raceTime" class="{local_res.css.eventregattarace_racetime}" />
+      </div>
   </div>
   <!-- race state  if race.isScheduled and race.isTracked -->
   <div ui:field="raceFlagDiv" class="{local_res.css.eventregattarace_details} {local_res.css.eventregattarace_flag}">
@@ -36,7 +38,7 @@
     <div ui:field="featureGPS" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featuregps}"></div>
     <div ui:field="featureWind" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featurewind}"></div>
     <div ui:field="featureVideo" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featurevideo}"></div>
-    <div ui:field="featureAudio" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featureaudio}"></div>
+    <!--<div ui:field="featureAudio" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featureaudio}"></div> -->
   </div>
   <div ui:field="raceNotTrackedDiv" class="{local_res.css.eventregattarace_action} {local_res.css.eventregattarace_actiondisabled}">
       <ui:text from='{i18n.eventRegattaRaceNotTracked}'/>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesResources.java

@@ -33,6 +33,7 @@ public interface EventRegattaRacesResources extends ClientBundle {
         String eventregattarace_details();
         String eventregattarace_name();
         String eventregattarace_nameshort();
+        String eventregattarace_racetime();
         String eventregattarace_flag();
         String eventregattarace_wind();
         String eventregattarace_wind_strength();

wiki/event-network-with-replica.md

@@ -11,7 +11,7 @@
 ## Scenarios
 ### Standard FritzBox / ... network
 If you have a given network setup (without own router) I would suggest the following solution:
-The server has three network adapters to connect to multiple networks at the same time (e.g. Cube and Lounge,..). You could simply integrate the server into all networks and set up a static ip on each of the networks for the server. then simply configure the sailing instance to listen on all interfaces and that should be it. You could additionally use the replica's DNS server to also overwrite `event.sapsailing.com` URL's but therefore you need to tell each router of the network to server the replica as DNS server to other LAN clients.
+The server has three network adapters to connect to multiple networks at the same time (e.g. Cube and Lounge,..). You could simply integrate the server into all networks and set up a static ip on each of the networks for the server. then simply configure the sailing instance to listen on all interfaces and that should be it. You could additionally use the replica's DNS server to also overwrite `event.sapsailing.com` URL's but therefore you need to tell each router of the network to serve the replica as DNS server to other LAN clients.
 
 ### Single WAN uplink (Meraki)
 - Create 3 VLAN's with (VLAN-ID 10=>ADMIN,20=>CUBE,30=>GUEST)