Event overview mobile - Fixed UI fields in event header

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss

@@ -81,12 +81,15 @@
 .eventheader_info_subtitlereduced {
   display: none;
 }
-img.eventheader_info_subtitle_logo {
+.eventheader_info_subtitle_logo {
   width: 2.692307692307693em;
   height: 2.692307692307693em;
   display: inline-block;
   vertical-align: top;
   background: #f6f9fc;
+  background-position: center;
+  background-size: contain;
+  background-repeat: no-repeat;
 }
 .eventheader_info_subtitle_info {
   display: inline-block;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.java

@@ -2,7 +2,6 @@ package com.sap.sailing.gwt.home.mobile.partials.eventheader;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.ImageElement;
 import com.google.gwt.dom.client.SpanElement;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -21,7 +20,7 @@ public class EventHeader extends Composite {
     
     @UiField SpanElement eventNameUi;
     @UiField DivElement eventStateUi;
-    @UiField ImageElement eventLogoUi;
+    @UiField DivElement eventLogoUi;
     @UiField DivElement eventDateUi;
     @UiField DivElement eventLocationUi;
 
@@ -37,6 +36,6 @@ public class EventHeader extends Composite {
         LabelTypeUtil.renderLabelType(eventStateUi, event.getState().getStateMarker());
         LogoUtil.setEventLogo(eventLogoUi, event);
         eventDateUi.setInnerText(EventDatesFormatterUtil.formatDateRangeWithoutYear(event.getStartDate(), event.getEndDate()));
-        eventLocationUi.setInnerText(event.getLocationOrVenue());
+        eventLocationUi.setInnerText(event.getLocationAndVenueAndCountry());
     }
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml

@@ -26,7 +26,7 @@
 					</div>
 					<div class="{local_res.css.eventheader_info_subtitle}">
 						<!-- IF event.logo -->
-						<img ui:field="eventLogoUi" class="{local_res.css.eventheader_info_subtitle_logo}" />
+						<div ui:field="eventLogoUi" class="{local_res.css.eventheader_info_subtitle_logo}"> </div>
 						<!-- IF END -->
 						<div class="{local_res.css.eventheader_info_subtitle_info}">
 							<!-- IF (event.name || event.date) -->

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/eventview/EventViewDTO.java

@@ -110,4 +110,12 @@ public class EventViewDTO extends EventMetadataDTO {
     public void setSailorsInfoURL(String sailorsInfoURL) {
         this.sailorsInfoURL = sailorsInfoURL;
     }
+    
+    public String getLocationAndVenueAndCountry() {
+        String venue = getLocationAndVenue();
+        if(getVenueCountry() != null && !getVenueCountry().isEmpty()) {
+            return venue + ", " + getVenueCountry();
+        }
+        return venue;
+    }
 }