Merge remote-tracking branch 'origin/design2015'

2026-10-01 09:53:58 +00:00 · 2015-06-15 14:34:41 +02:00
commit 6ca43fa0a8
@@ -3,18 +3,13 @@
  			 xmlns:r="urn:import:com.sap.sailing.gwt.home.client.place.event.partials.raceListLive"
  			 xmlns:o="urn:import:com.sap.sailing.gwt.home.client.place.event.overview">
  	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
-  	<ui:style>
-  		.space-top {
-			margin-top: 2em;
-		}
-  	</ui:style>
  <g:HTMLPanel>
    <o:EventOverviewStage ui:field="stage" />
    <div class="{res.mediaCss.grid}">
      <div class="{res.mediaCss.small12} {res.mediaCss.columns}">
-        <r:RacesListLive ui:field="racesListLive" addStyleNames="{style.space-top}" />
+        <r:RacesListLive ui:field="racesListLive" addStyleNames="{res.mainCss.spacermargin} {res.mainCss.spacermargintopmediumbig}" />
      </div>
    </div>
-    <g:SimplePanel ui:field="content" addStyleNames="{style.space-top}" />
+    <g:SimplePanel ui:field="content" />
  </g:HTMLPanel>
 </ui:UiBinder>
@@ -1,52 +1,20 @@
-.countdown {
-  font-size: 1rem;
-}
-.countdown_content {
-  font-size: inherit;
-}
-.countdown_content_panewrapper {
-  font-size: 0;
-}
-.countdown_content_pane {
-  border: 0.2em solid #fff;
-  background: #008fcc;
-  color: #fff;
-  text-align: center;
-  display: inline-block;
-  margin-right: 0.333333333333333em;
-  padding: 0.666666666666667em 0.333333333333333em;
-  border-radius: 0.666666666666667em;
-  width: 4.666666666666667em;
-  height: 4.666666666666667em;
-  text-shadow: none;
-  box-shadow: 0 0 18px rgba(0,0,0,0.13), 0 2px 6px rgba(0,0,0,0.25);
-}
-.countdown_content_panefirst,
-.countdown_content_panesecond,
-.countdown_content_panethird,
-.countdown_content_panefourth {
-  font-size: 1rem;
-  text-transform: uppercase;
-}
-.countdown_content_pane_count {
-  font-weight: bold;
-  font-size: 2em;
-  line-height: 1em;
-}
-.countdown_content_pane_unit {
-  font-size: 0.8em;
-}
 .countdown {
  font-size: 1rem;
  position: relative;
  height: 28.333333333333332em;
-  margin-top: 1.333333333333333em;
 }
@media (max-width: 976px) {
  .countdown {
    height: 22em;
  }
 }
+.countdown_image {
+  width: 100%;
+  height: 100%;
+  background-size: 67.8em 50.46666666666667em;
+  background-position: center -0.933333333333333em;
+  background-image: url("../images/home/countdown-thumbnail.png");
+}
 .countdown_content {
  position: absolute;
  top: 50%;
@@ -63,12 +31,6 @@
  font-size: 1.466666666666667em;
  color: #f6f9fc;
 }
-.countdown_image {
-  width: 100%;
-  height: 100%;
-  background-size: cover;
-  background-position: center;
-}
 .countdown_info {
  position: absolute;
  bottom: 0;
@@ -95,7 +57,6 @@
  margin-top: 0.181818181818182em;
 }
 .countdown_info_lable {
-  width: 3.333333333333333em;
  display: inline-block;
  padding-left: 0.4em;
  margin-left: 1.333333333333333em;
@@ -21,6 +21,7 @@ import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
 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.gwt.home.client.place.event.partials.countdown.CountdownResources.LocalCss;
+import com.sap.sailing.gwt.home.client.place.event.partials.countdownTimer.CountdownTimer;
 import com.sap.sailing.gwt.home.client.shared.stage.StageResources;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.shared.dispatch.event.EventOverviewRaceTickerStageDTO;
@@ -72,7 +73,7 @@ public class Countdown extends Composite {
        }
        
        if(data.getStartTime() != null) {
-            this.tickerContainer.setWidget(new CountdownTicker(data.getStartTime()));
+            this.tickerContainer.setWidget(new CountdownTimer(data.getStartTime()));
        } else {
            this.tickerContainer.setWidget(null);
        }
@@ -12,17 +12,9 @@ public interface CountdownResources extends ClientBundle {

    public interface LocalCss extends CssResource {
        String countdown();
-        String countdown_content();
-        String countdown_content_panewrapper();
-        String countdown_content_pane();
-        String countdown_content_panefirst();
-        String countdown_content_panesecond();
-        String countdown_content_panethird();
-        String countdown_content_panefourth();
-        String countdown_content_pane_count();
-        String countdown_content_pane_unit();
-        String countdown_content_title();
        String countdown_image();
+        String countdown_content();
+        String countdown_content_title();
        String countdown_info();
        String countdown_info_text();
        String countdown_info_text_title();
@@ -1,14 +0,0 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
-<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" >
-	<ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.countdown.CountdownResources" />
-	<g:HTMLPanel ui:field="countdown" addStyleNames="{local_res.css.countdown_content_panewrapper}">
-		<div ui:field="majorContainer" class="{local_res.css.countdown_content_pane} {local_res.css.countdown_content_panefirst}">
-			<div ui:field="majorValue" class="{local_res.css.countdown_content_pane_count}"></div>
-			<div ui:field="majorUnit" class="{local_res.css.countdown_content_pane_unit}"></div>
-		</div>
-		<div ui:field="minorContainer" class="{local_res.css.countdown_content_pane} {local_res.css.countdown_content_panesecond}">
-			<div ui:field="minorValue" class="{local_res.css.countdown_content_pane_count}"></div>
-			<div ui:field="minorUnit" class="{local_res.css.countdown_content_pane_unit}"></div>
-		</div>
-	</g:HTMLPanel>
-</ui:UiBinder>
@@ -0,0 +1,41 @@
+/**
+ * Styles for countdown on the stage
+ */
+.countdowntimer {
+  font-size: 1rem;
+}
+.countdowntimer_content {
+  font-size: inherit;
+}
+.countdowntimer_content_panewrapper {
+  font-size: 0;
+}
+.countdowntimer_content_pane {
+  border: 0.2em solid #fff;
+  background: #008fcc;
+  color: #fff;
+  text-align: center;
+  display: inline-block;
+  margin-right: 0.333333333333333em;
+  padding: 0.666666666666667em 0.333333333333333em;
+  border-radius: 0.666666666666667em;
+  width: 4.666666666666667em;
+  height: 4.666666666666667em;
+  text-shadow: none;
+  box-shadow: 0 0 18px rgba(0,0,0,0.13), 0 2px 6px rgba(0,0,0,0.25);
+}
+.countdowntimer_content_panefirst,
+.countdowntimer_content_panesecond,
+.countdowntimer_content_panethird,
+.countdowntimer_content_panefourth {
+  font-size: 1rem;
+  text-transform: uppercase;
+}
+.countdowntimer_content_pane_count {
+  font-weight: bold;
+  font-size: 2em;
+  line-height: 1em;
+}
+.countdowntimer_content_pane_unit {
+  font-size: 0.8em;
+}
@@ -1,24 +1,24 @@
-package com.sap.sailing.gwt.home.client.place.event.partials.countdown;
+package com.sap.sailing.gwt.home.client.place.event.partials.countdownTimer;

 import java.util.Date;

 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;
+import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.home.client.shared.Countdown;
 import com.sap.sailing.gwt.home.client.shared.Countdown.CountdownListener;
 import com.sap.sailing.gwt.home.client.shared.Countdown.RemainingTime;
 import com.sap.sse.common.impl.MillisecondsTimePoint;

-public class CountdownTicker extends Composite {
+public class CountdownTimer extends Widget {

    private static CountdownTickerUiBinder uiBinder = GWT.create(CountdownTickerUiBinder.class);

-    interface CountdownTickerUiBinder extends UiBinder<Widget, CountdownTicker> {
+    interface CountdownTickerUiBinder extends UiBinder<Element, CountdownTimer> {
    }
    
    @UiField DivElement majorContainer, majorValue, majorUnit;
@@ -26,8 +26,9 @@ public class CountdownTicker extends Composite {

    private final Countdown countdown;

-    public CountdownTicker(Date startTime) {
-        initWidget(uiBinder.createAndBindUi(this));
+    public CountdownTimer(Date startTime) {
+        CountdownTimerResources.INSTANCE.css().ensureInjected();
+        setElement(uiBinder.createAndBindUi(this));
        this.countdown = new Countdown(new MillisecondsTimePoint(startTime), new CountdownTickerListener());
    }

@@ -0,0 +1,16 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<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">
+  <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.countdownTimer.CountdownTimerResources" />
+    <div class="{local_res.css.countdowntimer}">
+      <div class="{local_res.css.countdowntimer_content}">
+        <div ui:field="majorContainer" class="{local_res.css.countdowntimer_content_pane} {local_res.css.countdowntimer_content_panefirst}">
+          <div ui:field="majorValue" class="{local_res.css.countdowntimer_content_pane_count}"></div>
+          <div ui:field="majorUnit" class="{local_res.css.countdowntimer_content_pane_unit}"></div>
+        </div>
+        <div ui:field="minorContainer" class="{local_res.css.countdowntimer_content_pane} {local_res.css.countdowntimer_content_panesecond}">
+          <div ui:field="minorValue" class="{local_res.css.countdowntimer_content_pane_count}"></div>
+          <div ui:field="minorUnit" class="{local_res.css.countdowntimer_content_pane_unit}"></div>
+        </div>
+      </div>
+    </div>
+</ui:UiBinder>
@@ -0,0 +1,25 @@
+package com.sap.sailing.gwt.home.client.place.event.partials.countdownTimer;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.CssResource;
+
+public interface CountdownTimerResources extends ClientBundle {
+    public static final CountdownTimerResources INSTANCE = GWT.create(CountdownTimerResources.class);
+
+    @Source("CountdownTimer.gss")
+    LocalCss css();
+
+    public interface LocalCss extends CssResource {
+        String countdowntimer();
+        String countdowntimer_content();
+        String countdowntimer_content_panewrapper();
+        String countdowntimer_content_pane();
+        String countdowntimer_content_panefirst();
+        String countdowntimer_content_panesecond();
+        String countdowntimer_content_panethird();
+        String countdowntimer_content_panefourth();
+        String countdowntimer_content_pane_count();
+        String countdowntimer_content_pane_unit();
+    }
+}
@@ -7,7 +7,7 @@
    <o:EventOverviewStage ui:field="stage" />
    <div class="{res.mediaCss.grid}">
      <div class="{res.mediaCss.small12} {res.mediaCss.columns}">
-        <r:RacesListLive ui:field="racesListLive" />
+        <r:RacesListLive ui:field="racesListLive" addStyleNames="{res.mainCss.spacermargin} {res.mainCss.spacermargintopmediumbig}" />
      </div>
    </div>
  </g:HTMLPanel>
@@ -340,8 +340,8 @@ public class HomeServiceImpl extends ProxiedRemoteServiceServlet implements Home
            dto.setType(dto.getRegattas().size() == 1 ? EventType.SINGLE_REGATTA: EventType.MULTI_REGATTA);
        }
        
-        // TODO fmittag: put in correct event ID
-        if("406cffc2-b491-4f7e-b78e-a21abd97006a".equals(event.getId().toString())) {
+        // Special solution for Kieler Woche 2015
+        if("a9d6c5d5-cac3-47f2-9b5c-506e441819a1".equals(event.getId().toString())) {
            dto.setSailorsInfoURL("http://sailorsinfo.kieler-woche.de/");
        }