Merge remote-tracking branch 'origin/newhome'

2026-10-08 13:20:57 +00:00 · 2014-08-09 18:55:28 +02:00
commit 8e5d208056
@@ -20,7 +20,8 @@ public interface TextMessages extends Messages {
    String officalEventWebsite();
    String leg();
    String races();
-    String showEvent();
+    String moreInfo();
+    String viewAnalysis();
    String overallLeaderboard();
    
    String countdownDays();
@@ -12,7 +12,8 @@ fullEventSchedule=Full event schedule
 officalEventWebsite=Official event website
 leg=Leg
 races=Races
-showEvent=Show event
+moreInfo=More info
+viewAnalysis=View analysis 
 overallLeaderboard=Overall leaderboard

 countdownDays=Days
@@ -9,11 +9,12 @@ search=Suche
 german=Deutsch
 english=English
 fullEventSchedule=Gesamter Veranstaltungsplan
-officalEventWebsite=Ofizielle Veranstaltungs Internetseite
+officalEventWebsite=Offizielle Internetseite
 leg=Schenkel
 races=Rennen
-showEvent=Zeige Veranstaltung
-overallLeaderboard=Overall-Ergebnisse
+moreInfo=Weitere Informationen
+viewAnalysis=Analyzen ansehen
+overallLeaderboard=Gesamtergebnis

 countdownDays=Tage
 countdownHours=Std.
@@ -24,8 +25,8 @@ countdownHour=Std.
 countdownMinute=Min.
 countdownSecond=Sek.
 live=Live
-finished=beendet
-watchNow=Jetzt angucken
+finished=Beendet
+watchNow=Jetzt mitverfolgen
 lastUpdate=Letztes Update
 leaderBoard=Ergebnisliste
 boxNewsUpdateMoreLink=Neuigkeiten berichten
@@ -100,15 +100,20 @@
  font-size: 1rem;
 }
 .eventheader_intro_logo {
-  border: solid 5px #fff;
  -webkit-box-shadow: 0 0 5px rgba(204,204,204,0.25);
  box-shadow: 0 0 5px rgba(204,204,204,0.25);
  position: absolute;
  top: 0;
  left: 0;
-  max-width: 140px !important;
+  max-width: 140px;
+  max-height: 140px;
+  width: auto;
  height: auto;
 }
+.eventheader_intro_logo_image {
+  border: solid 5px #fff;
+  max-height: 100%;
+}
 .eventheader_intro_name {
  display: inline-block;
  margin: 0 0.333333333333333em 0 0;
@@ -30,7 +30,7 @@
    <div class="{res.mainCss.grid}">
      <div class="{res.mediaCss.small9} {res.mediaCss.large8} {res.mediaCss.columns}">
        <div class="{local_res.css.eventheader_intro}">
-          <img ui:field="eventLogo" alt="" class="{local_res.css.eventheader_intro_logo}"></img>
+          <div class="{local_res.css.eventheader_intro_logo}"><img ui:field="eventLogo" alt="" class="{local_res.css.eventheader_intro_logo_image}"></img></div>
          <h3 class="{local_res.css.eventheader_intro_name}"><span ui:field='eventNameSpan' /></h3>
          <div ui:field="isLiveDiv" data-labeltype="live" class="{res.mainCss.label}"><ui:text from='{i18n.live}'/></div>
          <div ui:field="isFinishedDiv" data-labeltype="finished" class="{res.mainCss.label}"><ui:text from='{i18n.finished}'/></div>
@@ -38,7 +38,7 @@
            <div ui:field="regattaNameInSeriesDiv" class="{local_res.css.eventheader_intro_details_item}"></div>
            <div ui:field="eventDateDiv" class="{local_res.css.eventheader_intro_details_item}"></div>
            <div class="{local_res.css.eventheader_intro_details_item}">
-                <img src="images/location-icon.png" class="{local_res.css.locationicon}"></img>
+                <img src="images/home/location-icon.png" class="{local_res.css.locationicon}"></img>
                <span ui:field='venueNameSpan' />
            </div>
           	<g:Anchor ui:field="officalWebsiteAnchor" href="javascript:;" target="_blank" styleName="{local_res.css.eventheader_intro_details_item} {local_res.css.eventheader_intro_details_itemlink}" />
@@ -18,6 +18,7 @@
 .eventheader_intro {}
 .eventheader_intro_description {}
 .eventheader_intro_logo {}
+.eventheader_intro_logo_image {}
 .eventheader_intro_name {}
 .eventheader_intro_details {}
 .eventheader_intro_details_item {}
@@ -36,6 +36,7 @@ public interface EventHeaderResources extends ClientBundle {
        String eventheader_intro();
        String eventheader_intro_description();
        String eventheader_intro_logo();
+        String eventheader_intro_logo_image();
        String eventheader_intro_name();
        String eventheader_intro_details();
        String eventheader_intro_details_item();
@@ -19,8 +19,9 @@ public class LiveStageTeaserBand extends StageTeaserBand {
        bandTitle.setInnerText(event.getName());
        bandSubtitle.setInnerText(EventDatesFormatterUtil.formatDateRangeWithYear(event.startDate, event.endDate));

+        isLiveDiv.getStyle().setDisplay(Display.INLINE_BLOCK);
        actionLink.getStyle().setDisplay(Display.INLINE_BLOCK);
-        actionLink.setInnerText(TextMessages.INSTANCE.showEvent());
+        actionLink.setInnerText(TextMessages.INSTANCE.watchNow());
    }

    @Override
@@ -1,7 +1,6 @@
 package com.sap.sailing.gwt.home.client.shared.stage;

 import com.google.gwt.dom.client.Style.Display;
-import com.google.gwt.dom.client.Style.Visibility;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigator;
 import com.sap.sailing.gwt.ui.shared.EventBaseDTO;

@@ -14,10 +13,9 @@ public class PopularEventStageTeaser extends StageTeaser {
        subtitle.setInnerText(event.venue.getName());
        
        countdown.getStyle().setDisplay(Display.NONE);
-        countdown.getStyle().setVisibility(Visibility.HIDDEN);
        
        bandCount.setAttribute("data-bandcount", "1");
-        
-        stageTeaserBandsPanel.getElement().appendChild(new NoActionStageTeaserBand(event, placeNavigator).getElement());
+     
+        stageTeaserBandsPanel.getElement().appendChild(new PopularEventStageTeaserBand(event, placeNavigator).getElement());
    }
 }
@@ -0,0 +1,31 @@
+package com.sap.sailing.gwt.home.client.shared.stage;
+
+import com.google.gwt.dom.client.Style.Display;
+import com.sap.sailing.gwt.home.client.app.PlaceNavigator;
+import com.sap.sailing.gwt.home.client.i18n.TextMessages;
+import com.sap.sailing.gwt.home.client.shared.EventDatesFormatterUtil;
+import com.sap.sailing.gwt.ui.shared.EventBaseDTO;
+
+/**
+ * Teaser band for a popular but finished event on the homepage stage
+ * @author Frank
+ *
+ */
+public class PopularEventStageTeaserBand extends StageTeaserBand {
+
+    public PopularEventStageTeaserBand(EventBaseDTO event, PlaceNavigator placeNavigator) {
+        super(event, placeNavigator);
+ 
+        bandTitle.setInnerText(event.getName());
+        bandSubtitle.setInnerText(EventDatesFormatterUtil.formatDateRangeWithYear(event.startDate, event.endDate));
+
+        actionLink.getStyle().setDisplay(Display.INLINE_BLOCK);
+        actionLink.setInnerText(TextMessages.INSTANCE.viewAnalysis());
+    }
+
+    @Override
+    public void actionLinkClicked() {
+        EventBaseDTO event = getEvent();
+        getPlaceNavigator().goToEvent(event.id.toString(), event.getBaseURL(), event.isOnRemoteServer());
+    }
+}
@@ -23,6 +23,7 @@ public abstract class StageTeaserBand extends UIObject {
    @UiField SpanElement bandTitle;
    @UiField SpanElement bandSubtitle;
    @UiField AnchorElement actionLink;
+    @UiField DivElement isLiveDiv;

    private final PlaceNavigator placeNavigator;
    private final EventBaseDTO event;
@@ -34,6 +35,8 @@ public abstract class StageTeaserBand extends UIObject {
        StageResources.INSTANCE.css().ensureInjected();
        setElement(uiBinder.createAndBindUi(this));
        
+        isLiveDiv.getStyle().setDisplay(Display.NONE);
+
        Event.sinkEvents(actionLink, Event.ONCLICK);
        Event.setEventListener(actionLink, new EventListener() {
            @Override
@@ -8,7 +8,10 @@
 <div class="{local_res.css.stageteaser_content_band_item} {res.mediaCss.columns}">
  <div class="{local_res.css.stageteaser_content_band_text}">
    <div class="{local_res.css.stageteaser_content_band_text_headline}"><span ui:field="bandTitle" /></div>
-    <div class="{local_res.css.stageteaser_content_band_text_name}"><span ui:field="bandSubtitle" /></div>
+    <div class="{local_res.css.stageteaser_content_band_text_name}">
+        <span ui:field="bandSubtitle" />&nbsp;&nbsp;&nbsp;
+        <div ui:field="isLiveDiv" data-labeltype="live" class="{res.mainCss.label}"><ui:text from='{i18n.live}'/></div>
+    </div>
  </div>
  <a href="javascript:;" ui:field="actionLink" class="{res.mainCss.button} {local_res.css.stageteaser_content_band_action}" />
 </div>
@@ -20,7 +20,7 @@ public class UpcomingEventStageTeaserBand extends StageTeaserBand {
        bandSubtitle.setInnerText(EventDatesFormatterUtil.formatDateRangeWithYear(event.startDate, event.endDate));

        actionLink.getStyle().setDisplay(Display.INLINE_BLOCK);
-        actionLink.setInnerText(TextMessages.INSTANCE.showEvent());
+        actionLink.setInnerText(TextMessages.INSTANCE.moreInfo());
    }

    @Override