- 
+ 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/EventHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/EventHeaderResources.java
index c4ccbc278e1..f2e43ca7729 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/EventHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/EventHeaderResources.java
@@ -1,14 +1,18 @@
package com.sap.sailing.gwt.home.desktop.partials.eventheader;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface EventHeaderResources extends ClientBundle {
+public interface EventHeaderResources extends SharedDesktopResources {
public static final EventHeaderResources INSTANCE = GWT.create(EventHeaderResources.class);
@Source("EventHeader.gss")
LocalCss css();
+
+ @Source("location-icon.png")
+ ImageResource location();
public interface LocalCss extends CssResource {
String jsdropdown();
@@ -27,7 +31,6 @@ public interface EventHeaderResources extends ClientBundle {
String leaderboardquickaccess();
String eventheader();
String eventheader_breadcrumb();
- String eventheader_breadcrumbback();
String eventheader_intro();
String eventheader_intro_logo();
String eventheader_intro_logo_image();
diff --git a/java/com.sap.sailing.gwt.ui/images/home/location-icon.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/location-icon.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/location-icon.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/location-icon.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsrecent/EventsOverviewRecentYear.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsrecent/EventsOverviewRecentYear.ui.xml
index efa584f5c1d..5321448b777 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsrecent/EventsOverviewRecentYear.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsrecent/EventsOverviewRecentYear.ui.xml
@@ -3,6 +3,7 @@
+
- 
+ 
+
- 
+ 
@@ -30,7 +31,7 @@
+
@@ -30,7 +31,7 @@
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingResources.java
index 26e871d5cee..b33e951f522 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingResources.java
@@ -3,12 +3,16 @@ package com.sap.sailing.gwt.home.desktop.partials.eventsupcoming;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
public interface EventsOverviewUpcomingResources extends ClientBundle {
public static final EventsOverviewUpcomingResources INSTANCE = GWT.create(EventsOverviewUpcomingResources.class);
@Source("EventsOverviewUpcoming.gss")
LocalCss css();
+
+ @Source("upcoming-events-icon.png")
+ ImageResource upcomingEvents();
public interface LocalCss extends CssResource {
String accordion();
diff --git a/java/com.sap.sailing.gwt.ui/images/home/upcoming-events-icon.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/upcoming-events-icon.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/upcoming-events-icon.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/upcoming-events-icon.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.gss
index 42758085648..719abdb726e 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.gss
@@ -112,16 +112,16 @@
background-repeat: no-repeat;
background-position: center center;
background-size: contain;
- background-image: url('images/home/loggedout.svg');
+ background-image: resourceUrl('loggedoutOpen');
margin-left: 1rem;
cursor: pointer;
}
.user_menu_button.open {
- background-image: url('images/home/loggedout-open.svg');
+ background-image: resourceUrl('loggedout');
}
.user_menu_button.loggedin {
- background-image: url('images/home/loggedin.svg');
+ background-image: resourceUrl('loggedin');
}
.user_menu_button.loggedin.open {
- background-image: url('images/home/loggedin-open.svg');
+ background-image: resourceUrl('loggedinOpen');
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/HeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/HeaderResources.java
index d432431aaf4..3d20dc18e84 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/HeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/HeaderResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.header;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sse.security.ui.authentication.generic.resource.AuthenticationResources;
-public interface HeaderResources extends ClientBundle {
+public interface HeaderResources extends AuthenticationResources {
public static final HeaderResources INSTANCE = GWT.create(HeaderResources.class);
@Source("Header.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMedia.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMedia.gss
similarity index 87%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMedia.css
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMedia.gss
index 71352f498a7..5921259ba1f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMedia.css
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMedia.gss
@@ -1,6 +1,6 @@
.media {
- font-size: 15px;
- font-size: 1rem;
+ /* @alternate */ font-size: 15px;
+ /* @alternate */ font-size: 1rem;
}
.media_swipecontainer {
@@ -37,7 +37,7 @@
transform: translate(0, -50%);
width: 60px;
height: 60px;
- background-image: url("images/home/media-controls__arrows.png");
+ background-image: resourceUrl("mediaControlsArrows");
}
.media_slideshow_controlsprev {
@@ -59,7 +59,7 @@
}
.media_slideshow_controlsfullsize {
- background-image: url("images/home/media-controls__fullsize.png");
+ background-image: resourceUrl("mediaControlsFullsize");
right: 0;
bottom: 0;
width: 40px;
@@ -76,8 +76,8 @@
}
.videopreview {
- font-size: 15px;
- font-size: 1rem;
+ /* @alternate */ font-size: 15px;
+ /* @alternate */ font-size: 1rem;
margin-bottom: 2.666666666666667em;
}
@@ -93,7 +93,7 @@
transform: translate(-50%, 0);
width: 69px;
height: 69px;
- background: url("images/home/video__preview--play.png");
+ background: resourceUrl("videoPreviewPlay");
-webkit-background-size: contain;
-moz-background-size: contain;
background-size: contain;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMediaResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMediaResources.java
index 272acae4b70..00a429faf60 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMediaResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMediaResources.java
@@ -3,12 +3,22 @@ package com.sap.sailing.gwt.home.desktop.partials.mainmedia;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
public interface MainMediaResources extends ClientBundle {
public static final MainMediaResources INSTANCE = GWT.create(MainMediaResources.class);
- @Source("MainMedia.css")
+ @Source("MainMedia.gss")
LocalCss css();
+
+ @Source("media-controls__arrows.png")
+ ImageResource mediaControlsArrows();
+
+ @Source("media-controls__fullsize.png")
+ ImageResource mediaControlsFullsize();
+
+ @Source("video__preview--play.png")
+ ImageResource videoPreviewPlay();
public interface LocalCss extends CssResource {
String media();
diff --git a/java/com.sap.sailing.gwt.ui/images/home/media-controls__arrows.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/media-controls__arrows.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/media-controls__arrows.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/media-controls__arrows.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/media-controls__fullsize.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/media-controls__fullsize.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/media-controls__fullsize.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/media-controls__fullsize.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/video__preview--play.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/video__preview--play.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/video__preview--play.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/video__preview--play.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java
index d68fa1042c9..1999b2af22b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java
@@ -15,6 +15,7 @@ import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.partials.fullscreen.FullscreenContainer;
import com.sap.sailing.gwt.home.shared.places.event.EventDefaultPlace;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
import com.sap.sse.gwt.client.controls.carousel.ImageCarousel.FullscreenViewer;
/**
@@ -29,7 +30,7 @@ public class SailingFullscreenViewer extends FullscreenContainer implements
LeaderboardDelegate {
- protected final Image autoRefreshControl = new Image("images/home/reload.svg");
- protected final Image settingsControl = new Image("images/home/settings.svg");
+ protected final Image autoRefreshControl = new Image(SharedHomeResources.INSTANCE.reload().getSafeUri());
+ protected final Image settingsControl = new Image(SharedHomeResources.INSTANCE.settings().getSafeUri());
private final static BusyIndicatorResources RESOURCES = GWT.create(BusyIndicatorResources.class);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/EventRegattaLeaderboard.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/EventRegattaLeaderboard.gss
index c19abc8c77e..810a0eae1fd 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/EventRegattaLeaderboard.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/EventRegattaLeaderboard.gss
@@ -99,7 +99,7 @@
}
.regattaleaderboard_meta_reload {
background-color: #9f9f9f;
- background-image: url("images/home/reload.svg");
+ background-image: resourceUrl("reload");
}
.regattaleaderboard_meta_reload_live {
background-color: red;
@@ -138,7 +138,7 @@
}
.regattaleaderboard_meta_settings_button {
background-color: #9f9f9f;
- background-image: url("images/home/settings.svg");
+ background-image: resourceUrl("settings");
}
.regattaleaderboard_table {
margin-bottom: 20px;
@@ -194,7 +194,7 @@
margin-right: 0.333333333333333em;
background-repeat: no-repeat;
background-position: center center;
- background-image: url("images/home/arrow-down-yellow.png");
+ background-image: resourceUrl("arrowDownYellow");
}
.regattaleaderboard_header_itemascending:before,
.regattaleaderboard_header_itemdata_elementascending:before {
@@ -206,7 +206,7 @@
margin-right: 0.333333333333333em;
background-repeat: no-repeat;
background-position: center center;
- background-image: url("images/home/arrow-up-yellow.png");
+ background-image: resourceUrl("arrowUpYellow");
}
.regattaleaderboard_header_table {
width: 100%;
@@ -242,9 +242,9 @@
}
.regattaleaderboard_meta_fullscreen_button {
background-color: #9f9f9f;
- background-image: url("images/home/fullscreen.svg");
+ background-image: resourceUrl("fullscreen");
}
.regattaleaderboard_meta_liveraces_button {
background-color: #9f9f9f;
- background-image: url("images/home/liveraces.svg");
+ background-image: resourceUrl("liveraces");
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/EventRegattaLeaderboardResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/EventRegattaLeaderboardResources.java
index 32653ee9e3d..ee43a0ba756 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/EventRegattaLeaderboardResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/EventRegattaLeaderboardResources.java
@@ -1,14 +1,21 @@
package com.sap.sailing.gwt.home.desktop.partials.old;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface EventRegattaLeaderboardResources extends ClientBundle {
+public interface EventRegattaLeaderboardResources extends SharedDesktopResources {
public static final EventRegattaLeaderboardResources INSTANCE = GWT.create(EventRegattaLeaderboardResources.class);
@Source("EventRegattaLeaderboard.gss")
LocalCss css();
+
+ @Source("arrow-down-yellow.png")
+ ImageResource arrowDownYellow();
+
+ @Source("arrow-up-yellow.png")
+ ImageResource arrowUpYellow();
public interface LocalCss extends CssResource {
String leaderboardcompetitor();
diff --git a/java/com.sap.sailing.gwt.ui/images/home/arrow-down-yellow.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/arrow-down-yellow.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/arrow-down-yellow.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/arrow-down-yellow.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/arrow-up-yellow.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/arrow-up-yellow.png
new file mode 100644
index 00000000000..360e4007a62
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/arrow-up-yellow.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/leaderboard/OldLeaderboardDelegateFullscreenViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/leaderboard/OldLeaderboardDelegateFullscreenViewer.java
index 6589ae44ce0..a22f9e86722 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/leaderboard/OldLeaderboardDelegateFullscreenViewer.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/old/leaderboard/OldLeaderboardDelegateFullscreenViewer.java
@@ -11,6 +11,7 @@ import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.gwt.home.desktop.partials.old.AbstractLeaderboardFullscreenViewer;
import com.sap.sailing.gwt.home.desktop.partials.old.leaderboard.OldLeaderboard.OldLeaderboardDelegate;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
public class OldLeaderboardDelegateFullscreenViewer extends AbstractLeaderboardFullscreenViewer
implements OldLeaderboardDelegate {
@@ -22,7 +23,7 @@ public class OldLeaderboardDelegateFullscreenViewer extends AbstractLeaderboardF
private static OldLeaderboardDelegateFullscreenViewerUiBinder uiBinder = GWT
.create(OldLeaderboardDelegateFullscreenViewerUiBinder.class);
- private final Image showLiveRacesControl = new Image("images/home/liveraces.svg");
+ private final Image showLiveRacesControl = new Image(SharedDesktopResources.INSTANCE.liveraces().getSafeUri());
private final Label hasLiveRace = new Label();
private final Widget headerWidget;
private final ContentLayout contentLayout = new ContentLayout();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceList.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceList.gss
index 33566e9022b..dc3046eec7f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceList.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceList.gss
@@ -72,11 +72,6 @@
min-width: 13.333333333333334em;
max-width: 16.666666666666668em;
}
-img.race_item_flag {
- vertical-align: middle;
- height: 1em;
- width: auto;
-}
.race_item_position {
margin-right: 0.333333333333333em;
}
@@ -230,4 +225,34 @@ img.race_item_flag {
}
.racesListHideColumn > * {
display: none !important;
+}
+.iconGPS, .iconWind, .iconVideo, .iconAudio{
+ position: relative;
+ display: none;
+ margin-left: 0.666666666666667em;
+ padding-left: 2.333333333333333em;
+ background-size: 1.666666666666667rem 1.666666666666667rem;
+ background-position: left;
+ background-repeat: no-repeat;
+}
+.iconGPS {
+ background-image: resourceUrl('gpsFixes');
+}
+.iconWind {
+ background-image: resourceUrl('wind');
+}
+.iconVideo {
+ background-image: resourceUrl('video');
+ border-left: 1px solid #ccc;
+}
+.iconAudio {
+ background-image: resourceUrl('audio');
+ border-left: 1px solid #ccc;
+}
+.legend {
+ text-align: right;
+ vertical-align: baseline;
+ line-height: 1.333em;
+ padding-right:0px;
+ margin: 0 0 .5em;
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListColumnFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListColumnFactory.java
index 67bff5d364b..7c065a84086 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListColumnFactory.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListColumnFactory.java
@@ -19,7 +19,6 @@ import com.google.gwt.safehtml.client.SafeHtmlTemplates;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.safehtml.shared.SafeUri;
-import com.google.gwt.safehtml.shared.UriUtils;
import com.google.gwt.user.cellview.client.SafeHtmlHeader;
import com.sap.sailing.domain.common.SortingOrder;
import com.sap.sailing.gwt.home.communication.event.LiveRaceDTO;
@@ -36,6 +35,7 @@ import com.sap.sailing.gwt.home.desktop.partials.racelist.RaceListResources.Loca
import com.sap.sailing.gwt.home.desktop.partials.raceviewerlaunchpad.RaceviewerLaunchPadCell;
import com.sap.sailing.gwt.home.desktop.partials.raceviewerlaunchpad.RaceviewerLaunchPadController;
import com.sap.sailing.gwt.home.desktop.places.event.EventView;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
import com.sap.sailing.gwt.home.shared.utils.HomeSailingFlagsBuilder;
import com.sap.sailing.gwt.regattaoverview.client.FlagsMeaningExplanator;
import com.sap.sailing.gwt.ui.client.FlagImageResolver;
@@ -57,11 +57,11 @@ public class RaceListColumnFactory {
@Template("{3}")
SafeHtml viewStateRunning(String styleNamesBar, String styleNamesProgress, SafeStyles width, String text);
- @Template("![](\"images/home/windkompass_nord.svg\"/)
")
- SafeHtml windDirection(SafeStyles rotation);
+ @Template("![](\"{1}\"/)
")
+ SafeHtml windDirection(SafeStyles rotation, SafeUri imageUrl);
- @Template("![](\"{3}\")
{4}{5}")
- SafeHtml winner(String styleNamesFlag, String styleNamesSailId, String styleNamesText, SafeUri flagImageURL, String sailId, String name);
+ @SafeHtmlTemplates.Template("{3}{4}")
+ SafeHtml winner(String styleNamesSailId, String styleNamesText, String flagImageURL, String sailId, String name);
@Template("![](\"{1}\")
")
SafeHtml imageHeader(String styleNames, SafeUri imageURL);
@@ -275,7 +275,7 @@ public class RaceListColumnFactory {
safeStyles.trustedNameAndValue("-webkit-transform", "rotate(" + value.getTrueWindFromDeg() + "deg)");
safeStyles.trustedNameAndValue("transform", "rotate(" + value.getTrueWindFromDeg() + "deg)");
safeStyles.width(2.75, Unit.EM).height(2.75, Unit.EM);
- sb.append(TEMPLATE.windDirection(safeStyles.toSafeStyles()));
+ sb.append(TEMPLATE.windDirection(safeStyles.toSafeStyles(), RaceListResources.INSTANCE.compass().getSafeUri()));
}
}
};
@@ -443,14 +443,17 @@ public class RaceListColumnFactory {
};
}
- public static SortableRaceListColumn getWinnerColumn() {
+ public static SortableRaceListColumn getWinnerColumn(FlagImageResolver flagImageResolver) {
Cell cell = new AbstractCell() {
@Override
public void render(Context context, SimpleCompetitorDTO value, SafeHtmlBuilder sb) {
if (value != null) {
- SafeUri flagImageUri = FlagImageResolver.getFlagImageUri(value.getFlagImageURL(), value.getTwoLetterIsoCountryCode());
- String flagStyle = CSS.race_item_flag(), sailIdStyle = CSS.race_item_sailid(), nameStyle = CSS.race_item_winner();
- sb.append(TEMPLATE.winner(flagStyle, sailIdStyle, nameStyle, flagImageUri, value.getSailID(), value.getName()));
+ SafeUri flagImageUri = flagImageResolver.getFlagImageUri(value.getFlagImageURL(),
+ value.getTwoLetterIsoCountryCode());
+ String sailIdStyle = CSS.race_item_sailid();
+ String nameStyle = CSS.race_item_winner();
+ sb.append(TEMPLATE.winner( sailIdStyle, nameStyle, flagImageUri.asString(),
+ value.getSailID(), value.getName()));
}
}
};
@@ -570,9 +573,9 @@ public class RaceListColumnFactory {
}
private static abstract class DataCountColumn extends SortableRaceListColumn {
- private static final SafeUri ICON_WIND = UriUtils.fromTrustedString("images/home/icon-wind.png");
- private static final SafeUri ICON_VIDEO = UriUtils.fromTrustedString("images/home/icon-video.png");
- private static final SafeUri ICON_AUDIO = UriUtils.fromTrustedString("images/home/icon-audio.png");
+ private static final SafeUri ICON_WIND = SharedDesktopResources.INSTANCE.wind().getSafeUri();
+ private static final SafeUri ICON_VIDEO = SharedDesktopResources.INSTANCE.video().getSafeUri();
+ private static final SafeUri ICON_AUDIO = SharedDesktopResources.INSTANCE.audio().getSafeUri();
private DataCountColumn(final SafeUri imageUri, RaceListColumnComparator comparator) {
super(new SafeHtmlHeader(TEMPLATE.imageHeader(CSS.raceslist_head_itemflag(), imageUri)), new AbstractCell() {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListContainer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListContainer.ui.xml
index f77d773a8ae..cfb9c874016 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListContainer.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListContainer.ui.xml
@@ -5,44 +5,12 @@
- .iconGPS, .iconWind, .iconVideo, .iconAudio{
- position: relative;
- display: none;
- margin-left: 0.666666666666667em;
- padding-left: 2.333333333333333em;
- background-size: 1.666666666666667rem 1.666666666666667rem;
- background-position: left;
- background-repeat: no-repeat;
- }
- .iconGPS {
- background-image:url('images/home/raw_gps_fixes.png');
- }
- .iconWind {
- background-image:url('images/home/icon-wind.png');
- }
- .iconVideo {
- background-image:url('images/home/icon-video.png');
- border-left: 1px solid #ccc;
- }
- .iconAudio {
- background-image:url('images/home/icon-audio.png');
- border-left: 1px solid #ccc;
- }
- .legend {
- text-align: right;
- vertical-align: baseline;
- line-height: 1.333em;
- padding-right:0px;
- margin: 0 0 .5em;
- }
-
-
- > extends Abstr
@Template("{1}")
SafeHtml raceNotTracked(String styleNames, String text);
- @Template("{2}![](\"images/home/launch-loupe.svg\"/)
")
- SafeHtml raceviewerLaunchPad(String styleNames, String iconStyleNames, String text);
+ @Template("{2}![](\"{3}\"/)
")
+ SafeHtml raceviewerLaunchPad(String styleNames, String iconStyleNames, String text, SafeUri iconUrl);
- @Template("{2}![](\"images/home/{3}.svg\"/)
")
- SafeHtml standaloneButton(String styleNames, String iconStyleNames, String text, String icon, SafeUri safeUri);
+ @Template("{2} ")
+ SafeHtml standaloneButton(String styleNames, String iconStyleNames, String text, SafeUri iconUrl, SafeUri safeUri);
}
private static final CellTemplates TEMPLATE = GWT.create(CellTemplates.class);
@@ -66,13 +67,13 @@ public class RaceviewerLaunchPadCell> extends Abstr
switch (launchPadController.getRenderingStyle(data)) {
case WATCH_LIVE_ONLY:
sb.append(TEMPLATE.standaloneButton(plannedStyleNames, iconStyleNames, I18N.watchLive(),
- "launch-play", UriUtils.fromString(launchPadController.getDirectLinkUrl(data))));
+ SharedHomeResources.INSTANCE.launchPlay().getSafeUri(), UriUtils.fromString(launchPadController.getDirectLinkUrl(data))));
break;
case WATCH_LIVE_OR_ANALYZE:
- sb.append(TEMPLATE.raceviewerLaunchPad(liveStyleNames, iconStyleNames, I18N.raceDetailsToShow()));
+ sb.append(TEMPLATE.raceviewerLaunchPad(liveStyleNames, iconStyleNames, I18N.raceDetailsToShow(), SharedHomeResources.INSTANCE.launchLoupe().getSafeUri()));
break;
case ANALYZE:
- sb.append(TEMPLATE.raceviewerLaunchPad(analyzeStyleNames, iconStyleNames, I18N.raceDetailsToShow()));
+ sb.append(TEMPLATE.raceviewerLaunchPad(analyzeStyleNames, iconStyleNames, I18N.raceDetailsToShow(), SharedHomeResources.INSTANCE.launchLoupe().getSafeUri()));
break;
case NOT_TRACKED:
sb.append(TEMPLATE.raceNotTracked(notTrackedStyleNames, showNotTracked ? I18N.eventRegattaRaceNotTracked() : ""));
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss
index 1840dcd6c5e..838f946303d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss
@@ -144,7 +144,7 @@
display: inline-block;
width: 1em;
height: 0.866666666666667em;
- background: url("images/home/launch-loupe.svg") no-repeat center center;
+ background: resourceUrl("launchLoupe") no-repeat center center;
font-size: 1.466666666666667em;
position: absolute;
right: 0;
@@ -175,7 +175,7 @@
background-color: #8a8a8a;
}
.fleet_races_raceplanned .fleet_races_race_name:after {
- background: url("images/home/launch-play.svg") no-repeat center center;
+ background: resourceUrl("launchPlay") no-repeat center center;
}
.fleet_races_raceuntracked .fleet_races_race_name:after {
display: none;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java
index 25731591094..6b9b757e840 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.regattacompetition;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface RegattaCompetitionResources extends ClientBundle {
+public interface RegattaCompetitionResources extends SharedHomeResources {
public static final RegattaCompetitionResources INSTANCE = GWT.create(RegattaCompetitionResources.class);
@Source("RegattaCompetition.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.gss
index c6777ba0f40..2e52f509b83 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.gss
@@ -100,7 +100,7 @@
text-align: right;
padding: 0.666666666666667em;
padding-right: 5.333333333333333em;
- background-image: url("images/home/arrow-down-grey.png");
+ background-image: resourceUrl("arrowDownGrey");
background-size: 1.333333333333333em 1.333333333333333em;
background-position: center;
background-repeat: no-repeat;
@@ -170,3 +170,41 @@ img.regattaheader_update_title_icon {
.regattaheader_update_timestamp {
font-size: 12px;
}
+.iconHeaderGPS, .iconHeaderWind, .iconHeaderVideo, .iconHeaderAudio {
+ pointer-events: none;
+}
+.iconHeaderGPS, .iconGPS {
+ background-image: resourceUrl('gpsFixes');
+}
+.iconHeaderWind, .iconWind {
+ background-image: resourceUrl('wind');
+}
+.iconHeaderVideo, .iconVideo {
+ background-image: resourceUrl('video');
+}
+.iconHeaderAudio, .iconAudio {
+ background-image: resourceUrl('audio');
+}
+
+.iconGPS, .iconWind, .iconVideo, .iconAudio {
+ line-height: 1.5em;
+ position: relative;
+ height:1.666666666666667rem;
+ display: inline-block;
+ padding-left: 2.333333333333333em;
+ background-size: 1.666666666666667rem 1.666666666666667rem;
+ background-position: left bottom;
+ background-repeat: no-repeat;
+}
+.iconWind {
+ margin-left: 0.666666666666667em;
+ border-left: 1px solid #ccc;
+}
+.iconVideo {
+ padding-top: 0.277777777777778em;
+}
+.iconAudio {
+ margin-left: 0.666666666666667em;
+ border-left: 1px solid #ccc;
+ padding-top: 0.277777777777778em;
+}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.ui.xml
index e8979872c35..43e5f24b5a2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.ui.xml
@@ -12,10 +12,10 @@
-
-
-
-
+
+
+
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderBubbleContentLegend.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderBubbleContentLegend.ui.xml
index 40f156ed706..51d0c39b6c8 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderBubbleContentLegend.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderBubbleContentLegend.ui.xml
@@ -1,48 +1,19 @@
- .iconGPS, .iconWind, .iconVideo, .iconAudio {
- line-height: 1.5em;
- position: relative;
- height:1.666666666666667rem;
- display: inline-block;
- padding-left: 2.333333333333333em;
- background-size: 1.666666666666667rem 1.666666666666667rem;
- background-position: left bottom;
- background-repeat: no-repeat;
- }
- .iconGPS {
- background-image:url('images/home/raw_gps_fixes.png');
- }
- .iconWind {
- margin-left: 0.666666666666667em;
- background-image:url('images/home/icon-wind.png');
- border-left: 1px solid #ccc;
- }
- .iconVideo {
- background-image:url('images/home/icon-video.png');
- padding-top: 0.277777777777778em;
- }
- .iconAudio {
- margin-left: 0.666666666666667em;
- background-image:url('images/home/icon-audio.png');
- border-left: 1px solid #ccc;
- padding-top: 0.277777777777778em;
- }
-
+
-
-
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderResources.java
index 93faedeea4b..369f29552aa 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.regattaheader;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface RegattaHeaderResources extends ClientBundle {
+public interface RegattaHeaderResources extends SharedDesktopResources {
public static final RegattaHeaderResources INSTANCE = GWT.create(RegattaHeaderResources.class);
@Source("RegattaHeader.gss")
@@ -29,5 +29,15 @@ public interface RegattaHeaderResources extends ClientBundle {
String regattaheader_update_title();
String regattaheader_update_title_icon();
String regattaheader_update_timestamp();
+
+ String iconHeaderGPS();
+ String iconHeaderWind();
+ String iconHeaderVideo();
+ String iconHeaderAudio();
+
+ String iconGPS();
+ String iconWind();
+ String iconVideo();
+ String iconAudio();
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigation.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigation.gss
index d902be63d69..f42078ac10b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigation.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigation.gss
@@ -49,7 +49,7 @@
font-size: 0.866666666666667rem;
text-align: right;
margin-top: 0;
- background: transparent url("images/home/arrow-down-filled-black.png") no-repeat;
+ background: transparent resourceUrl("arrowDownFilledBlack") no-repeat;
background-position: 96%;
background-size: 0.923076923076923em 0.538461538461538em;
border: 1px solid transparent;
@@ -65,7 +65,7 @@
background-color: #f2f2f2;
}
.regattanavigation_filter.jsdropdownactive {
- background-image: url("images/home/arrow-down-filled-yellow.png");
+ background-image: resourceUrl("arrowDownFilledYellow");
}
.regattanavigation_filter.jsdropdownactive .regattanavigation_filter_dropdown {
display: block;
@@ -98,7 +98,7 @@
text-decoration: underline;
}
.regattanavigation_filter_dropdown_linkactive {
- background: url("images/home/dropdown__check@2x.png") no-repeat;
+ background: resourceUrl("dropdownCheck") no-repeat;
background-position: 95%;
background-size: 1.2em 0.933333333333333em;
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigationResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigationResources.java
index 03f153c1b43..f51c44f3a33 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigationResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigationResources.java
@@ -1,14 +1,18 @@
package com.sap.sailing.gwt.home.desktop.partials.regattanavigation;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface RegattaNavigationResources extends ClientBundle {
+public interface RegattaNavigationResources extends SharedDesktopResources {
public static final RegattaNavigationResources INSTANCE = GWT.create(RegattaNavigationResources.class);
@Source("RegattaNavigation.gss")
LocalCss css();
+
+ @Source("arrow-down-filled-yellow.png")
+ ImageResource arrowDownFilledYellow();
public interface LocalCss extends CssResource {
String jsdropdown();
diff --git a/java/com.sap.sailing.gwt.ui/images/home/arrow-down-filled-yellow.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/arrow-down-filled-yellow.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/arrow-down-filled-yellow.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/arrow-down-filled-yellow.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.gss
similarity index 91%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.css
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.gss
index c601764690a..def48028ee1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.css
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.gss
@@ -2,8 +2,8 @@
* styles for search result page
*/
.paging {
- font-size: 16px;
- font-size: 1rem;
+ /* @alternate */ font-size: 16px;
+ /* @alternate */ font-size: 1rem;
margin-top: 1.875em;
}
.paging_perpage {
@@ -41,7 +41,7 @@
height: 0;
overflow: hidden;
border: 0;
- background-image: url("images/home/paging-icons.png");
+ background-image: resourceUrl("paging");
background-repeat: no-repeat;
background-position: left center;
background-size: cover;
@@ -51,8 +51,8 @@
background-position: -2.5em center;
}
.dropdown {
- font-size: 16px;
- font-size: 1rem;
+ /* @alternate */ font-size: 16px;
+ /* @alternate */ font-size: 1rem;
width: 18.75em;
display: inline-block;
}
@@ -114,8 +114,8 @@
font-size: 1em;
}
.searchresult {
- font-size: 16px;
- font-size: 1rem;
+ /* @alternate */ font-size: 16px;
+ /* @alternate */ font-size: 1rem;
}
.searchresult_form {
display: block;
@@ -130,7 +130,7 @@
.searchresult_form_input {
display: block;
padding: 0.625em 0 0.5625em 2.5em;
- background-image: url("images/home/search-icon-grey.png");
+ background-image: resourceUrl("search");
background-repeat: no-repeat;
background-color: #f6f9fc;
background-position: 0.625em center;
@@ -139,8 +139,8 @@
float: left;
}
.searchresult_form_button {
- font-size: 16px;
- font-size: 1rem;
+ /* @alternate */ font-size: 16px;
+ /* @alternate */ font-size: 1rem;
width: 10%;
float: right;
text-transform: uppercase;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.ui.xml
index 498509744ec..e92ebc875de 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.ui.xml
@@ -23,19 +23,6 @@
-
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResultResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResultResources.java
index 89f30c8ec11..2692eae107e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResultResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResultResources.java
@@ -3,12 +3,19 @@ package com.sap.sailing.gwt.home.desktop.partials.searchresult;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
public interface SearchResultResources extends ClientBundle {
public static final SearchResultResources INSTANCE = GWT.create(SearchResultResources.class);
- @Source("SearchResult.css")
+ @Source("SearchResult.gss")
LocalCss css();
+
+ @Source("paging-icons.png")
+ ImageResource paging();
+
+ @Source("search-icon-grey.png")
+ ImageResource search();
public interface LocalCss extends CssResource {
String paging();
diff --git a/java/com.sap.sailing.gwt.ui/images/home/paging-icons.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/paging-icons.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/paging-icons.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/paging-icons.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/search-icon-grey.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/search-icon-grey.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/search-icon-grey.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/search-icon-grey.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.gss
index 14a144f1b81..641972bb26a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.gss
@@ -18,25 +18,6 @@
font-weight: 600;
padding: 0.666666666666667em 0;
}
-.eventheader_breadcrumbback {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- width: 1.333333333333333em;
- border-right: 1px solid #cfcfcf;
- background-color: #dedede;
- background-image: url("images/home/breadcrumb-arrow__back.png");
- background-position: center center;
- background-repeat: no-repeat;
- background-size: 50%;
- -webkit-transition: background-color 0.2s, border-color 0.2s;
- -moz-transition: background-color 0.2s, border-color 0.2s;
- transition: background-color 0.2s, border-color 0.2s;
-}
-.eventheader_breadcrumbback:hover {
- background-color: #cfcfcf;
-}
.eventheader_intro {
padding-left: 6em;
margin: 0.666666666666667em 0;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java
index 58e791e8773..7cb6f8af5e2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.seriesheader;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface SeriesHeaderResources extends ClientBundle {
+public interface SeriesHeaderResources extends SharedDesktopResources {
public static final SeriesHeaderResources INSTANCE = GWT.create(SeriesHeaderResources.class);
@Source("SeriesHeader.gss")
@@ -14,7 +14,6 @@ public interface SeriesHeaderResources extends ClientBundle {
String leaderboardquickaccess();
String eventheader();
String eventheader_breadcrumb();
- String eventheader_breadcrumbback();
String eventheader_intro();
String eventheader_intro_logo();
String eventheader_intro_logo_image();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.gss
index 04d4564e036..29cd300eb8d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.gss
@@ -13,7 +13,7 @@
}
.eventheader_sharing_itememail {
background-color: #f0ab00;
- background-image: url("images/home/email-icon.png");
+ background-image: resourceUrl("email");
}
.eventheader_sharing_itememail:hover,
.eventheader_sharing_itememail:focus {
@@ -21,15 +21,28 @@
}
.eventheader_sharing_itemtwitter {
background-color: #32b5e2;
- background-image: url("images/home/twitter-icon.png");
+ background-image: resourceUrl("twitter");
+ background-size: 20px auto;
}
.eventheader_sharing_itemtwitter:hover,
.eventheader_sharing_itemtwitter:focus {
background-color: #1faada;
}
.eventheader_sharing_itemfacebook {
+ position: relative;
background-color: #3b5998;
- background-image: url("images/home/facebook-icon.png");
+}
+.eventheader_sharing_itemfacebook:after {
+ content: "";
+ position: absolute;
+ width: 50%;
+ height: 50%;
+ top: 25%;
+ left: 25%;
+ background-image: resourceUrl("facebook");
+ background-size: contain;
+ background-position: center;
+ background-repeat: no-repeat;
}
.eventheader_sharing_itemfacebook:hover,
.eventheader_sharing_itemfacebook:focus {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java
index 280afd2fbec..d2b32b7e8f1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java
@@ -1,14 +1,18 @@
package com.sap.sailing.gwt.home.desktop.partials.sharing;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface SharingButtonsResources extends ClientBundle {
+public interface SharingButtonsResources extends SharedHomeResources {
public static final SharingButtonsResources INSTANCE = GWT.create(SharingButtonsResources.class);
@Source("SharingButtons.gss")
LocalCss css();
+
+ @Source("email-icon.png")
+ ImageResource email();
public interface LocalCss extends CssResource {
String eventheader_sharing();
diff --git a/java/com.sap.sailing.gwt.ui/images/email-icon.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/email-icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/email-icon.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/email-icon.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml
index 0dbed52ff4f..ac99eeb5050 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml
@@ -4,6 +4,7 @@
xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
@@ -14,7 +15,7 @@
- 
+ 
- 
+ 
headerNavigation) {
+ public StandingsList(boolean finished, PlaceNavigation headerNavigation, FlagImageResolver flagImageResolver) {
this.finished = finished;
+ this.flagImageResolver = flagImageResolver;
StandingsResources.INSTANCE.css().ensureInjected();
setElement(uiBinder.createAndBindUi(this));
setVisible(false);
@@ -70,7 +73,7 @@ public class StandingsList extends Widget implements RefreshableWidget
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/updates/UpdatesBoxResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/updates/UpdatesBoxResources.java
index 378cb4ccd58..256f5df8e53 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/updates/UpdatesBoxResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/updates/UpdatesBoxResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.updates;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface UpdatesBoxResources extends ClientBundle {
+public interface UpdatesBoxResources extends SharedHomeResources {
public static final UpdatesBoxResources INSTANCE = GWT.create(UpdatesBoxResources.class);
@Source("UpdatesBox.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java
index 5a01c544816..e97ba17df9a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java
@@ -1,6 +1,11 @@
package com.sap.sailing.gwt.home.desktop.places.event;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.domain.common.dto.EventType;
import com.sap.sailing.gwt.home.communication.eventview.EventViewDTO;
import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
@@ -17,6 +22,9 @@ import com.sap.sailing.gwt.home.mobile.places.event.minileaderboard.MiniLeaderbo
import com.sap.sailing.gwt.home.shared.places.event.AbstractEventActivityProxy;
import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace;
import com.sap.sailing.gwt.home.shared.places.event.EventContext;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
+import com.sap.sse.gwt.resources.CommonControlsCSS;
+import com.sap.sse.gwt.resources.Highcharts;
public class EventActivityProxy extends AbstractEventActivityProxy implements WithHeader {
@@ -34,15 +42,31 @@ public class EventActivityProxy extends AbstractEventActivityProxy new EventRegattaActivity((AbstractEventRegattaPlace) place, event, clientFactory,
+ homePlacesNavigator, getNavigationPathDisplay(), flagImageResolver));
}
if (place instanceof AbstractMultiregattaEventPlace) {
- super.onSuccess(new EventMultiregattaActivity((AbstractMultiregattaEventPlace) place, event,
+ onSuccess(new EventMultiregattaActivity((AbstractMultiregattaEventPlace) place, event,
clientFactory, homePlacesNavigator, getNavigationPathDisplay()));
}
}
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
+ }
});
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/EventRegattaActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/EventRegattaActivity.java
index 5e335393e0f..45d8156679b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/EventRegattaActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/EventRegattaActivity.java
@@ -23,6 +23,7 @@ import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.places.event.EventContext;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardEntryPoint;
import com.sap.sse.gwt.client.async.AsyncActionsExecutor;
@@ -39,19 +40,20 @@ import com.sap.sse.security.ui.client.UserService;
* The concrete {@link AbstractEventRegattaPlace} subclass, this instance is bound to.
*/
public class EventRegattaActivity extends AbstractEventActivity implements EventRegattaView.Presenter {
- private EventRegattaView currentView = new TabletAndDesktopRegattaEventView();
+ private EventRegattaView currentView;
private final AsyncActionsExecutor asyncActionsExecutor = new AsyncActionsExecutor();
private final long delayBetweenAutoAdvancesInMilliseconds = LeaderboardEntryPoint.DEFAULT_REFRESH_INTERVAL_MILLIS;
public EventRegattaActivity(AbstractEventRegattaPlace place, EventViewDTO eventDTO, EventClientFactory clientFactory,
- DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) {
+ DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay, FlagImageResolver flagImageResolver) {
super(place, eventDTO, clientFactory, homePlacesNavigator);
+ currentView = new TabletAndDesktopRegattaEventView(flagImageResolver);
if (this.ctx.getRegattaAnalyticsManager() == null) {
ctx.withRegattaAnalyticsManager(new RegattaAnalyticsDataManager(
clientFactory.getSailingService(),
asyncActionsExecutor,
new Timer(PlayModes.Live, PlayStates.Paused, delayBetweenAutoAdvancesInMilliseconds),
- clientFactory.getErrorReporter()));
+ clientFactory.getErrorReporter(), flagImageResolver));
}
initNavigationPath(navigationPathDisplay);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/RegattaAnalyticsDataManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/RegattaAnalyticsDataManager.java
index 511c223953c..9b093b80893 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/RegattaAnalyticsDataManager.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/RegattaAnalyticsDataManager.java
@@ -5,6 +5,7 @@ import com.sap.sailing.gwt.settings.client.leaderboard.MultiCompetitorLeaderboar
import com.sap.sailing.gwt.settings.client.leaderboard.MultiRaceLeaderboardSettings;
import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel;
import com.sap.sailing.gwt.ui.client.DebugIdHelper;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorLeaderboardChart;
@@ -32,9 +33,12 @@ public class RegattaAnalyticsDataManager {
private final ErrorReporter errorReporter;
private final SailingServiceAsync sailingService;
private final Timer timer;
+ private final FlagImageResolver flagImageResolver;
public RegattaAnalyticsDataManager(final SailingServiceAsync sailingService,
- AsyncActionsExecutor asyncActionsExecutor, Timer timer, ErrorReporter errorReporter) {
+ AsyncActionsExecutor asyncActionsExecutor, Timer timer, ErrorReporter errorReporter,
+ FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
this.competitorSelectionProvider = new CompetitorSelectionModel(/* hasMultiSelection */true);
this.sailingService = sailingService;
this.asyncActionsExecutor = asyncActionsExecutor;
@@ -56,7 +60,8 @@ public class RegattaAnalyticsDataManager {
competitorSelectionProvider, timer, leaderboardGroupName, leaderboardName, errorReporter,
StringMessages.INSTANCE, showRaceDetails, /* competitorSearchTextBox */ null,
/* showSelectionCheckbox */ true, /* raceTimesInfoProvider */ null, autoExpandLastRaceColumn,
- /* adjustTimerDelay */ true, /* autoApplyTopNFilter */ false, /* showCompetitorFilterStatus */ false, /* enableSyncScroller */ true,new ClassicLeaderboardStyle());
+ /* adjustTimerDelay */ true, /* autoApplyTopNFilter */ false, /* showCompetitorFilterStatus */ false, /* enableSyncScroller */ true,
+ new ClassicLeaderboardStyle(), flagImageResolver);
}
return leaderboardPanel;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java
index 352da40a522..65bdfbdd1ba 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java
@@ -21,9 +21,12 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanelPlaceSelectionE
import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
import com.sap.sailing.gwt.home.desktop.partials.eventheader.EventHeader;
import com.sap.sailing.gwt.home.desktop.partials.sailorinfo.SailorInfo;
+import com.sap.sailing.gwt.home.desktop.places.event.regatta.overviewtab.RegattaOverviewTabView;
+import com.sap.sailing.gwt.home.desktop.places.event.regatta.racestab.RegattaRacesTabView;
import com.sap.sailing.gwt.home.shared.app.ApplicationHistoryMapper;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sse.gwt.client.LinkUtil;
@@ -40,10 +43,15 @@ public class TabletAndDesktopRegattaEventView extends Composite implements Event
@UiField(provided = true) TabPanel> tabPanelUi;
@UiField(provided = true) EventHeader eventHeader;
+ @UiField(provided = true) RegattaRacesTabView racesTabUi;
+ @UiField(provided = true) RegattaOverviewTabView regattaOverviewTabUi;
private Presenter currentPresenter;
- public TabletAndDesktopRegattaEventView() {
+ private final FlagImageResolver flagImageResolver;
+
+ public TabletAndDesktopRegattaEventView(FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
}
@Override
@@ -51,6 +59,8 @@ public class TabletAndDesktopRegattaEventView extends Composite implements Event
this.currentPresenter = currentPresenter;
tabPanelUi = new TabPanel<>(currentPresenter, historyMapper);
eventHeader = new EventHeader(currentPresenter);
+ racesTabUi = new RegattaRacesTabView(flagImageResolver);
+ regattaOverviewTabUi = new RegattaOverviewTabView(flagImageResolver);
initWidget(uiBinder.createAndBindUi(this));
if(currentPresenter.getEventDTO().getType() == EventType.SERIES) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.ui.xml
index 86cbe0b7114..52281f92d7d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.ui.xml
@@ -10,10 +10,10 @@
-
-
windSourcesCountColumn = RaceListColumnFactory.getWindSourcesCountColumn();
private final SortableRaceListColumn videoCountColumn = RaceListColumnFactory.getVideoCountColumn();
private final SortableRaceListColumn audioCountColumn = RaceListColumnFactory.getAudioCountColumn();
- private final SortableRaceListColumn winnerColumn = RaceListColumnFactory.getWinnerColumn();
+ private final SortableRaceListColumn winnerColumn = RaceListColumnFactory.getWinnerColumn(flagImageResolver);
private boolean hasWind;
private boolean hasVideos;
private boolean hasAudios;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java
index 24d6b7c1c96..dc4f5df0ad7 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java
@@ -10,21 +10,21 @@ import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
import com.sap.sailing.gwt.home.shared.app.ActivityCallback;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
+import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
import com.sap.sailing.gwt.home.shared.places.events.EventsPlace;
import com.sap.sailing.gwt.ui.client.StringMessages;
-public class EventsActivity extends AbstractActivity {
+public class EventsActivity extends AbstractActivity implements ProvidesNavigationPath{
private final EventsClientFactory clientFactory;
private final EventsPlace place;
private final DesktopPlacesNavigator homePlacesNavigator;
+ private NavigationPathDisplay navigationPathDisplay;
- public EventsActivity(EventsPlace place, EventsClientFactory clientFactory, DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) {
+ public EventsActivity(EventsPlace place, EventsClientFactory clientFactory, DesktopPlacesNavigator homePlacesNavigator) {
this.clientFactory = clientFactory;
this.place = place;
this.homePlacesNavigator = homePlacesNavigator;
-
- initNavigationPath(navigationPathDisplay);
}
private void initNavigationPath(NavigationPathDisplay navigationPathDisplay) {
@@ -35,6 +35,7 @@ public class EventsActivity extends AbstractActivity {
@Override
public void start(final AcceptsOneWidget panel, EventBus eventBus) {
+ initNavigationPath(navigationPathDisplay);
panel.setWidget(clientFactory.createBusyView());
clientFactory.getDispatch().execute(new GetEventListViewAction(),
new ActivityCallback(clientFactory, panel) {
@@ -47,4 +48,9 @@ public class EventsActivity extends AbstractActivity {
}
});
}
+
+ @Override
+ public void setNavigationPathDisplay(NavigationPathDisplay navigationPathDisplay) {
+ this.navigationPathDisplay = navigationPathDisplay;
+ }
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivityProxy.java
deleted file mode 100755
index 2aec550831c..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivityProxy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.sap.sailing.gwt.home.desktop.places.events;
-
-import com.google.gwt.core.client.GWT;
-import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
-import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
-import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
-import com.sap.sailing.gwt.home.shared.places.events.EventsPlace;
-import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
-
-public class EventsActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath {
-
- private final EventsClientFactory clientFactory;
- private final EventsPlace place;
- private NavigationPathDisplay navigationPathDisplay;
- private final DesktopPlacesNavigator homePlacesNavigator;
-
- public EventsActivityProxy(EventsPlace place, EventsClientFactory clientFactory, DesktopPlacesNavigator homePlacesNavigator) {
- this.place = place;
- this.clientFactory = clientFactory;
- this.homePlacesNavigator = homePlacesNavigator;
- }
-
- @Override
- protected void startAsync() {
- GWT.runAsync(new AbstractRunAsyncCallback() {
- @Override
- public void onSuccess() {
- super.onSuccess(new EventsActivity(place, clientFactory, homePlacesNavigator, navigationPathDisplay));
- }
- });
- }
-
- @Override
- public void setNavigationPathDisplay(NavigationPathDisplay navigationPathDisplay) {
- this.navigationPathDisplay = navigationPathDisplay;
- }
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/EventSeriesAnalyticsDataManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/EventSeriesAnalyticsDataManager.java
index de8d3e3090e..c8bcf11c2f0 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/EventSeriesAnalyticsDataManager.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/EventSeriesAnalyticsDataManager.java
@@ -11,6 +11,7 @@ import com.sap.sailing.gwt.settings.client.leaderboard.MultiRaceLeaderboardSetti
import com.sap.sailing.gwt.ui.client.CompetitorSelectionChangeListener;
import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel;
import com.sap.sailing.gwt.ui.client.DebugIdHelper;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorLeaderboardChart;
@@ -43,10 +44,13 @@ public class EventSeriesAnalyticsDataManager {
private final ErrorReporter errorReporter;
private final SailingServiceAsync sailingService;
private final Timer timer;
- private final int MAX_COMPETITORS_IN_CHART = 30;
+ private final int MAX_COMPETITORS_IN_CHART = 30;
+ private final FlagImageResolver flagImageResolver;
public EventSeriesAnalyticsDataManager(final SailingServiceAsync sailingService,
- AsyncActionsExecutor asyncActionsExecutor, Timer timer, ErrorReporter errorReporter) {
+ AsyncActionsExecutor asyncActionsExecutor, Timer timer, ErrorReporter errorReporter,
+ FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
this.competitorSelectionProvider = new CompetitorSelectionModel(/* hasMultiSelection */true);
this.sailingService = sailingService;
this.asyncActionsExecutor = asyncActionsExecutor;
@@ -67,7 +71,8 @@ public class EventSeriesAnalyticsDataManager {
StringMessages.INSTANCE, showRaceDetails, /* competitorSearchTextBox */ null,
/* showSelectionCheckbox */ true,
/* raceTimesInfoProvider */null, autoExpandLastRaceColumn, /* adjustTimerDelay */ true, /* autoApplyTopNFilter */ false,
- /* showCompetitorFilterStatus */ false, /* enableSyncScroller */ false, new ClassicLeaderboardStyle());
+ /* showCompetitorFilterStatus */ false, /* enableSyncScroller */ false, new ClassicLeaderboardStyle(),
+ flagImageResolver);
}
return overallLeaderboardPanel;
}
@@ -93,7 +98,7 @@ public class EventSeriesAnalyticsDataManager {
multiLeaderboardPanel = new MultiLeaderboardProxyPanel(parent, context, sailingService, metaLeaderboardName,
asyncActionsExecutor, timer, true /* isEmbedded */,
preselectedLeaderboardName, errorReporter, StringMessages.INSTANCE,
- showRaceDetails, autoExpandLastRaceColumn, leaderboardSettings);
+ showRaceDetails, autoExpandLastRaceColumn, leaderboardSettings, flagImageResolver);
}
return multiLeaderboardPanel;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java
index d442d37119f..3e615dad84c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java
@@ -23,6 +23,7 @@ import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardEntryPoint;
@@ -49,7 +50,7 @@ public class SeriesActivity extends AbstractActivity implements SeriesView.Prese
private final EventSeriesViewDTO series;
public SeriesActivity(AbstractSeriesTabPlace place, EventSeriesViewDTO series, SeriesClientFactory clientFactory,
- DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) {
+ DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay, FlagImageResolver flagImageResolver) {
this.currentPlace = place;
this.series = series;
this.ctx = new SeriesContext(place.getCtx());
@@ -61,7 +62,7 @@ public class SeriesActivity extends AbstractActivity implements SeriesView.Prese
clientFactory.getSailingService(), //
asyncActionsExecutor, //
new Timer(PlayModes.Live, PlayStates.Paused, delayBetweenAutoAdvancesInMilliseconds), //
- clientFactory.getErrorReporter()));
+ clientFactory.getErrorReporter(), flagImageResolver));
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java
index 0b2aa82fa1f..5093684a81c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java
@@ -1,8 +1,12 @@
package com.sap.sailing.gwt.home.desktop.places.fakeseries;
import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesClientFactory;
import com.sap.sailing.gwt.home.communication.fakeseries.EventSeriesViewDTO;
import com.sap.sailing.gwt.home.communication.fakeseries.GetEventSeriesViewAction;
@@ -17,7 +21,10 @@ import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
+import com.sap.sse.gwt.resources.CommonControlsCSS;
+import com.sap.sse.gwt.resources.Highcharts;
public class SeriesActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath, WithHeader {
@@ -60,8 +67,25 @@ public class SeriesActivityProxy extends AbstractActivityProxy implements Provid
place = getRealPlace(series);
}
place = verifyAndAdjustPlace();
- super.onSuccess(new SeriesActivity((AbstractSeriesTabPlace) place, series, clientFactory,
- homePlacesNavigator, navigationPathDisplay));
+
+ CommonControlsCSS.ensureInjected();
+ Highcharts.ensureInjected();
+ withFlagImageResolver(flagImageResolver -> new SeriesActivity((AbstractSeriesTabPlace) place, series, clientFactory,
+ homePlacesNavigator, navigationPathDisplay, flagImageResolver));
+ }
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
}
});
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/StartActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/StartActivityProxy.java
deleted file mode 100644
index 7d91ee4a344..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/StartActivityProxy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.sap.sailing.gwt.home.desktop.places.start;
-
-import com.google.gwt.core.client.GWT;
-import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
-import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
-
-public class StartActivityProxy extends AbstractActivityProxy {
-
- private final StartClientFactory clientFactory;
- private final StartPlace place;
-
- public StartActivityProxy(StartPlace place, StartClientFactory clientFactory) {
- this.place = place;
- this.clientFactory = clientFactory;
- }
-
- @Override
- protected void startAsync() {
- GWT.runAsync(new AbstractRunAsyncCallback() {
- @Override
- public void onSuccess() {
- super.onSuccess(new StartActivity(place, clientFactory));
- }
- });
- }
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java
index e16781ec729..81171480beb 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java
@@ -12,8 +12,10 @@ import com.sap.sailing.gwt.common.client.SharedResources;
import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanel;
import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanelPlaceSelectionEvent;
import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
+import com.sap.sailing.gwt.home.desktop.places.user.profile.preferencestab.UserProfilePreferencesTabView;
import com.sap.sailing.gwt.home.shared.app.ApplicationHistoryMapper;
import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sse.security.ui.authentication.app.AuthenticationContext;
import com.sap.sse.security.ui.userprofile.desktop.userheader.UserHeader;
@@ -35,8 +37,14 @@ public class TabletAndDesktopUserProfileView extends Composite implements UserPr
@UiField(provided = true)
UserHeader headerUi;
+
+ @UiField(provided = true)
+ UserProfilePreferencesTabView preferencesTabUi;
- public TabletAndDesktopUserProfileView() {
+ private final FlagImageResolver flagImageResolver;
+
+ public TabletAndDesktopUserProfileView(FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
}
@Override
@@ -46,6 +54,8 @@ public class TabletAndDesktopUserProfileView extends Composite implements UserPr
headerUi = new UserHeader(SharedResources.INSTANCE);
+ preferencesTabUi = new UserProfilePreferencesTabView(flagImageResolver);
+
initWidget(uiBinder.createAndBindUi(this));
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java
index 4e862c97c4a..92b2b71c51b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java
@@ -16,6 +16,7 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.security.ui.authentication.AuthenticationContextEvent;
import com.sap.sse.security.ui.authentication.AuthenticationPlaces;
import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent;
@@ -31,13 +32,14 @@ public class UserProfileActivity extends AbstractActivity implements UserProfile
private final StringMessages i18n_sec = StringMessages.INSTANCE;
- private UserProfileView currentView = new TabletAndDesktopUserProfileView();
+ private UserProfileView currentView;
public UserProfileActivity(AbstractUserProfilePlace place, UserProfileClientFactory clientFactory,
- DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) {
+ DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay, FlagImageResolver flagImageResolver) {
this.currentPlace = place;
this.clientFactory = clientFactory;
this.homePlacesNavigator = homePlacesNavigator;
+ currentView = new TabletAndDesktopUserProfileView(flagImageResolver);
initNavigationPath(navigationPathDisplay);
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java
index 6fba8a17d4f..daa4f0d4b11 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java
@@ -1,6 +1,11 @@
package com.sap.sailing.gwt.home.desktop.places.user.profile;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
import com.sap.sailing.gwt.home.desktop.app.WithHeader;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
@@ -8,6 +13,7 @@ import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDefaultPlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDetailsPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
public class UserProfileActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath, WithHeader {
@@ -37,8 +43,22 @@ public class UserProfileActivityProxy extends AbstractActivityProxy implements P
if(place instanceof UserProfileDefaultPlace) {
place = new UserProfileDetailsPlace();
}
- super.onSuccess(new UserProfileActivity(place, clientFactory,
- homePlacesNavigator, navigationPathDisplay));
+ withFlagImageResolver(flagImageResolver -> new UserProfileActivity(place, clientFactory,
+ homePlacesNavigator, navigationPathDisplay, flagImageResolver));
+ }
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
}
});
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesTabView.java
index 1171775ba5a..cf72424585d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesTabView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesTabView.java
@@ -6,12 +6,18 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileTabView;
import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileView;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserProfilePreferencesPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.security.ui.authentication.app.AuthenticationContext;
public class UserProfilePreferencesTabView extends Composite implements UserProfileTabView {
private UserProfilePreferencesView.Presenter currentPresenter;
private UserProfilePreferencesView view;
+ private final FlagImageResolver flagImageResolver;
+
+ public UserProfilePreferencesTabView(FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
+ }
@Override
public Class getPlaceClassForActivation() {
@@ -44,7 +50,7 @@ public class UserProfilePreferencesTabView extends Composite implements UserProf
@Override
public void setPresenter(UserProfileView.Presenter currentPresenter) {
- view = new UserProfilePreferencesViewImpl();
+ view = new UserProfilePreferencesViewImpl(flagImageResolver);
this.currentPresenter = new UserProfilePreferencesPresenter(view, currentPresenter);
}
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesViewImpl.java
index e52c562e848..c8027487a6b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesViewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesViewImpl.java
@@ -7,6 +7,7 @@ import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferences;
import com.sap.sailing.gwt.home.shared.usermanagement.decorator.AuthorizedContentDecoratorDesktop;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.security.ui.authentication.app.NeedsAuthenticationContext;
public class UserProfilePreferencesViewImpl extends Composite implements UserProfilePreferencesView {
@@ -18,11 +19,17 @@ public class UserProfilePreferencesViewImpl extends Composite implements UserPro
@UiField(provided = true) AuthorizedContentDecoratorDesktop decoratorUi;
@UiField(provided = true) UserPreferences userPreferencesUi;
+
+ private final FlagImageResolver flagImageResolver;
+
+ public UserProfilePreferencesViewImpl(FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
+ }
@Override
public void setPresenter(Presenter presenter) {
decoratorUi = new AuthorizedContentDecoratorDesktop(presenter);
- userPreferencesUi = new UserPreferences(presenter.getUserPreferencesPresenter());
+ userPreferencesUi = new UserPreferences(presenter.getUserPreferencesPresenter(), flagImageResolver);
initWidget(uiBinder.createAndBindUi(this));
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/SharedDesktopResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/SharedDesktopResources.java
new file mode 100644
index 00000000000..b73672b12dc
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/SharedDesktopResources.java
@@ -0,0 +1,34 @@
+package com.sap.sailing.gwt.home.desktop.resources;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
+
+public interface SharedDesktopResources extends SharedHomeResources {
+
+ public static final SharedDesktopResources INSTANCE = GWT.create(SharedDesktopResources.class);
+
+ @Source("dropdown__check@2x.png")
+ ImageResource dropdownCheck();
+
+ @Source("liveraces.svg")
+ @MimeType("image/svg+xml")
+ DataResource liveraces();
+
+ @Source("icon-audio.png")
+ ImageResource audio();
+
+ @Source("icon-video.png")
+ ImageResource video();
+
+ @Source("icon-wind.png")
+ ImageResource wind();
+
+ @Source("raw_gps_fixes.png")
+ ImageResource gpsFixes();
+
+ @Source("arrow-down-filled-black.png")
+ ImageResource arrowDownFilledBlack();
+}
diff --git a/java/com.sap.sailing.gwt.ui/images/home/arrow-down-filled-black.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/arrow-down-filled-black.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/arrow-down-filled-black.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/arrow-down-filled-black.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/dropdown__check@2x.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/dropdown__check@2x.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/dropdown__check@2x.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/dropdown__check@2x.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/icon-audio.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-audio.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/icon-audio.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-audio.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/icon-video.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-video.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/icon-video.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-video.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/icon-wind.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-wind.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/icon-wind.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-wind.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/liveraces.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/liveraces.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/liveraces.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/liveraces.svg
diff --git a/java/com.sap.sailing.gwt.ui/images/home/raw_gps_fixes.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/raw_gps_fixes.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/raw_gps_fixes.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/raw_gps_fixes.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java
index f489cfc78d0..7a31ba34000 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java
@@ -6,13 +6,13 @@ import com.google.gwt.core.client.GWT;
import com.google.gwt.place.shared.Place;
import com.sap.sailing.gwt.home.mobile.places.error.ErrorActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.event.EventActivityProxy;
-import com.sap.sailing.gwt.home.mobile.places.events.EventsActivityProxy;
+import com.sap.sailing.gwt.home.mobile.places.events.EventsActivity;
import com.sap.sailing.gwt.home.mobile.places.morelogininformation.MoreLoginInformationActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.series.SeriesActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.series.minileaderboard.SeriesMiniOverallLeaderboardActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.series.minileaderboard.SeriesMiniOverallLeaderboardPlace;
import com.sap.sailing.gwt.home.mobile.places.solutions.SolutionsActivityProxy;
-import com.sap.sailing.gwt.home.mobile.places.start.StartActivityProxy;
+import com.sap.sailing.gwt.home.mobile.places.start.StartActivity;
import com.sap.sailing.gwt.home.mobile.places.user.authentication.AuthenticationActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.user.authentication.AuthenticationPlace;
import com.sap.sailing.gwt.home.mobile.places.user.profile.UserProfileActivityProxy;
@@ -55,9 +55,9 @@ public class MobileActivityMapper implements ActivityMapper {
if (place instanceof ErrorPlace) {
return new ErrorActivityProxy((ErrorPlace) place, clientFactory);
} else if (place instanceof StartPlace) {
- return new StartActivityProxy((StartPlace) place, clientFactory);
+ return new StartActivity((StartPlace) place, clientFactory);
} else if (place instanceof EventsPlace) {
- return new EventsActivityProxy((EventsPlace) place, clientFactory);
+ return new EventsActivity((EventsPlace) place, clientFactory);
} else if (place instanceof AbstractEventPlace) {
return new EventActivityProxy((AbstractEventPlace) place, clientFactory);
} else if (place instanceof SeriesMiniOverallLeaderboardPlace) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/accordion/AccordionItem.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/accordion/AccordionItem.ui.xml
index 7265fe6c5af..fd9c30b3e3c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/accordion/AccordionItem.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/accordion/AccordionItem.ui.xml
@@ -2,10 +2,11 @@
- 
+
![]()
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss
index b9f9282f293..89e1d70f740 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss
@@ -2,62 +2,12 @@
font-size: 1rem;
position: relative;
padding: 0.333333333333333em;
+ padding-bottom: 1em;
background: #f2f2f2;
-webkit-transition: top 0.3s ease-in-out;
-moz-transition: top 0.3s ease-in-out;
transition: top 0.3s ease-in-out;
}
-.eventheader .sidenavigation {
- display: none;
- position: absolute;
- top: 0;
- left: 0;
- width: 3em;
- height: 5.333333333333333em;
- z-index: 1;
-}
-.eventheader .sidenavigation_drawer {
- position: absolute;
- top: 1em;
- left: 0;
- width: 2em;
- height: 3.333333333333333em;
- background: DeepPink;
-}
-.eventheaderreduced {
- padding-bottom: 1em;
-}
-.eventheaderreduced .eventheader_info_subtitle {
- display: none;
-}
-.eventheaderreduced .quickfinder {
- display: none;
-}
-.eventheaderreduced .eventheader_inputwrapper {
- display: none;
-}
-.eventheaderfixedup {
- position: fixed;
- top: -3.533333333333333em;
- z-index: 10;
-}
-.eventheaderfixeddown {
- position: fixed;
- top: 0;
- z-index: 10;
-}
-.eventheadernobox {
- padding-bottom: 1em;
-}
-.eventheaderwithinputbox .eventheader_info {
- padding-top: 1em;
-}
-.eventheaderwithinputbox .sidenavigation_drawer {
- top: 0.333333333333333em;
-}
-.eventheaderwithinputbox .eventheader_inputwrapper {
- margin-top: 0.666666666666667em;
-}
.eventheader_info {
padding: 0.666666666666667em 0 0 0.666666666666667em;
}
@@ -103,39 +53,3 @@
.eventheader_info_subtitle_info_location {
visibility: visible;
}
-.eventheader_inputwrapper {
- padding: 0;
- margin-top: 0.666666666666667em;
-}
-.eventheader_input {
- float: left;
- display: block;
- font-weight: 600;
- padding: 0 2.333333333333333em 0 0.666666666666667em;
- width: 100%;
- height: 2.666666666666667em;
- border: none;
- vertical-align: middle;
-}
-.eventheader_button {
- float: left;
- width: 2.333333333333333em;
- height: 2.666666666666667em;
- margin-left: -2.333333333333333em;
- border: none;
- vertical-align: middle;
- background: url("../images/home/search-icon-yellow.svg") no-repeat;
- background-size: 1.333333333333333em 1.333333333333333em;
- background-position: center;
-}
-.eventheader .quickfinder {
- padding: 0;
- margin-top: 0.666666666666667em;
-}
-.eventheader .quickfinder_select {
- background: transparent;
- /* @alternate */ background: url("../images/home/quickfinder-arrow.svg") 100% no-repeat #f6f9fc;
-}
-.eventheaderplaceholder {
- font-size: inherit;
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml
index 6a49dca5fe8..86791f2d2a4 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml
@@ -8,9 +8,7 @@
-
-
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeaderResources.java
index e762dfc7a08..e041956b12f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeaderResources.java
@@ -12,17 +12,8 @@ public interface EventHeaderResources extends ClientBundle {
public interface LocalCss extends CssResource {
String eventheader();
- String sidenavigation();
- String sidenavigation_drawer();
- String eventheaderreduced();
String eventheader_info_subtitle();
- String quickfinder();
- String eventheader_inputwrapper();
- String eventheaderfixedup();
- String eventheaderfixeddown();
- String eventheadernobox();
- String eventheaderwithinputbox();
String eventheader_info();
String eventheader_info_title();
String eventheader_info_title_text();
@@ -32,9 +23,5 @@ public interface EventHeaderResources extends ClientBundle {
String eventheader_info_subtitle_info();
String eventheader_info_subtitle_info_date();
String eventheader_info_subtitle_info_location();
- String eventheader_input();
- String eventheader_button();
- String quickfinder_select();
- String eventheaderplaceholder();
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
index a2555bf8c5c..7cece0b816b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
@@ -4,10 +4,11 @@
- 
+ 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss
index c253f8427ea..61229c0c9a2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss
@@ -133,7 +133,7 @@ img.header_logo_image {
background: none;
}
.header_navigation_nav_sublist_item:before {
- background: url('images/home/arrow-down-grey.png');
+ background: resourceUrl('arrowDownGrey');
display: block;
height: 25px;
background-position: center;
@@ -155,12 +155,12 @@ img.header_logo_image {
transform: translate(-50%, -50%);
width: 1em;
height: 1.333333333333333em;
- background-image: url("images/mobile/navigation-icon.svg");
+ background-image: resourceUrl("navigation");
background-repeat: no-repeat;
background-size: contain;
background-position: center center;
}
.header_navigation_iconsignedin {
width: 1.666666666666667em;
- background-image: url("images/mobile/navigation-icon-signedin.svg");
+ background-image: resourceUrl("navigationSignedin");
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml
index 680f867dce5..0b820bf018e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml
@@ -30,7 +30,7 @@
- 
+ 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/HeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/HeaderResources.java
index bcb09e99e1a..64a3a12708a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/HeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/HeaderResources.java
@@ -1,15 +1,25 @@
package com.sap.sailing.gwt.home.mobile.partials.header;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface HeaderResources extends ClientBundle {
+public interface HeaderResources extends SharedHomeResources {
public static final HeaderResources INSTANCE = GWT.create(HeaderResources.class);
@Source("Header.gss")
LocalCss css();
+ @Source("navigation-icon-signedin.svg")
+ @MimeType("image/svg+xml")
+ DataResource navigationSignedin();
+
+ @Source("navigation-icon.svg")
+ @MimeType("image/svg+xml")
+ DataResource navigation();
+
public interface LocalCss extends CssResource {
String header();
String header_logo();
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon-signedin.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/navigation-icon-signedin.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon-signedin.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/navigation-icon-signedin.svg
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/navigation-icon.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/navigation-icon.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/imagegallery/MobileFullscreenGallery.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/imagegallery/MobileFullscreenGallery.ui.xml
index 64b863bd918..7216e3d8bdc 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/imagegallery/MobileFullscreenGallery.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/imagegallery/MobileFullscreenGallery.ui.xml
@@ -1,6 +1,7 @@
.popup {
position: fixed !important;
@@ -37,8 +38,8 @@
-
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/minileaderboard/MinileaderboardBox.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/minileaderboard/MinileaderboardBox.java
index 381517bf2ad..06afaa9edd3 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/minileaderboard/MinileaderboardBox.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/minileaderboard/MinileaderboardBox.java
@@ -20,6 +20,7 @@ import com.sap.sailing.gwt.home.mobile.partials.sectionHeader.SectionHeaderConte
import com.sap.sailing.gwt.home.mobile.partials.toggleButton.BigButton;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.common.client.DateAndTimeFormatterUtil;
@@ -38,9 +39,12 @@ public class MinileaderboardBox extends Composite implements RefreshableWidget placeNavigation = null;
private boolean isOverall;
+
+ private final FlagImageResolver flagImageResolver;
- public MinileaderboardBox(boolean isOverall) {
+ public MinileaderboardBox(boolean isOverall, FlagImageResolver flagImageResolver) {
this.isOverall = isOverall;
+ this.flagImageResolver = flagImageResolver;
initWidget(uiBinder.createAndBindUi(this));
}
@@ -78,7 +82,7 @@ public class MinileaderboardBox extends Composite implements RefreshableWidget
private final Map> navigations = new HashMap<>();
public Quickfinder() {
+ QuickfinderResources.INSTANCE.css().ensureInjected();
setElement(uiBinder.createAndBindUi(this));
Event.sinkEvents(selectUi, Event.ONCHANGE);
Event.setEventListener(selectUi, new EventListener() {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.ui.xml
index b99621bdb0b..fd4c444fbf9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.ui.xml
@@ -1,40 +1,8 @@
- .quickfinder {
- font-size: 1rem;
- text-align: center;
- padding: 0.666666666666667em;
- }
- .quickfinder_select::-ms-expand {
- display: none;
- }
- .quickfinder_select {
- font-weight: 600;
- width: 100%;
- height: auto;
- outline: none;
- appearance: none;
- -webkit-appearance: none;
- -moz-appearance: none;
- -ms-appearance: none;
- border: none;
- border-radius: 0;
- padding: 0.666666666666667em 0.666666666666667em 0.666666666666667em 1em;
- /* @alternate */
- background: transparent;
- background: url("images/mobile/quickfinder-arrow.svg") 100% no-repeat #ffffff;
- background-size: 3em 3em;
- }
-
- .quickfinder:-moz-focusring {
- color: transparent;
- text-shadow: 0 0 0 #0a0a0a;
- }
-
-
-
-
+
-
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYearEvent.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYearEvent.ui.xml
index eb3006d5ca2..58f66f98ef2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYearEvent.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYearEvent.ui.xml
@@ -7,6 +7,7 @@
type="com.sap.sailing.gwt.common.client.SharedResources" />
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatus.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatus.gss
index fda1fa1ba6e..4b4f7107b6a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatus.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatus.gss
@@ -15,27 +15,6 @@
font-size: 1.066666666666667em;
font-weight: 700;
}
-.regattastatus_header_select {
- position: absolute;
- top: 50%;
- right: 1em;
- -webkit-transform: translateY(-50%);
- -moz-transform: translateY(-50%);
- -ms-transform: translateY(-50%);
- transform: translateY(-50%);
- font-weight: 600;
- height: auto;
- width: 10.666666666666666em;
- appearance: none;
- -webkit-appearance: none;
- -moz-appearance: none;
- color: #008fcc;
- border: none;
- border-radius: 0;
- padding: 0.666666666666667em 2em 0.666666666666667em 1em;
- background: url("../images/home/filter.svg") 100% no-repeat transparent;
- background-size: 1.333333333333333em;
-}
.regattastatus_content {
visibility: visible;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.ui.xml
index cab25b6e7d6..70b2bf72d03 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.ui.xml
@@ -4,6 +4,7 @@
@@ -30,7 +31,7 @@
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusResources.java
index a18de2fa8d7..78c0d80a4a9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusResources.java
@@ -15,7 +15,6 @@ public interface RegattaStatusResources extends ClientBundle {
String grid();
String regattastatus_header();
String regattastatus_header_title();
- String regattastatus_header_select();
String regattastatus_content();
String regattastatus_content_regatta();
String regattastatus_content_regatta_race();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss
index 9f4535c7332..f4cc6530815 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss
@@ -138,7 +138,7 @@
display: inline-block;
width: 1.666666666666667em;
height: 1.1em;
- background: url("images/home/launch-loupe.svg") no-repeat center center;
+ background: resourceUrl("launchLoupe") no-repeat center center;
position: absolute;
right: 0;
top: 0.133333333333333em;
@@ -148,7 +148,7 @@
}
.regattacompetition_phase_fleet_race_arrow {
display: none;
- background: url("images/home/launch-loupe.svg") no-repeat center center;
+ background: resourceUrl("launchLoupe") no-repeat center center;
position: absolute;
top: 50%;
right: 1em;
@@ -158,10 +158,10 @@
transform: translateY(-50%);
}
.regattacompetition_phase_fleet_raceplanned .regattacompetition_phase_fleet_race_title:after {
- background: url("images/home/launch-play.svg") no-repeat center center;
+ background: resourceUrl("launchPlay") no-repeat center center;
}
.regattacompetition_phase_fleet_raceplanned .regattacompetition_phase_fleet_race_arrow {
- background: url("images/home/launch-play.svg") no-repeat center center;
+ background: resourceUrl("launchPlay") no-repeat center center;
}
.regattacompetition_phase_fleet_raceuntracked .regattacompetition_phase_fleet_race_arrow {
display: none;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionResources.java
index c0fa2dc729f..dd113f3c1de 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.mobile.partials.regattacompetition;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface RegattaCompetitionResources extends ClientBundle {
+public interface RegattaCompetitionResources extends SharedHomeResources {
public static final RegattaCompetitionResources INSTANCE = GWT.create(RegattaCompetitionResources.class);
@Source("RegattaCompetition.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResult.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResult.gss
index b016ad07887..9fcbec26f87 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResult.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResult.gss
@@ -37,7 +37,7 @@
margin-left: -2.333333333333333em;
border: none;
vertical-align: middle;
- background: url("images/mobile/search-icon-yellow.svg") no-repeat;
+ background: resourceUrl("search") no-repeat;
background-size: 1.333333333333333em 1.333333333333333em;
background-position: center;
}
@@ -93,7 +93,7 @@
}
.searchresult_item_arrow {
font-size: 1rem;
- background: url("images/home/arrow-down-grey.png");
+ background: resourceUrl("arrowDownGrey");
background-size: contain;
display: block;
width: 1.333333333333333em;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResultResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResultResources.java
index 10735e2707b..efc11d1cabe 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResultResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResultResources.java
@@ -1,14 +1,20 @@
package com.sap.sailing.gwt.home.mobile.partials.searchresult;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface SearchResultResources extends ClientBundle {
+public interface SearchResultResources extends SharedHomeResources {
public static final SearchResultResources INSTANCE = GWT.create(SearchResultResources.class);
@Source("SearchResult.gss")
LocalCss css();
+
+ @Source("search-icon-yellow.svg")
+ @MimeType("image/svg+xml")
+ DataResource search();
public interface LocalCss extends CssResource {
String searchresult();
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/search-icon-yellow.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/search-icon-yellow.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/search-icon-yellow.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/search-icon-yellow.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeader.gss
index 128097d6d99..062a6491737 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeader.gss
@@ -73,13 +73,22 @@
font-weight: 700;
color: #008fcc;
}
-img.sectionheader_item_arrow {
+.sectionheader_item_arrow {
display: inline-block;
vertical-align: middle;
margin-left: 1em;
height: 0.8em;
+ width: 0.8em;
+ background-size: 125%;
+ background-position: center;
+ background-image: resourceUrl('arrowDownGrey');
+ background-repeat: no-repeat;
+ -webkit-transform: rotate(270deg);
+ -moz-transform: rotate(270deg);
+ -ms-transform: rotate(270deg);
+ transform: rotate(270deg);
}
-img.sectionheader_item_arrow.accordion {
+.sectionheader_item_arrow.accordion {
-webkit-transform: rotate(180deg);
-moz-transform: rotate(180deg);
-ms-transform: rotate(180deg);
@@ -88,7 +97,7 @@ img.sectionheader_item_arrow.accordion {
-moz-transition: -moz-transform 0.4s;
transition: transform 0.4s;
}
-img.sectionheader_item_arrow.accordion.collapsed {
+.sectionheader_item_arrow.accordion.collapsed {
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
-ms-transform: rotate(0deg);
@@ -112,7 +121,7 @@ img.sectionheader_item_arrow.accordion.collapsed {
border: none;
border-radius: 0;
padding: 0.666666666666667em 2em 0.666666666666667em 1em;
- background: url("images/mobile/filter.svg") 100% no-repeat transparent;
+ background: resourceUrl("filter") 100% no-repeat transparent;
background-size: 1.333333333333333em;
}
.sectionheader_item_adjust_title_left {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.java
index f935c88af85..3c7f426f38d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.java
@@ -5,7 +5,6 @@ import com.google.gwt.dom.client.AnchorElement;
import com.google.gwt.dom.client.DivElement;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.ImageElement;
import com.google.gwt.dom.client.Style.Display;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -42,7 +41,7 @@ public class SectionHeaderContent extends Composite {
@UiField DivElement subtitleUi;
@UiField DivElement headerRightUi;
@UiField DivElement infoTextUi;
- @UiField ImageElement actionArrowUi;
+ @UiField DivElement actionArrowUi;
@UiField SimplePanel filterSelectContainerUi;
public SectionHeaderContent() {
@@ -94,7 +93,6 @@ public class SectionHeaderContent extends Composite {
animation.animate(collapsed);
}
});
- actionArrowUi.setSrc("images/mobile/arrow-down-grey.png");
actionArrowUi.addClassName(SectionHeaderResources.INSTANCE.css().accordion());
titleAndLabelContainerUi
.addClassName(SectionHeaderResources.INSTANCE.css().sectionheader_item_adjust_title_right());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.ui.xml
index fc23b72cc9d..13ab0f8ee35 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.ui.xml
@@ -3,6 +3,7 @@
@@ -17,8 +18,7 @@
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderResources.java
index 958321c349b..b70635b2283 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderResources.java
@@ -1,14 +1,20 @@
package com.sap.sailing.gwt.home.mobile.partials.sectionHeader;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface SectionHeaderResources extends ClientBundle {
+public interface SectionHeaderResources extends SharedHomeResources {
public static final SectionHeaderResources INSTANCE = GWT.create(SectionHeaderResources.class);
@Source("SectionHeader.gss")
LocalCss css();
+
+ @Source("filter.svg")
+ @MimeType("image/svg+xml")
+ DataResource filter();
public interface LocalCss extends CssResource {
String sectionheader();
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/filter.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/filter.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/filter.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/filter.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.gss
index b9f9282f293..89e1d70f740 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.gss
@@ -2,62 +2,12 @@
font-size: 1rem;
position: relative;
padding: 0.333333333333333em;
+ padding-bottom: 1em;
background: #f2f2f2;
-webkit-transition: top 0.3s ease-in-out;
-moz-transition: top 0.3s ease-in-out;
transition: top 0.3s ease-in-out;
}
-.eventheader .sidenavigation {
- display: none;
- position: absolute;
- top: 0;
- left: 0;
- width: 3em;
- height: 5.333333333333333em;
- z-index: 1;
-}
-.eventheader .sidenavigation_drawer {
- position: absolute;
- top: 1em;
- left: 0;
- width: 2em;
- height: 3.333333333333333em;
- background: DeepPink;
-}
-.eventheaderreduced {
- padding-bottom: 1em;
-}
-.eventheaderreduced .eventheader_info_subtitle {
- display: none;
-}
-.eventheaderreduced .quickfinder {
- display: none;
-}
-.eventheaderreduced .eventheader_inputwrapper {
- display: none;
-}
-.eventheaderfixedup {
- position: fixed;
- top: -3.533333333333333em;
- z-index: 10;
-}
-.eventheaderfixeddown {
- position: fixed;
- top: 0;
- z-index: 10;
-}
-.eventheadernobox {
- padding-bottom: 1em;
-}
-.eventheaderwithinputbox .eventheader_info {
- padding-top: 1em;
-}
-.eventheaderwithinputbox .sidenavigation_drawer {
- top: 0.333333333333333em;
-}
-.eventheaderwithinputbox .eventheader_inputwrapper {
- margin-top: 0.666666666666667em;
-}
.eventheader_info {
padding: 0.666666666666667em 0 0 0.666666666666667em;
}
@@ -103,39 +53,3 @@
.eventheader_info_subtitle_info_location {
visibility: visible;
}
-.eventheader_inputwrapper {
- padding: 0;
- margin-top: 0.666666666666667em;
-}
-.eventheader_input {
- float: left;
- display: block;
- font-weight: 600;
- padding: 0 2.333333333333333em 0 0.666666666666667em;
- width: 100%;
- height: 2.666666666666667em;
- border: none;
- vertical-align: middle;
-}
-.eventheader_button {
- float: left;
- width: 2.333333333333333em;
- height: 2.666666666666667em;
- margin-left: -2.333333333333333em;
- border: none;
- vertical-align: middle;
- background: url("../images/home/search-icon-yellow.svg") no-repeat;
- background-size: 1.333333333333333em 1.333333333333333em;
- background-position: center;
-}
-.eventheader .quickfinder {
- padding: 0;
- margin-top: 0.666666666666667em;
-}
-.eventheader .quickfinder_select {
- background: transparent;
- /* @alternate */ background: url("../images/home/quickfinder-arrow.svg") 100% no-repeat #f6f9fc;
-}
-.eventheaderplaceholder {
- font-size: inherit;
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.ui.xml
index 7179cac81ad..b1cf4afe5a6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.ui.xml
@@ -8,9 +8,7 @@
-
-
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeaderResources.java
index 87ce180bcac..79b73dd3d07 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeaderResources.java
@@ -12,17 +12,8 @@ public interface SeriesHeaderResources extends ClientBundle {
public interface LocalCss extends CssResource {
String eventheader();
- String sidenavigation();
- String sidenavigation_drawer();
- String eventheaderreduced();
String eventheader_info_subtitle();
- String quickfinder();
- String eventheader_inputwrapper();
- String eventheaderfixedup();
- String eventheaderfixeddown();
- String eventheadernobox();
- String eventheaderwithinputbox();
String eventheader_info();
String eventheader_info_title();
String eventheader_info_title_text();
@@ -32,9 +23,5 @@ public interface SeriesHeaderResources extends ClientBundle {
String eventheader_info_subtitle_info();
String eventheader_info_subtitle_info_date();
String eventheader_info_subtitle_info_location();
- String eventheader_input();
- String eventheader_button();
- String quickfinder_select();
- String eventheaderplaceholder();
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml
index 16989c71521..43f11e48734 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml
@@ -3,6 +3,7 @@
@@ -14,7 +15,7 @@
-
+
-
+
+ image="{res_local.sapInSailing}" showInitial="true">
@@ -60,7 +61,7 @@
+ image="{res_local.sapTrimmed}" showInitial="false">
@@ -78,7 +79,7 @@
+ image="{res_local.race}" showInitial="false">
@@ -94,7 +95,7 @@
+ image="{res_local.sapSailingInsight}" showInitial="false">
@@ -111,7 +112,7 @@
+ image="{res_local.sapSailingBuoyPinger}" showInitial="false">
@@ -127,7 +128,7 @@
+ image="{res_local.postTrimmed}" showInitial="false">
@@ -142,7 +143,7 @@
+ image="{res_local.simulatorTrimmed}" showInitial="false">
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java
index d841792ee5c..9d42fcc7031 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java
@@ -1,13 +1,14 @@
package com.sap.sailing.gwt.home.mobile.partials.solutions;
+import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.uibinder.client.UiConstructor;
import com.sap.sailing.gwt.home.mobile.partials.accordion.AccordionItem;
public class SolutionsItem extends AccordionItem {
@UiConstructor
- public SolutionsItem(String title, String imageUrl, boolean showInitial) {
- super(title, imageUrl, title, showInitial);
+ public SolutionsItem(String title, ImageResource image, boolean showInitial) {
+ super(title, image, title, showInitial);
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsResources.java
new file mode 100644
index 00000000000..170406cf0c9
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsResources.java
@@ -0,0 +1,20 @@
+package com.sap.sailing.gwt.home.mobile.partials.solutions;
+
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.shared.partials.solutions.SolutionsSharedResources;
+
+public interface SolutionsResources extends SolutionsSharedResources {
+
+ @Source("solutions-sap-trimmed.png")
+ ImageResource sapTrimmed();
+
+ @Source("solutions-race.png")
+ ImageResource race();
+
+ @Source("solutions-post-trimmed.png")
+ ImageResource postTrimmed();
+
+ @Source("solutions-simulator-trimmed.png")
+ ImageResource simulatorTrimmed();
+
+}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-post-trimmed.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-post-trimmed.png
new file mode 100644
index 00000000000..80d1b3172a4
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-post-trimmed.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-race.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-race.png
new file mode 100644
index 00000000000..ee141f53532
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-race.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sap-trimmed.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sap-trimmed.png
new file mode 100644
index 00000000000..9b1e60bed59
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sap-trimmed.png differ
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/solutions-simulator-trimmed.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-simulator-trimmed.png
similarity index 93%
rename from java/com.sap.sailing.gwt.ui/images/mobile/solutions-simulator-trimmed.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-simulator-trimmed.png
index 522e7eeedd4..25ec681ee0b 100644
Binary files a/java/com.sap.sailing.gwt.ui/images/mobile/solutions-simulator-trimmed.png and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-simulator-trimmed.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcoming.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcoming.ui.xml
index e4d65742f73..50620b4e50d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcoming.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcoming.ui.xml
@@ -5,11 +5,12 @@
- 
+ 
@@ -17,7 +18,7 @@
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingEvent.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingEvent.ui.xml
index a881101438e..12d6ea157d0 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingEvent.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingEvent.ui.xml
@@ -5,6 +5,7 @@
.holder {
@@ -25,7 +26,7 @@
-
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingResources.java
index 408bbae56cf..8d6251cbb2d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingResources.java
@@ -3,12 +3,18 @@ package com.sap.sailing.gwt.home.mobile.partials.upcoming;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
public interface EventsOverviewUpcomingResources extends ClientBundle {
public static final EventsOverviewUpcomingResources INSTANCE = GWT.create(EventsOverviewUpcomingResources.class);
@Source("EventsOverviewUpcoming.gss")
LocalCss css();
+
+ @Source("calender-icon-blue.svg")
+ @MimeType("image/svg+xml")
+ DataResource calendar();
public interface LocalCss extends CssResource {
String accordion();
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/calender-icon-blue.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/calender-icon-blue.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/calender-icon-blue.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/calender-icon-blue.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBox.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBox.gss
index a05bc5e5f9b..5da0d909f16 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBox.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBox.gss
@@ -44,11 +44,22 @@
position: relative;
color: #0a0a0a;
}
-.updatesbox_itemlink {
- background-image: url("images/home/arrow-grey-right.png");
+.updatesbox_itemlink:before {
+ position: absolute;
+ content: "";
+ right: 1em;
+ /* @alternate */ top: 50%;
+ /* @alternate */ top: calc(50% - 1.3333334em / 2);
+ height: 1.3333334em;
+ width: 1.3333334em;
+ background-size: 100%;
+ background-position: center;
+ background-image: resourceUrl('arrowDownGrey');
background-repeat: no-repeat;
- background-size: 9px 16px;
- background-position: 95% 50%;
+ -webkit-transform: rotate(270deg);
+ -moz-transform: rotate(270deg);
+ -ms-transform: rotate(270deg);
+ transform: rotate(270deg);
}
.updatesbox_itemlink:hover {
text-decoration: none;
@@ -68,6 +79,7 @@
background-repeat: no-repeat;
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
+ background-image: resourceUrl("news");
}
@media (max-width: 1190px) {
.updatesbox_item_icon {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.ui.xml
index c5c35020e10..ea41ccf45b9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.ui.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxResources.java
index 046477e0f1e..283441e9247 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.mobile.partials.updatesBox;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface UpdatesBoxResources extends ClientBundle {
+public interface UpdatesBoxResources extends SharedHomeResources {
public static final UpdatesBoxResources INSTANCE = GWT.create(UpdatesBoxResources.class);
@Source("UpdatesBox.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGallery.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGallery.gss
index a7a07165871..92274edc530 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGallery.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGallery.gss
@@ -10,15 +10,6 @@
.videoitem .info {
font-size: inherit;
}
-.videoitem .playicon {
- position: absolute;
- cursor: pointer;
- width: 100%;
- height: 100%;
- background: url("../images/home/play-icon.svg") no-repeat;
- background-size: 2.333333333333333em 2.333333333333333em;
- background-position: center;
-}
.videoitem .videoplaceholder {
height: 100%;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGalleryResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGalleryResources.java
index 40a9853d96e..666e8555f08 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGalleryResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGalleryResources.java
@@ -14,7 +14,6 @@ public interface VideoGalleryResources extends ClientBundle {
String videoitem();
String playbutton();
String info();
- String playicon();
String videoplaceholder();
String videoplaceholder_image();
String video();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java
index 1a0375faa50..85013e065d7 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java
@@ -1,6 +1,11 @@
package com.sap.sailing.gwt.home.mobile.places.event;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.communication.eventview.EventViewDTO;
import com.sap.sailing.gwt.home.desktop.places.event.multiregatta.mediatab.MultiregattaMediaPlace;
import com.sap.sailing.gwt.home.desktop.places.event.multiregatta.overviewtab.MultiregattaOverviewPlace;
@@ -19,6 +24,7 @@ import com.sap.sailing.gwt.home.mobile.places.event.overview.regatta.RegattaActi
import com.sap.sailing.gwt.home.mobile.places.event.races.RacesActivity;
import com.sap.sailing.gwt.home.shared.places.event.AbstractEventActivityProxy;
import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
public class EventActivityProxy extends AbstractEventActivityProxy {
@@ -35,17 +41,32 @@ public class EventActivityProxy extends AbstractEventActivityProxy new RegattaActivity((RegattaOverviewPlace) place, event, getNavigationPathDisplay(), clientFactory, flagImageResolver));
} else if (place instanceof RegattaRacesPlace) {
super.onSuccess(new RacesActivity((RegattaRacesPlace) place, event, getNavigationPathDisplay(), clientFactory));
} else if (place instanceof MiniLeaderboardPlace) {
- super.onSuccess(new MiniLeaderboardActivity((MiniLeaderboardPlace) place, event, getNavigationPathDisplay(), clientFactory));
+ withFlagImageResolver(flagImageResolver -> new MiniLeaderboardActivity((MiniLeaderboardPlace) place, event, getNavigationPathDisplay(), clientFactory, flagImageResolver));
} else if (place instanceof LatestNewsPlace) {
super.onSuccess(new LatestNewsActivity((LatestNewsPlace) place, event, getNavigationPathDisplay(), clientFactory));
} else if (place instanceof RegattaMediaPlace || place instanceof MultiregattaMediaPlace) {
super.onSuccess(new MediaActivity(place, event, getNavigationPathDisplay(), clientFactory));
}
}
+
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
+ }
});
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/minileaderboard/MiniLeaderboardActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/minileaderboard/MiniLeaderboardActivity.java
index 6cb83f64322..e72e6a7782c 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/minileaderboard/MiniLeaderboardActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/minileaderboard/MiniLeaderboardActivity.java
@@ -9,12 +9,16 @@ import com.sap.sailing.gwt.home.mobile.places.event.EventViewBase;
import com.sap.sailing.gwt.home.mobile.places.event.minileaderboard.MiniLeaderboardView.Presenter;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class MiniLeaderboardActivity extends AbstractEventActivity implements Presenter {
- public MiniLeaderboardActivity(MiniLeaderboardPlace place, EventViewDTO eventDTO, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory) {
+ private final FlagImageResolver flagImageResolver;
+
+ public MiniLeaderboardActivity(MiniLeaderboardPlace place, EventViewDTO eventDTO, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
super(place, eventDTO, clientFactory);
+ this.flagImageResolver = flagImageResolver;
initNavigationPath(navigationPathDisplay);
}
@@ -27,7 +31,7 @@ public class MiniLeaderboardActivity extends AbstractEventActivity implements MiniLeaderboardView {
@@ -12,9 +13,9 @@ public class MiniLeaderboardViewImpl extends AbstractEventView implements EventViewBase.Presenter {
- public RegattaActivity(RegattaOverviewPlace place, EventViewDTO eventDTO, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory) {
+ private final FlagImageResolver flagImageResolver;
+
+ public RegattaActivity(RegattaOverviewPlace place, EventViewDTO eventDTO, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
super(place, eventDTO, clientFactory);
+ this.flagImageResolver = flagImageResolver;
initNavigationPath(navigationPathDisplay);
}
@@ -25,7 +29,7 @@ public class RegattaActivity extends AbstractEventActivity
@Override
protected EventViewBase initView() {
- final AbstractEventOverview view = new RegattaOverviewImpl(this);
+ final AbstractEventOverview view = new RegattaOverviewImpl(this, flagImageResolver);
initSeriesNavigation(view);
initQuickfinder(view, true);
if (!isMultiRegattaEvent()) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/overview/regatta/RegattaOverviewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/overview/regatta/RegattaOverviewImpl.java
index 629832b022a..83403e8d3a8 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/overview/regatta/RegattaOverviewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/overview/regatta/RegattaOverviewImpl.java
@@ -19,6 +19,7 @@ import com.sap.sailing.gwt.home.mobile.partials.quickfinder.Quickfinder;
import com.sap.sailing.gwt.home.mobile.places.QuickfinderPresenter;
import com.sap.sailing.gwt.home.mobile.places.event.EventViewBase;
import com.sap.sailing.gwt.home.mobile.places.event.overview.AbstractEventOverview;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class RegattaOverviewImpl extends AbstractEventOverview {
@@ -28,8 +29,11 @@ public class RegattaOverviewImpl extends AbstractEventOverview {
private EventSteps eventStepsUi;
private RegattaLiveRaces liveRacesUi;
- public RegattaOverviewImpl(EventViewBase.Presenter presenter) {
+ private final FlagImageResolver flagImageResolver;
+
+ public RegattaOverviewImpl(EventViewBase.Presenter presenter, FlagImageResolver flagImageResolver) {
super(presenter, presenter.isMultiRegattaEvent(), presenter.isMultiRegattaEvent());
+ this.flagImageResolver = flagImageResolver;
FlowPanel container = new FlowPanel();
if (presenter.getRegatta() != null) {
this.setupProgress(container);
@@ -62,7 +66,7 @@ public class RegattaOverviewImpl extends AbstractEventOverview {
}
private void setupMiniLeaderboard(Panel container) {
- MinileaderboardBox miniLeaderboard = new MinileaderboardBox(false);
+ MinileaderboardBox miniLeaderboard = new MinileaderboardBox(false, flagImageResolver);
miniLeaderboard.setAction(MSG.showAll(), currentPresenter.getRegattaMiniLeaderboardNavigation(getRegattaId()));
if (currentPresenter.getRegatta() != null) {
refreshManager.add(miniLeaderboard, new GetMiniLeaderbordAction(getEventId(), getRegattaId(), 3));
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/events/EventsActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/events/EventsActivityProxy.java
deleted file mode 100755
index 4d65e26ae5f..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/events/EventsActivityProxy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sap.sailing.gwt.home.mobile.places.events;
-
-import com.google.gwt.core.client.GWT;
-import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
-import com.sap.sailing.gwt.home.shared.places.events.EventsPlace;
-import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
-
-public class EventsActivityProxy extends AbstractActivityProxy {
-
- private final MobileApplicationClientFactory clientFactory;
- private final EventsPlace currentPlace;
-
- public EventsActivityProxy(EventsPlace place, MobileApplicationClientFactory clientFactory) {
- this.currentPlace = place;
- this.clientFactory = clientFactory;
- }
-
- @Override
- protected void startAsync() {
- GWT.runAsync(new AbstractRunAsyncCallback() {
- @Override
- public void onSuccess() {
- super.onSuccess(new EventsActivity(currentPlace, clientFactory));
- }
- });
- }
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java
index 0dfb716bcac..43d87f3c873 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java
@@ -18,17 +18,20 @@ import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
public class SeriesActivity extends AbstractActivity implements SeriesView.Presenter {
private final MobileApplicationClientFactory clientFactory;
private final AbstractSeriesPlace place;
private EventSeriesViewDTO series;
private final NavigationPathDisplay navigationPathDisplay;
+ private final FlagImageResolver flagImageResolver;
- public SeriesActivity(AbstractSeriesPlace place, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory) {
+ public SeriesActivity(AbstractSeriesPlace place, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
this.navigationPathDisplay = navigationPathDisplay;
this.clientFactory = clientFactory;
this.place = place;
+ this.flagImageResolver = flagImageResolver;
}
@Override
@@ -46,7 +49,7 @@ public class SeriesActivity extends AbstractActivity implements SeriesView.Prese
}
private void initUi(final AcceptsOneWidget panel, EventBus eventBus, EventSeriesViewDTO series) {
- final SeriesView view = new SeriesViewImpl(this);
+ final SeriesView view = new SeriesViewImpl(this, flagImageResolver);
view.setQuickFinderValues(series.getDisplayName(), series.getEventsDescending());
panel.setWidget(view.asWidget());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivityProxy.java
index 1bd0f3811f5..4ce421ea3b8 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivityProxy.java
@@ -1,10 +1,16 @@
package com.sap.sailing.gwt.home.mobile.places.series;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
public class SeriesActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath {
@@ -28,7 +34,21 @@ public class SeriesActivityProxy extends AbstractActivityProxy implements Provid
GWT.runAsync(new AbstractRunAsyncCallback() {
@Override
public void onSuccess() {
- super.onSuccess(new SeriesActivity(currentPlace, navigationPathDisplay, clientFactory));
+ withFlagImageResolver(flagImageResolver -> new SeriesActivity(currentPlace, navigationPathDisplay, clientFactory, flagImageResolver));
+ }
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
}
});
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesViewImpl.java
index 29f105b7b72..400bafadfcb 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesViewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesViewImpl.java
@@ -22,6 +22,7 @@ import com.sap.sailing.gwt.home.mobile.places.QuickfinderPresenter;
import com.sap.sailing.gwt.home.shared.partials.statistics.EventStatisticsBox;
import com.sap.sailing.gwt.home.shared.refresh.LifecycleRefreshManager;
import com.sap.sailing.gwt.home.shared.refresh.RefreshManager;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class SeriesViewImpl extends Composite implements SeriesView {
@@ -40,13 +41,13 @@ public class SeriesViewImpl extends Composite implements SeriesView {
private final Presenter currentPresenter;
private final RefreshManager refreshManager;
- public SeriesViewImpl(SeriesView.Presenter presenter) {
+ public SeriesViewImpl(SeriesView.Presenter presenter, FlagImageResolver flagImageResolver) {
this.currentPresenter = presenter;
this.refreshManager = new LifecycleRefreshManager(this, currentPresenter.getDispatch());
EventSeriesViewDTO series = currentPresenter.getSeriesDTO();
eventHeaderUi = new SeriesHeader(series);
this.setupStatisticsBox(series);
- leaderboardUi = new MinileaderboardBox(true);
+ leaderboardUi = new MinileaderboardBox(true, flagImageResolver);
initWidget(uiBinder.createAndBindUi(this));
this.setupListContent(series);
this.setupEventListContent(series);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java
index 71b98f481bd..4f669b1ef93 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java
@@ -17,6 +17,7 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class SeriesMiniOverallLeaderboardActivity extends AbstractActivity implements SeriesMiniOverallLeaderboardView.Presenter {
@@ -24,11 +25,13 @@ public class SeriesMiniOverallLeaderboardActivity extends AbstractActivity imple
private final SeriesMiniOverallLeaderboardPlace place;
private EventSeriesViewDTO series;
private final NavigationPathDisplay navigationPathDisplay;
+ private final FlagImageResolver flagImageResolver;
- public SeriesMiniOverallLeaderboardActivity(SeriesMiniOverallLeaderboardPlace place, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory) {
+ public SeriesMiniOverallLeaderboardActivity(SeriesMiniOverallLeaderboardPlace place, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
this.navigationPathDisplay = navigationPathDisplay;
this.clientFactory = clientFactory;
this.place = place;
+ this.flagImageResolver = flagImageResolver;
}
@Override
@@ -47,7 +50,7 @@ public class SeriesMiniOverallLeaderboardActivity extends AbstractActivity imple
}
private void initUi(AcceptsOneWidget panel, EventBus eventBus, EventSeriesViewDTO series) {
- final SeriesMiniOverallLeaderboardView view = new SeriesMiniOverallLeaderboardViewImpl(this);
+ final SeriesMiniOverallLeaderboardView view = new SeriesMiniOverallLeaderboardViewImpl(this, flagImageResolver);
view.setQuickFinderValues(series.getDisplayName(), series.getEventsDescending());
panel.setWidget(view.asWidget());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivityProxy.java
index 6a78c02729b..37542e98c03 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivityProxy.java
@@ -1,9 +1,15 @@
package com.sap.sailing.gwt.home.mobile.places.series.minileaderboard;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
public class SeriesMiniOverallLeaderboardActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath {
@@ -27,8 +33,23 @@ public class SeriesMiniOverallLeaderboardActivityProxy extends AbstractActivityP
GWT.runAsync(new AbstractRunAsyncCallback() {
@Override
public void onSuccess() {
- super.onSuccess(new SeriesMiniOverallLeaderboardActivity(currentPlace, navigationPathDisplay, clientFactory));
+ withFlagImageResolver(flagImageResolver -> new SeriesMiniOverallLeaderboardActivity(currentPlace, navigationPathDisplay, clientFactory, flagImageResolver));
+ }
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
}
});
+
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardViewImpl.java
index c30a3667813..71dd3b0716d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardViewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardViewImpl.java
@@ -17,6 +17,7 @@ import com.sap.sailing.gwt.home.mobile.places.QuickfinderPresenter;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
import com.sap.sailing.gwt.home.shared.refresh.LifecycleRefreshManager;
import com.sap.sailing.gwt.home.shared.refresh.RefreshManager;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class SeriesMiniOverallLeaderboardViewImpl extends Composite implements SeriesMiniOverallLeaderboardView {
@@ -33,9 +34,9 @@ public class SeriesMiniOverallLeaderboardViewImpl extends Composite implements S
@UiField(provided = true)
MinileaderboardBox minileaderboardUi;
- public SeriesMiniOverallLeaderboardViewImpl(Presenter presenter) {
+ public SeriesMiniOverallLeaderboardViewImpl(Presenter presenter, FlagImageResolver flagImageResolver) {
this.currentPresenter = presenter;
- minileaderboardUi = new MinileaderboardBox(true);
+ minileaderboardUi = new MinileaderboardBox(true, flagImageResolver);
eventHeaderUi = new SeriesHeader(presenter.getSeriesDTO(), presenter.getSeriesNavigation());
initWidget(uiBinder.createAndBindUi(this));
RefreshManager refreshManager = new LifecycleRefreshManager(this, currentPresenter.getDispatch());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/start/StartActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/start/StartActivityProxy.java
deleted file mode 100755
index 6a1003aed31..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/start/StartActivityProxy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sap.sailing.gwt.home.mobile.places.start;
-
-import com.google.gwt.core.client.GWT;
-import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
-import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
-import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
-
-public class StartActivityProxy extends AbstractActivityProxy {
-
- private final MobileApplicationClientFactory clientFactory;
- private final StartPlace currentPlace;
-
- public StartActivityProxy(StartPlace place, MobileApplicationClientFactory clientFactory) {
- this.currentPlace = place;
- this.clientFactory = clientFactory;
- }
-
- @Override
- protected void startAsync() {
- GWT.runAsync(new AbstractRunAsyncCallback() {
- @Override
- public void onSuccess() {
- super.onSuccess(new StartActivity(currentPlace, clientFactory));
- }
- });
- }
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileActivityProxy.java
index cd5cc98ec32..ce0a9698adc 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileActivityProxy.java
@@ -1,6 +1,11 @@
package com.sap.sailing.gwt.home.mobile.places.user.profile;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
import com.sap.sailing.gwt.home.mobile.places.user.profile.details.UserProfileDetailsActivity;
import com.sap.sailing.gwt.home.mobile.places.user.profile.preferences.UserProfilePreferencesActivity;
@@ -8,6 +13,7 @@ import com.sap.sailing.gwt.home.mobile.places.user.profile.settings.UserProfileS
import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserProfilePreferencesPlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.settings.UserProfileSettingsPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
public class UserProfileActivityProxy extends AbstractActivityProxy {
@@ -27,13 +33,27 @@ public class UserProfileActivityProxy extends AbstractActivityProxy {
public void onSuccess() {
if (currentPlace instanceof UserProfilePreferencesPlace) {
UserProfilePreferencesPlace userProfilePrefsPlace = (UserProfilePreferencesPlace) currentPlace;
- super.onSuccess(new UserProfilePreferencesActivity(userProfilePrefsPlace, clientFactory));
+ withFlagImageResolver(flagImageResolver -> new UserProfilePreferencesActivity(userProfilePrefsPlace, clientFactory, flagImageResolver));
} else if(currentPlace instanceof UserProfileSettingsPlace) {
super.onSuccess(new UserProfileSettingsActivity((UserProfileSettingsPlace) currentPlace, clientFactory));
} else {
super.onSuccess(new UserProfileDetailsActivity(currentPlace, clientFactory));
}
}
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
+ }
});
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesActivity.java
index 52a76ca1ff3..4b1c44212c6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesActivity.java
@@ -7,6 +7,7 @@ import com.sap.sailing.gwt.home.mobile.places.user.profile.AbstractUserProfileAc
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferencesPresenter;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferencesView;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferencesView.Presenter;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserProfilePreferencesPlace;
import com.sap.sse.security.ui.authentication.AuthenticationContextEvent;
@@ -16,10 +17,10 @@ public class UserProfilePreferencesActivity extends AbstractUserProfileActivity
private final UserProfilePreferencesView currentView;
public UserProfilePreferencesActivity(UserProfilePreferencesPlace place,
- MobileApplicationClientFactory clientFactory) {
+ MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
super(clientFactory);
this.userPreferencesPresenter = new UserPreferencesPresenter(clientFactory);
- this.currentView = new UserProfilePreferencesViewImpl(this);
+ this.currentView = new UserProfilePreferencesViewImpl(this, flagImageResolver);
}
@Override
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesViewImpl.java
index 40ce89ce96b..d68f284d3f6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesViewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesViewImpl.java
@@ -3,14 +3,15 @@ package com.sap.sailing.gwt.home.mobile.places.user.profile.preferences;
import com.sap.sailing.gwt.home.mobile.places.user.profile.AbstractUserProfileView;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferences;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferencesView;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
public class UserProfilePreferencesViewImpl extends AbstractUserProfileView implements UserProfilePreferencesView {
private final UserPreferencesView userPreferencesView;
- public UserProfilePreferencesViewImpl(UserProfilePreferencesView.Presenter presenter) {
+ public UserProfilePreferencesViewImpl(UserProfilePreferencesView.Presenter presenter, FlagImageResolver flagImageResolver) {
super(presenter);
- this.userPreferencesView = new UserPreferences(presenter.getUserPreferencesPresenter());
+ this.userPreferencesView = new UserPreferences(presenter.getUserPreferencesPresenter(), flagImageResolver);
this.userPreferencesView.setEdgeToEdge(true);
this.setViewContent(userPreferencesView);
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/SwitchingEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/SwitchingEntryPoint.java
index e58ad8506f6..7b26afed818 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/SwitchingEntryPoint.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/SwitchingEntryPoint.java
@@ -10,7 +10,6 @@ import java.util.logging.Logger;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.dom.client.Document;
@@ -18,8 +17,6 @@ import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceHistoryMapper;
import com.google.gwt.user.client.Cookies;
import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.RootPanel;
import com.sap.sailing.gwt.common.client.SharedResources;
import com.sap.sailing.gwt.home.desktop.DesktopEntryPoint;
import com.sap.sailing.gwt.home.mobile.MobileEntryPoint;
@@ -35,9 +32,10 @@ import com.sap.sse.gwt.client.formfactor.DeviceDetector;
*
* The decision is made on the following aspects:
*
- * - the type of device (desktop, phone, table)
- * - the place to be shown and if the place is available for one or the other form factor
- * - the user preference that is being triggered by the user clicking "desktop version" or "mobile version" links in the page footer
+ * - the type of device (desktop, phone, table)
+ * - the place to be shown and if the place is available for one or the other form factor
+ * - the user preference that is being triggered by the user clicking "desktop version" or "mobile version" links in
+ * the page footer
*
*/
public class SwitchingEntryPoint implements EntryPoint {
@@ -51,10 +49,10 @@ public class SwitchingEntryPoint implements EntryPoint {
public void onModuleLoad() {
Document.get().getElementById("loading").removeFromParent();
LOG.info("Start switching entry point");
-
+
SharedResources.INSTANCE.mediaCss().ensureInjected();
SharedResources.INSTANCE.mainCss().ensureInjected();
-
+
String hash = Window.Location.getHash();
if (hash != null && hash.startsWith("#")) {
hash = hash.substring(1);
@@ -91,8 +89,9 @@ public class SwitchingEntryPoint implements EntryPoint {
*
* @param place
* {@link Place} to check
- * @return true if the given {@link Place} implements {@link HasMobileVersion} interface or the implemented
- * {@link MobileSupport#hasMobileVersion()} method returns true, false otherwise
+ * @return true if the given {@link Place} implements {@link HasMobileVersion} interface or the
+ * implemented {@link MobileSupport#hasMobileVersion()} method returns true, false
+ * otherwise
*/
public static boolean hasMobileVersion(Place place) {
return place instanceof HasMobileVersion
@@ -111,12 +110,7 @@ public class SwitchingEntryPoint implements EntryPoint {
// only force "not mobile" on mobile devices
Cookies.setCookie(SAPSAILING_MOBILE, "false");
}
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
- @Override
- public void execute() {
- Window.Location.reload();
- }
- });
+ reloadApp();
}
public static void switchToMobile() {
@@ -126,48 +120,22 @@ public class SwitchingEntryPoint implements EntryPoint {
// only force mobile version on desktop
Cookies.setCookie(SAPSAILING_MOBILE, "true");
}
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
- @Override
- public void execute() {
- Window.Location.reload();
- }
- });
+ reloadApp();
}
private void startMobile() {
configureMobileHeader();
- GWT.runAsync(MobileEntryPoint.class, new RunAsyncCallback() {
- @Override
- public void onSuccess() {
- new MobileEntryPoint().onModuleLoad();
- }
-
- @Override
- public void onFailure(Throwable reason) {
- LOG.severe("Failed to async start mobile version: " + reason.getMessage());
- RootPanel.get().add(new Label("Failed to load mobile version"));
- }
- });
+ new MobileEntryPoint().onModuleLoad();
}
private void startDesktop() {
configureDesktopHeader();
- GWT.runAsync(DesktopEntryPoint.class, new RunAsyncCallback() {
- @Override
- public void onSuccess() {
- new DesktopEntryPoint().onModuleLoad();
- }
-
- @Override
- public void onFailure(Throwable reason) {
- LOG.severe("Failed to async start desktop version: " + reason.getMessage());
- RootPanel.get().add(new Label("Failed to load desktop version"));
- }
- });
+ new DesktopEntryPoint().onModuleLoad();
}
private void configureDesktopHeader() {
- setViewportToDeviceWidth(DeviceDetector.isTablet() ? SCALE_VALUE_SMALLER : SCALE_VALUE_SMALL, SCALE_VALUE_LARGE);
+ setViewportToDeviceWidth(DeviceDetector.isTablet() ? SCALE_VALUE_SMALLER : SCALE_VALUE_SMALL,
+ SCALE_VALUE_LARGE);
}
private void configureMobileHeader() {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversariesPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversariesPresenter.java
index 3a53653758b..2b6a16002b7 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversariesPresenter.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversariesPresenter.java
@@ -23,7 +23,7 @@ import com.sap.sse.gwt.client.shared.perspective.PerspectiveCompositeSettings;
*/
public class AnniversariesPresenter implements RefreshableWidget {
- private static final String ANNOUNCEMENT_ICON = "images/mobile/icon-bottle-white.svg";
+ private static final String ANNOUNCEMENT_ICON = AnniversaryResources.INSTANCE.bottle().getSafeUri().asString();
private static final StringMessages I18N = StringMessages.INSTANCE;
private static final NumberFormat COUNT_FORMAT = NumberFormat.getFormat("#,###");
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversaryResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversaryResources.java
new file mode 100644
index 00000000000..9f40a96d1e0
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversaryResources.java
@@ -0,0 +1,15 @@
+package com.sap.sailing.gwt.home.shared.partials.anniversary;
+
+import com.google.gwt.core.shared.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+
+public interface AnniversaryResources extends ClientBundle {
+
+ public static final AnniversaryResources INSTANCE = GWT.create(AnniversaryResources.class);
+
+ @Source("icon-bottle-white.svg")
+ @MimeType("image/svg+xml")
+ DataResource bottle();
+}
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/icon-bottle-white.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/icon-bottle-white.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/icon-bottle-white.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/icon-bottle-white.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/countdown/Countdown.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/countdown/Countdown.gss
index 2d1d1467eef..5449fa3af82 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/countdown/Countdown.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/countdown/Countdown.gss
@@ -13,7 +13,6 @@
height: 100%;
background-size: cover;
background-position: center;
- background-image: url("images/home/countdown-thumbnail.png");
}
.countdown_content {
position: absolute;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml
index 9e72e0da75c..cc87c47267e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml
@@ -1,6 +1,7 @@
.popup {
position: fixed !important;
@@ -93,7 +94,7 @@
-
+
+ {3}
")
SafeHtml viewStateRunning(String styleNamesBar, String styleNamesProgress, SafeStyles width, String text);
- @Template("
")
- SafeHtml windDirection(SafeStyles rotation);
+ @Template("{5}
")
- SafeHtml winner(String styleNamesFlag, String styleNamesSailId, String styleNamesText, SafeUri flagImageURL, String sailId, String name);
+ @SafeHtmlTemplates.Template("{3}{4}
")
+ SafeHtml winner(String styleNamesSailId, String styleNamesText, String flagImageURL, String sailId, String name);
@Template("
- > extends Abstr
@Template("")
- SafeHtml raceviewerLaunchPad(String styleNames, String iconStyleNames, String text);
+ @Template("")
+ SafeHtml raceviewerLaunchPad(String styleNames, String iconStyleNames, String text, SafeUri iconUrl);
- @Template(" ")
- SafeHtml standaloneButton(String styleNames, String iconStyleNames, String text, String icon, SafeUri safeUri);
+ @Template(" ")
+ SafeHtml standaloneButton(String styleNames, String iconStyleNames, String text, SafeUri iconUrl, SafeUri safeUri);
}
private static final CellTemplates TEMPLATE = GWT.create(CellTemplates.class);
@@ -66,13 +67,13 @@ public class RaceviewerLaunchPadCell> extends Abstr
switch (launchPadController.getRenderingStyle(data)) {
case WATCH_LIVE_ONLY:
sb.append(TEMPLATE.standaloneButton(plannedStyleNames, iconStyleNames, I18N.watchLive(),
- "launch-play", UriUtils.fromString(launchPadController.getDirectLinkUrl(data))));
+ SharedHomeResources.INSTANCE.launchPlay().getSafeUri(), UriUtils.fromString(launchPadController.getDirectLinkUrl(data))));
break;
case WATCH_LIVE_OR_ANALYZE:
- sb.append(TEMPLATE.raceviewerLaunchPad(liveStyleNames, iconStyleNames, I18N.raceDetailsToShow()));
+ sb.append(TEMPLATE.raceviewerLaunchPad(liveStyleNames, iconStyleNames, I18N.raceDetailsToShow(), SharedHomeResources.INSTANCE.launchLoupe().getSafeUri()));
break;
case ANALYZE:
- sb.append(TEMPLATE.raceviewerLaunchPad(analyzeStyleNames, iconStyleNames, I18N.raceDetailsToShow()));
+ sb.append(TEMPLATE.raceviewerLaunchPad(analyzeStyleNames, iconStyleNames, I18N.raceDetailsToShow(), SharedHomeResources.INSTANCE.launchLoupe().getSafeUri()));
break;
case NOT_TRACKED:
sb.append(TEMPLATE.raceNotTracked(notTrackedStyleNames, showNotTracked ? I18N.eventRegattaRaceNotTracked() : ""));
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss
index 1840dcd6c5e..838f946303d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss
@@ -144,7 +144,7 @@
display: inline-block;
width: 1em;
height: 0.866666666666667em;
- background: url("images/home/launch-loupe.svg") no-repeat center center;
+ background: resourceUrl("launchLoupe") no-repeat center center;
font-size: 1.466666666666667em;
position: absolute;
right: 0;
@@ -175,7 +175,7 @@
background-color: #8a8a8a;
}
.fleet_races_raceplanned .fleet_races_race_name:after {
- background: url("images/home/launch-play.svg") no-repeat center center;
+ background: resourceUrl("launchPlay") no-repeat center center;
}
.fleet_races_raceuntracked .fleet_races_race_name:after {
display: none;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java
index 25731591094..6b9b757e840 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.regattacompetition;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface RegattaCompetitionResources extends ClientBundle {
+public interface RegattaCompetitionResources extends SharedHomeResources {
public static final RegattaCompetitionResources INSTANCE = GWT.create(RegattaCompetitionResources.class);
@Source("RegattaCompetition.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.gss
index c6777ba0f40..2e52f509b83 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.gss
@@ -100,7 +100,7 @@
text-align: right;
padding: 0.666666666666667em;
padding-right: 5.333333333333333em;
- background-image: url("images/home/arrow-down-grey.png");
+ background-image: resourceUrl("arrowDownGrey");
background-size: 1.333333333333333em 1.333333333333333em;
background-position: center;
background-repeat: no-repeat;
@@ -170,3 +170,41 @@ img.regattaheader_update_title_icon {
.regattaheader_update_timestamp {
font-size: 12px;
}
+.iconHeaderGPS, .iconHeaderWind, .iconHeaderVideo, .iconHeaderAudio {
+ pointer-events: none;
+}
+.iconHeaderGPS, .iconGPS {
+ background-image: resourceUrl('gpsFixes');
+}
+.iconHeaderWind, .iconWind {
+ background-image: resourceUrl('wind');
+}
+.iconHeaderVideo, .iconVideo {
+ background-image: resourceUrl('video');
+}
+.iconHeaderAudio, .iconAudio {
+ background-image: resourceUrl('audio');
+}
+
+.iconGPS, .iconWind, .iconVideo, .iconAudio {
+ line-height: 1.5em;
+ position: relative;
+ height:1.666666666666667rem;
+ display: inline-block;
+ padding-left: 2.333333333333333em;
+ background-size: 1.666666666666667rem 1.666666666666667rem;
+ background-position: left bottom;
+ background-repeat: no-repeat;
+}
+.iconWind {
+ margin-left: 0.666666666666667em;
+ border-left: 1px solid #ccc;
+}
+.iconVideo {
+ padding-top: 0.277777777777778em;
+}
+.iconAudio {
+ margin-left: 0.666666666666667em;
+ border-left: 1px solid #ccc;
+ padding-top: 0.277777777777778em;
+}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.ui.xml
index e8979872c35..43e5f24b5a2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeader.ui.xml
@@ -12,10 +12,10 @@
- .iconGPS, .iconWind, .iconVideo, .iconAudio {
- line-height: 1.5em;
- position: relative;
- height:1.666666666666667rem;
- display: inline-block;
- padding-left: 2.333333333333333em;
- background-size: 1.666666666666667rem 1.666666666666667rem;
- background-position: left bottom;
- background-repeat: no-repeat;
- }
- .iconGPS {
- background-image:url('images/home/raw_gps_fixes.png');
- }
- .iconWind {
- margin-left: 0.666666666666667em;
- background-image:url('images/home/icon-wind.png');
- border-left: 1px solid #ccc;
- }
- .iconVideo {
- background-image:url('images/home/icon-video.png');
- padding-top: 0.277777777777778em;
- }
- .iconAudio {
- margin-left: 0.666666666666667em;
- background-image:url('images/home/icon-audio.png');
- border-left: 1px solid #ccc;
- padding-top: 0.277777777777778em;
- }
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderResources.java
index 93faedeea4b..369f29552aa 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.regattaheader;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface RegattaHeaderResources extends ClientBundle {
+public interface RegattaHeaderResources extends SharedDesktopResources {
public static final RegattaHeaderResources INSTANCE = GWT.create(RegattaHeaderResources.class);
@Source("RegattaHeader.gss")
@@ -29,5 +29,15 @@ public interface RegattaHeaderResources extends ClientBundle {
String regattaheader_update_title();
String regattaheader_update_title_icon();
String regattaheader_update_timestamp();
+
+ String iconHeaderGPS();
+ String iconHeaderWind();
+ String iconHeaderVideo();
+ String iconHeaderAudio();
+
+ String iconGPS();
+ String iconWind();
+ String iconVideo();
+ String iconAudio();
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigation.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigation.gss
index d902be63d69..f42078ac10b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigation.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigation.gss
@@ -49,7 +49,7 @@
font-size: 0.866666666666667rem;
text-align: right;
margin-top: 0;
- background: transparent url("images/home/arrow-down-filled-black.png") no-repeat;
+ background: transparent resourceUrl("arrowDownFilledBlack") no-repeat;
background-position: 96%;
background-size: 0.923076923076923em 0.538461538461538em;
border: 1px solid transparent;
@@ -65,7 +65,7 @@
background-color: #f2f2f2;
}
.regattanavigation_filter.jsdropdownactive {
- background-image: url("images/home/arrow-down-filled-yellow.png");
+ background-image: resourceUrl("arrowDownFilledYellow");
}
.regattanavigation_filter.jsdropdownactive .regattanavigation_filter_dropdown {
display: block;
@@ -98,7 +98,7 @@
text-decoration: underline;
}
.regattanavigation_filter_dropdown_linkactive {
- background: url("images/home/dropdown__check@2x.png") no-repeat;
+ background: resourceUrl("dropdownCheck") no-repeat;
background-position: 95%;
background-size: 1.2em 0.933333333333333em;
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigationResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigationResources.java
index 03f153c1b43..f51c44f3a33 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigationResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/RegattaNavigationResources.java
@@ -1,14 +1,18 @@
package com.sap.sailing.gwt.home.desktop.partials.regattanavigation;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface RegattaNavigationResources extends ClientBundle {
+public interface RegattaNavigationResources extends SharedDesktopResources {
public static final RegattaNavigationResources INSTANCE = GWT.create(RegattaNavigationResources.class);
@Source("RegattaNavigation.gss")
LocalCss css();
+
+ @Source("arrow-down-filled-yellow.png")
+ ImageResource arrowDownFilledYellow();
public interface LocalCss extends CssResource {
String jsdropdown();
diff --git a/java/com.sap.sailing.gwt.ui/images/home/arrow-down-filled-yellow.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/arrow-down-filled-yellow.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/arrow-down-filled-yellow.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/arrow-down-filled-yellow.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.gss
similarity index 91%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.css
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.gss
index c601764690a..def48028ee1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.css
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.gss
@@ -2,8 +2,8 @@
* styles for search result page
*/
.paging {
- font-size: 16px;
- font-size: 1rem;
+ /* @alternate */ font-size: 16px;
+ /* @alternate */ font-size: 1rem;
margin-top: 1.875em;
}
.paging_perpage {
@@ -41,7 +41,7 @@
height: 0;
overflow: hidden;
border: 0;
- background-image: url("images/home/paging-icons.png");
+ background-image: resourceUrl("paging");
background-repeat: no-repeat;
background-position: left center;
background-size: cover;
@@ -51,8 +51,8 @@
background-position: -2.5em center;
}
.dropdown {
- font-size: 16px;
- font-size: 1rem;
+ /* @alternate */ font-size: 16px;
+ /* @alternate */ font-size: 1rem;
width: 18.75em;
display: inline-block;
}
@@ -114,8 +114,8 @@
font-size: 1em;
}
.searchresult {
- font-size: 16px;
- font-size: 1rem;
+ /* @alternate */ font-size: 16px;
+ /* @alternate */ font-size: 1rem;
}
.searchresult_form {
display: block;
@@ -130,7 +130,7 @@
.searchresult_form_input {
display: block;
padding: 0.625em 0 0.5625em 2.5em;
- background-image: url("images/home/search-icon-grey.png");
+ background-image: resourceUrl("search");
background-repeat: no-repeat;
background-color: #f6f9fc;
background-position: 0.625em center;
@@ -139,8 +139,8 @@
float: left;
}
.searchresult_form_button {
- font-size: 16px;
- font-size: 1rem;
+ /* @alternate */ font-size: 16px;
+ /* @alternate */ font-size: 1rem;
width: 10%;
float: right;
text-transform: uppercase;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.ui.xml
index 498509744ec..e92ebc875de 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.ui.xml
@@ -23,19 +23,6 @@
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListResources.java
index 2570e15c311..a5af4cd0376 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListResources.java
@@ -1,14 +1,20 @@
package com.sap.sailing.gwt.home.desktop.partials.racelist;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface RaceListResources extends ClientBundle {
+public interface RaceListResources extends SharedDesktopResources {
public static final RaceListResources INSTANCE = GWT.create(RaceListResources.class);
@Source("RaceList.gss")
LocalCss css();
+
+ @Source("windkompass_nord.svg")
+ @MimeType("image/svg+xml")
+ DataResource compass();
public interface LocalCss extends CssResource {
String race();
@@ -22,7 +28,6 @@ public interface RaceListResources extends ClientBundle {
String race_itemwind();
String race_itemname();
String race_itemwinner();
- String race_item_flag();
String race_item_position();
String race_item_sailid();
String race_item_winner();
@@ -51,5 +56,11 @@ public interface RaceListResources extends ClientBundle {
String racesListIcon();
String racesListHideColumn();
+
+ String iconGPS();
+ String iconWind();
+ String iconVideo();
+ String iconAudio();
+ String legend();
}
}
diff --git a/java/com.sap.sailing.gwt.ui/images/home/windkompass_nord.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/windkompass_nord.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/windkompass_nord.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/windkompass_nord.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/raceviewerlaunchpad/RaceviewerLaunchPadCell.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/raceviewerlaunchpad/RaceviewerLaunchPadCell.java
index e25cf2650e1..3dcc9d69ca6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/raceviewerlaunchpad/RaceviewerLaunchPadCell.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/raceviewerlaunchpad/RaceviewerLaunchPadCell.java
@@ -12,6 +12,7 @@ import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.safehtml.shared.SafeUri;
import com.google.gwt.safehtml.shared.UriUtils;
import com.sap.sailing.gwt.home.communication.race.RaceMetadataDTO;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sse.common.Util;
@@ -21,11 +22,11 @@ public class RaceviewerLaunchPadCell{1}
")
SafeHtml raceNotTracked(String styleNames, String text);
- @Template("{2}
{2}
{2}
{2}
-
-
-
-
+
+
+
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderBubbleContentLegend.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderBubbleContentLegend.ui.xml
index 40f156ed706..51d0c39b6c8 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderBubbleContentLegend.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattaheader/RegattaHeaderBubbleContentLegend.ui.xml
@@ -1,48 +1,19 @@
| + | - | + | |||
| + | - | + |
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResultResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResultResources.java
index 89f30c8ec11..2692eae107e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResultResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResultResources.java
@@ -3,12 +3,19 @@ package com.sap.sailing.gwt.home.desktop.partials.searchresult;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
public interface SearchResultResources extends ClientBundle {
public static final SearchResultResources INSTANCE = GWT.create(SearchResultResources.class);
- @Source("SearchResult.css")
+ @Source("SearchResult.gss")
LocalCss css();
+
+ @Source("paging-icons.png")
+ ImageResource paging();
+
+ @Source("search-icon-grey.png")
+ ImageResource search();
public interface LocalCss extends CssResource {
String paging();
diff --git a/java/com.sap.sailing.gwt.ui/images/home/paging-icons.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/paging-icons.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/paging-icons.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/paging-icons.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/search-icon-grey.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/search-icon-grey.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/search-icon-grey.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/search-icon-grey.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.gss
index 14a144f1b81..641972bb26a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.gss
@@ -18,25 +18,6 @@
font-weight: 600;
padding: 0.666666666666667em 0;
}
-.eventheader_breadcrumbback {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- width: 1.333333333333333em;
- border-right: 1px solid #cfcfcf;
- background-color: #dedede;
- background-image: url("images/home/breadcrumb-arrow__back.png");
- background-position: center center;
- background-repeat: no-repeat;
- background-size: 50%;
- -webkit-transition: background-color 0.2s, border-color 0.2s;
- -moz-transition: background-color 0.2s, border-color 0.2s;
- transition: background-color 0.2s, border-color 0.2s;
-}
-.eventheader_breadcrumbback:hover {
- background-color: #cfcfcf;
-}
.eventheader_intro {
padding-left: 6em;
margin: 0.666666666666667em 0;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java
index 58e791e8773..7cb6f8af5e2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.seriesheader;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.desktop.resources.SharedDesktopResources;
-public interface SeriesHeaderResources extends ClientBundle {
+public interface SeriesHeaderResources extends SharedDesktopResources {
public static final SeriesHeaderResources INSTANCE = GWT.create(SeriesHeaderResources.class);
@Source("SeriesHeader.gss")
@@ -14,7 +14,6 @@ public interface SeriesHeaderResources extends ClientBundle {
String leaderboardquickaccess();
String eventheader();
String eventheader_breadcrumb();
- String eventheader_breadcrumbback();
String eventheader_intro();
String eventheader_intro_logo();
String eventheader_intro_logo_image();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.gss
index 04d4564e036..29cd300eb8d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.gss
@@ -13,7 +13,7 @@
}
.eventheader_sharing_itememail {
background-color: #f0ab00;
- background-image: url("images/home/email-icon.png");
+ background-image: resourceUrl("email");
}
.eventheader_sharing_itememail:hover,
.eventheader_sharing_itememail:focus {
@@ -21,15 +21,28 @@
}
.eventheader_sharing_itemtwitter {
background-color: #32b5e2;
- background-image: url("images/home/twitter-icon.png");
+ background-image: resourceUrl("twitter");
+ background-size: 20px auto;
}
.eventheader_sharing_itemtwitter:hover,
.eventheader_sharing_itemtwitter:focus {
background-color: #1faada;
}
.eventheader_sharing_itemfacebook {
+ position: relative;
background-color: #3b5998;
- background-image: url("images/home/facebook-icon.png");
+}
+.eventheader_sharing_itemfacebook:after {
+ content: "";
+ position: absolute;
+ width: 50%;
+ height: 50%;
+ top: 25%;
+ left: 25%;
+ background-image: resourceUrl("facebook");
+ background-size: contain;
+ background-position: center;
+ background-repeat: no-repeat;
}
.eventheader_sharing_itemfacebook:hover,
.eventheader_sharing_itemfacebook:focus {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java
index 280afd2fbec..d2b32b7e8f1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java
@@ -1,14 +1,18 @@
package com.sap.sailing.gwt.home.desktop.partials.sharing;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface SharingButtonsResources extends ClientBundle {
+public interface SharingButtonsResources extends SharedHomeResources {
public static final SharingButtonsResources INSTANCE = GWT.create(SharingButtonsResources.class);
@Source("SharingButtons.gss")
LocalCss css();
+
+ @Source("email-icon.png")
+ ImageResource email();
public interface LocalCss extends CssResource {
String eventheader_sharing();
diff --git a/java/com.sap.sailing.gwt.ui/images/email-icon.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/email-icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/email-icon.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/email-icon.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml
index 0dbed52ff4f..ac99eeb5050 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml
@@ -4,6 +4,7 @@
xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
@@ -14,7 +15,7 @@
-
+
+
-
+
headerNavigation) {
+ public StandingsList(boolean finished, PlaceNavigation headerNavigation, FlagImageResolver flagImageResolver) {
this.finished = finished;
+ this.flagImageResolver = flagImageResolver;
StandingsResources.INSTANCE.css().ensureInjected();
setElement(uiBinder.createAndBindUi(this));
setVisible(false);
@@ -70,7 +73,7 @@ public class StandingsList extends Widget implements RefreshableWidget
-
+
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/updates/UpdatesBoxResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/updates/UpdatesBoxResources.java
index 378cb4ccd58..256f5df8e53 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/updates/UpdatesBoxResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/updates/UpdatesBoxResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.desktop.partials.updates;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface UpdatesBoxResources extends ClientBundle {
+public interface UpdatesBoxResources extends SharedHomeResources {
public static final UpdatesBoxResources INSTANCE = GWT.create(UpdatesBoxResources.class);
@Source("UpdatesBox.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java
index 5a01c544816..e97ba17df9a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java
@@ -1,6 +1,11 @@
package com.sap.sailing.gwt.home.desktop.places.event;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.domain.common.dto.EventType;
import com.sap.sailing.gwt.home.communication.eventview.EventViewDTO;
import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
@@ -17,6 +22,9 @@ import com.sap.sailing.gwt.home.mobile.places.event.minileaderboard.MiniLeaderbo
import com.sap.sailing.gwt.home.shared.places.event.AbstractEventActivityProxy;
import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace;
import com.sap.sailing.gwt.home.shared.places.event.EventContext;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
+import com.sap.sse.gwt.resources.CommonControlsCSS;
+import com.sap.sse.gwt.resources.Highcharts;
public class EventActivityProxy extends AbstractEventActivityProxy implements WithHeader {
@@ -34,15 +42,31 @@ public class EventActivityProxy extends AbstractEventActivityProxy new EventRegattaActivity((AbstractEventRegattaPlace) place, event, clientFactory,
+ homePlacesNavigator, getNavigationPathDisplay(), flagImageResolver));
}
if (place instanceof AbstractMultiregattaEventPlace) {
- super.onSuccess(new EventMultiregattaActivity((AbstractMultiregattaEventPlace) place, event,
+ onSuccess(new EventMultiregattaActivity((AbstractMultiregattaEventPlace) place, event,
clientFactory, homePlacesNavigator, getNavigationPathDisplay()));
}
}
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
+ }
});
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/EventRegattaActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/EventRegattaActivity.java
index 5e335393e0f..45d8156679b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/EventRegattaActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/EventRegattaActivity.java
@@ -23,6 +23,7 @@ import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.places.event.EventContext;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardEntryPoint;
import com.sap.sse.gwt.client.async.AsyncActionsExecutor;
@@ -39,19 +40,20 @@ import com.sap.sse.security.ui.client.UserService;
* The concrete {@link AbstractEventRegattaPlace} subclass, this instance is bound to.
*/
public class EventRegattaActivity extends AbstractEventActivity implements EventRegattaView.Presenter {
- private EventRegattaView currentView = new TabletAndDesktopRegattaEventView();
+ private EventRegattaView currentView;
private final AsyncActionsExecutor asyncActionsExecutor = new AsyncActionsExecutor();
private final long delayBetweenAutoAdvancesInMilliseconds = LeaderboardEntryPoint.DEFAULT_REFRESH_INTERVAL_MILLIS;
public EventRegattaActivity(AbstractEventRegattaPlace place, EventViewDTO eventDTO, EventClientFactory clientFactory,
- DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) {
+ DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay, FlagImageResolver flagImageResolver) {
super(place, eventDTO, clientFactory, homePlacesNavigator);
+ currentView = new TabletAndDesktopRegattaEventView(flagImageResolver);
if (this.ctx.getRegattaAnalyticsManager() == null) {
ctx.withRegattaAnalyticsManager(new RegattaAnalyticsDataManager(
clientFactory.getSailingService(),
asyncActionsExecutor,
new Timer(PlayModes.Live, PlayStates.Paused, delayBetweenAutoAdvancesInMilliseconds),
- clientFactory.getErrorReporter()));
+ clientFactory.getErrorReporter(), flagImageResolver));
}
initNavigationPath(navigationPathDisplay);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/RegattaAnalyticsDataManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/RegattaAnalyticsDataManager.java
index 511c223953c..9b093b80893 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/RegattaAnalyticsDataManager.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/RegattaAnalyticsDataManager.java
@@ -5,6 +5,7 @@ import com.sap.sailing.gwt.settings.client.leaderboard.MultiCompetitorLeaderboar
import com.sap.sailing.gwt.settings.client.leaderboard.MultiRaceLeaderboardSettings;
import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel;
import com.sap.sailing.gwt.ui.client.DebugIdHelper;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorLeaderboardChart;
@@ -32,9 +33,12 @@ public class RegattaAnalyticsDataManager {
private final ErrorReporter errorReporter;
private final SailingServiceAsync sailingService;
private final Timer timer;
+ private final FlagImageResolver flagImageResolver;
public RegattaAnalyticsDataManager(final SailingServiceAsync sailingService,
- AsyncActionsExecutor asyncActionsExecutor, Timer timer, ErrorReporter errorReporter) {
+ AsyncActionsExecutor asyncActionsExecutor, Timer timer, ErrorReporter errorReporter,
+ FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
this.competitorSelectionProvider = new CompetitorSelectionModel(/* hasMultiSelection */true);
this.sailingService = sailingService;
this.asyncActionsExecutor = asyncActionsExecutor;
@@ -56,7 +60,8 @@ public class RegattaAnalyticsDataManager {
competitorSelectionProvider, timer, leaderboardGroupName, leaderboardName, errorReporter,
StringMessages.INSTANCE, showRaceDetails, /* competitorSearchTextBox */ null,
/* showSelectionCheckbox */ true, /* raceTimesInfoProvider */ null, autoExpandLastRaceColumn,
- /* adjustTimerDelay */ true, /* autoApplyTopNFilter */ false, /* showCompetitorFilterStatus */ false, /* enableSyncScroller */ true,new ClassicLeaderboardStyle());
+ /* adjustTimerDelay */ true, /* autoApplyTopNFilter */ false, /* showCompetitorFilterStatus */ false, /* enableSyncScroller */ true,
+ new ClassicLeaderboardStyle(), flagImageResolver);
}
return leaderboardPanel;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java
index 352da40a522..65bdfbdd1ba 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java
@@ -21,9 +21,12 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanelPlaceSelectionE
import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
import com.sap.sailing.gwt.home.desktop.partials.eventheader.EventHeader;
import com.sap.sailing.gwt.home.desktop.partials.sailorinfo.SailorInfo;
+import com.sap.sailing.gwt.home.desktop.places.event.regatta.overviewtab.RegattaOverviewTabView;
+import com.sap.sailing.gwt.home.desktop.places.event.regatta.racestab.RegattaRacesTabView;
import com.sap.sailing.gwt.home.shared.app.ApplicationHistoryMapper;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sse.gwt.client.LinkUtil;
@@ -40,10 +43,15 @@ public class TabletAndDesktopRegattaEventView extends Composite implements Event
@UiField(provided = true) TabPanel> tabPanelUi;
@UiField(provided = true) EventHeader eventHeader;
+ @UiField(provided = true) RegattaRacesTabView racesTabUi;
+ @UiField(provided = true) RegattaOverviewTabView regattaOverviewTabUi;
private Presenter currentPresenter;
- public TabletAndDesktopRegattaEventView() {
+ private final FlagImageResolver flagImageResolver;
+
+ public TabletAndDesktopRegattaEventView(FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
}
@Override
@@ -51,6 +59,8 @@ public class TabletAndDesktopRegattaEventView extends Composite implements Event
this.currentPresenter = currentPresenter;
tabPanelUi = new TabPanel<>(currentPresenter, historyMapper);
eventHeader = new EventHeader(currentPresenter);
+ racesTabUi = new RegattaRacesTabView(flagImageResolver);
+ regattaOverviewTabUi = new RegattaOverviewTabView(flagImageResolver);
initWidget(uiBinder.createAndBindUi(this));
if(currentPresenter.getEventDTO().getType() == EventType.SERIES) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.ui.xml
index 86cbe0b7114..52281f92d7d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.ui.xml
@@ -10,10 +10,10 @@
-
-
windSourcesCountColumn = RaceListColumnFactory.getWindSourcesCountColumn();
private final SortableRaceListColumn videoCountColumn = RaceListColumnFactory.getVideoCountColumn();
private final SortableRaceListColumn audioCountColumn = RaceListColumnFactory.getAudioCountColumn();
- private final SortableRaceListColumn winnerColumn = RaceListColumnFactory.getWinnerColumn();
+ private final SortableRaceListColumn winnerColumn = RaceListColumnFactory.getWinnerColumn(flagImageResolver);
private boolean hasWind;
private boolean hasVideos;
private boolean hasAudios;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java
index 24d6b7c1c96..dc4f5df0ad7 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java
@@ -10,21 +10,21 @@ import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
import com.sap.sailing.gwt.home.shared.app.ActivityCallback;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
+import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
import com.sap.sailing.gwt.home.shared.places.events.EventsPlace;
import com.sap.sailing.gwt.ui.client.StringMessages;
-public class EventsActivity extends AbstractActivity {
+public class EventsActivity extends AbstractActivity implements ProvidesNavigationPath{
private final EventsClientFactory clientFactory;
private final EventsPlace place;
private final DesktopPlacesNavigator homePlacesNavigator;
+ private NavigationPathDisplay navigationPathDisplay;
- public EventsActivity(EventsPlace place, EventsClientFactory clientFactory, DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) {
+ public EventsActivity(EventsPlace place, EventsClientFactory clientFactory, DesktopPlacesNavigator homePlacesNavigator) {
this.clientFactory = clientFactory;
this.place = place;
this.homePlacesNavigator = homePlacesNavigator;
-
- initNavigationPath(navigationPathDisplay);
}
private void initNavigationPath(NavigationPathDisplay navigationPathDisplay) {
@@ -35,6 +35,7 @@ public class EventsActivity extends AbstractActivity {
@Override
public void start(final AcceptsOneWidget panel, EventBus eventBus) {
+ initNavigationPath(navigationPathDisplay);
panel.setWidget(clientFactory.createBusyView());
clientFactory.getDispatch().execute(new GetEventListViewAction(),
new ActivityCallback(clientFactory, panel) {
@@ -47,4 +48,9 @@ public class EventsActivity extends AbstractActivity {
}
});
}
+
+ @Override
+ public void setNavigationPathDisplay(NavigationPathDisplay navigationPathDisplay) {
+ this.navigationPathDisplay = navigationPathDisplay;
+ }
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivityProxy.java
deleted file mode 100755
index 2aec550831c..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivityProxy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.sap.sailing.gwt.home.desktop.places.events;
-
-import com.google.gwt.core.client.GWT;
-import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
-import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
-import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
-import com.sap.sailing.gwt.home.shared.places.events.EventsPlace;
-import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
-
-public class EventsActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath {
-
- private final EventsClientFactory clientFactory;
- private final EventsPlace place;
- private NavigationPathDisplay navigationPathDisplay;
- private final DesktopPlacesNavigator homePlacesNavigator;
-
- public EventsActivityProxy(EventsPlace place, EventsClientFactory clientFactory, DesktopPlacesNavigator homePlacesNavigator) {
- this.place = place;
- this.clientFactory = clientFactory;
- this.homePlacesNavigator = homePlacesNavigator;
- }
-
- @Override
- protected void startAsync() {
- GWT.runAsync(new AbstractRunAsyncCallback() {
- @Override
- public void onSuccess() {
- super.onSuccess(new EventsActivity(place, clientFactory, homePlacesNavigator, navigationPathDisplay));
- }
- });
- }
-
- @Override
- public void setNavigationPathDisplay(NavigationPathDisplay navigationPathDisplay) {
- this.navigationPathDisplay = navigationPathDisplay;
- }
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/EventSeriesAnalyticsDataManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/EventSeriesAnalyticsDataManager.java
index de8d3e3090e..c8bcf11c2f0 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/EventSeriesAnalyticsDataManager.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/EventSeriesAnalyticsDataManager.java
@@ -11,6 +11,7 @@ import com.sap.sailing.gwt.settings.client.leaderboard.MultiRaceLeaderboardSetti
import com.sap.sailing.gwt.ui.client.CompetitorSelectionChangeListener;
import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel;
import com.sap.sailing.gwt.ui.client.DebugIdHelper;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorLeaderboardChart;
@@ -43,10 +44,13 @@ public class EventSeriesAnalyticsDataManager {
private final ErrorReporter errorReporter;
private final SailingServiceAsync sailingService;
private final Timer timer;
- private final int MAX_COMPETITORS_IN_CHART = 30;
+ private final int MAX_COMPETITORS_IN_CHART = 30;
+ private final FlagImageResolver flagImageResolver;
public EventSeriesAnalyticsDataManager(final SailingServiceAsync sailingService,
- AsyncActionsExecutor asyncActionsExecutor, Timer timer, ErrorReporter errorReporter) {
+ AsyncActionsExecutor asyncActionsExecutor, Timer timer, ErrorReporter errorReporter,
+ FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
this.competitorSelectionProvider = new CompetitorSelectionModel(/* hasMultiSelection */true);
this.sailingService = sailingService;
this.asyncActionsExecutor = asyncActionsExecutor;
@@ -67,7 +71,8 @@ public class EventSeriesAnalyticsDataManager {
StringMessages.INSTANCE, showRaceDetails, /* competitorSearchTextBox */ null,
/* showSelectionCheckbox */ true,
/* raceTimesInfoProvider */null, autoExpandLastRaceColumn, /* adjustTimerDelay */ true, /* autoApplyTopNFilter */ false,
- /* showCompetitorFilterStatus */ false, /* enableSyncScroller */ false, new ClassicLeaderboardStyle());
+ /* showCompetitorFilterStatus */ false, /* enableSyncScroller */ false, new ClassicLeaderboardStyle(),
+ flagImageResolver);
}
return overallLeaderboardPanel;
}
@@ -93,7 +98,7 @@ public class EventSeriesAnalyticsDataManager {
multiLeaderboardPanel = new MultiLeaderboardProxyPanel(parent, context, sailingService, metaLeaderboardName,
asyncActionsExecutor, timer, true /* isEmbedded */,
preselectedLeaderboardName, errorReporter, StringMessages.INSTANCE,
- showRaceDetails, autoExpandLastRaceColumn, leaderboardSettings);
+ showRaceDetails, autoExpandLastRaceColumn, leaderboardSettings, flagImageResolver);
}
return multiLeaderboardPanel;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java
index d442d37119f..3e615dad84c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java
@@ -23,6 +23,7 @@ import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardEntryPoint;
@@ -49,7 +50,7 @@ public class SeriesActivity extends AbstractActivity implements SeriesView.Prese
private final EventSeriesViewDTO series;
public SeriesActivity(AbstractSeriesTabPlace place, EventSeriesViewDTO series, SeriesClientFactory clientFactory,
- DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) {
+ DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay, FlagImageResolver flagImageResolver) {
this.currentPlace = place;
this.series = series;
this.ctx = new SeriesContext(place.getCtx());
@@ -61,7 +62,7 @@ public class SeriesActivity extends AbstractActivity implements SeriesView.Prese
clientFactory.getSailingService(), //
asyncActionsExecutor, //
new Timer(PlayModes.Live, PlayStates.Paused, delayBetweenAutoAdvancesInMilliseconds), //
- clientFactory.getErrorReporter()));
+ clientFactory.getErrorReporter(), flagImageResolver));
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java
index 0b2aa82fa1f..5093684a81c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java
@@ -1,8 +1,12 @@
package com.sap.sailing.gwt.home.desktop.places.fakeseries;
import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesClientFactory;
import com.sap.sailing.gwt.home.communication.fakeseries.EventSeriesViewDTO;
import com.sap.sailing.gwt.home.communication.fakeseries.GetEventSeriesViewAction;
@@ -17,7 +21,10 @@ import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
+import com.sap.sse.gwt.resources.CommonControlsCSS;
+import com.sap.sse.gwt.resources.Highcharts;
public class SeriesActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath, WithHeader {
@@ -60,8 +67,25 @@ public class SeriesActivityProxy extends AbstractActivityProxy implements Provid
place = getRealPlace(series);
}
place = verifyAndAdjustPlace();
- super.onSuccess(new SeriesActivity((AbstractSeriesTabPlace) place, series, clientFactory,
- homePlacesNavigator, navigationPathDisplay));
+
+ CommonControlsCSS.ensureInjected();
+ Highcharts.ensureInjected();
+ withFlagImageResolver(flagImageResolver -> new SeriesActivity((AbstractSeriesTabPlace) place, series, clientFactory,
+ homePlacesNavigator, navigationPathDisplay, flagImageResolver));
+ }
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
}
});
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/StartActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/StartActivityProxy.java
deleted file mode 100644
index 7d91ee4a344..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/StartActivityProxy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.sap.sailing.gwt.home.desktop.places.start;
-
-import com.google.gwt.core.client.GWT;
-import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
-import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
-
-public class StartActivityProxy extends AbstractActivityProxy {
-
- private final StartClientFactory clientFactory;
- private final StartPlace place;
-
- public StartActivityProxy(StartPlace place, StartClientFactory clientFactory) {
- this.place = place;
- this.clientFactory = clientFactory;
- }
-
- @Override
- protected void startAsync() {
- GWT.runAsync(new AbstractRunAsyncCallback() {
- @Override
- public void onSuccess() {
- super.onSuccess(new StartActivity(place, clientFactory));
- }
- });
- }
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java
index e16781ec729..81171480beb 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java
@@ -12,8 +12,10 @@ import com.sap.sailing.gwt.common.client.SharedResources;
import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanel;
import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanelPlaceSelectionEvent;
import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
+import com.sap.sailing.gwt.home.desktop.places.user.profile.preferencestab.UserProfilePreferencesTabView;
import com.sap.sailing.gwt.home.shared.app.ApplicationHistoryMapper;
import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sse.security.ui.authentication.app.AuthenticationContext;
import com.sap.sse.security.ui.userprofile.desktop.userheader.UserHeader;
@@ -35,8 +37,14 @@ public class TabletAndDesktopUserProfileView extends Composite implements UserPr
@UiField(provided = true)
UserHeader headerUi;
+
+ @UiField(provided = true)
+ UserProfilePreferencesTabView preferencesTabUi;
- public TabletAndDesktopUserProfileView() {
+ private final FlagImageResolver flagImageResolver;
+
+ public TabletAndDesktopUserProfileView(FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
}
@Override
@@ -46,6 +54,8 @@ public class TabletAndDesktopUserProfileView extends Composite implements UserPr
headerUi = new UserHeader(SharedResources.INSTANCE);
+ preferencesTabUi = new UserProfilePreferencesTabView(flagImageResolver);
+
initWidget(uiBinder.createAndBindUi(this));
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java
index 4e862c97c4a..92b2b71c51b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java
@@ -16,6 +16,7 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.security.ui.authentication.AuthenticationContextEvent;
import com.sap.sse.security.ui.authentication.AuthenticationPlaces;
import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent;
@@ -31,13 +32,14 @@ public class UserProfileActivity extends AbstractActivity implements UserProfile
private final StringMessages i18n_sec = StringMessages.INSTANCE;
- private UserProfileView currentView = new TabletAndDesktopUserProfileView();
+ private UserProfileView currentView;
public UserProfileActivity(AbstractUserProfilePlace place, UserProfileClientFactory clientFactory,
- DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) {
+ DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay, FlagImageResolver flagImageResolver) {
this.currentPlace = place;
this.clientFactory = clientFactory;
this.homePlacesNavigator = homePlacesNavigator;
+ currentView = new TabletAndDesktopUserProfileView(flagImageResolver);
initNavigationPath(navigationPathDisplay);
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java
index 6fba8a17d4f..daa4f0d4b11 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java
@@ -1,6 +1,11 @@
package com.sap.sailing.gwt.home.desktop.places.user.profile;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
import com.sap.sailing.gwt.home.desktop.app.WithHeader;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
@@ -8,6 +13,7 @@ import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDefaultPlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDetailsPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
public class UserProfileActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath, WithHeader {
@@ -37,8 +43,22 @@ public class UserProfileActivityProxy extends AbstractActivityProxy implements P
if(place instanceof UserProfileDefaultPlace) {
place = new UserProfileDetailsPlace();
}
- super.onSuccess(new UserProfileActivity(place, clientFactory,
- homePlacesNavigator, navigationPathDisplay));
+ withFlagImageResolver(flagImageResolver -> new UserProfileActivity(place, clientFactory,
+ homePlacesNavigator, navigationPathDisplay, flagImageResolver));
+ }
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
}
});
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesTabView.java
index 1171775ba5a..cf72424585d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesTabView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesTabView.java
@@ -6,12 +6,18 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileTabView;
import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileView;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserProfilePreferencesPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.security.ui.authentication.app.AuthenticationContext;
public class UserProfilePreferencesTabView extends Composite implements UserProfileTabView {
private UserProfilePreferencesView.Presenter currentPresenter;
private UserProfilePreferencesView view;
+ private final FlagImageResolver flagImageResolver;
+
+ public UserProfilePreferencesTabView(FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
+ }
@Override
public Class getPlaceClassForActivation() {
@@ -44,7 +50,7 @@ public class UserProfilePreferencesTabView extends Composite implements UserProf
@Override
public void setPresenter(UserProfileView.Presenter currentPresenter) {
- view = new UserProfilePreferencesViewImpl();
+ view = new UserProfilePreferencesViewImpl(flagImageResolver);
this.currentPresenter = new UserProfilePreferencesPresenter(view, currentPresenter);
}
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesViewImpl.java
index e52c562e848..c8027487a6b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesViewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/preferencestab/UserProfilePreferencesViewImpl.java
@@ -7,6 +7,7 @@ import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferences;
import com.sap.sailing.gwt.home.shared.usermanagement.decorator.AuthorizedContentDecoratorDesktop;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.security.ui.authentication.app.NeedsAuthenticationContext;
public class UserProfilePreferencesViewImpl extends Composite implements UserProfilePreferencesView {
@@ -18,11 +19,17 @@ public class UserProfilePreferencesViewImpl extends Composite implements UserPro
@UiField(provided = true) AuthorizedContentDecoratorDesktop decoratorUi;
@UiField(provided = true) UserPreferences userPreferencesUi;
+
+ private final FlagImageResolver flagImageResolver;
+
+ public UserProfilePreferencesViewImpl(FlagImageResolver flagImageResolver) {
+ this.flagImageResolver = flagImageResolver;
+ }
@Override
public void setPresenter(Presenter presenter) {
decoratorUi = new AuthorizedContentDecoratorDesktop(presenter);
- userPreferencesUi = new UserPreferences(presenter.getUserPreferencesPresenter());
+ userPreferencesUi = new UserPreferences(presenter.getUserPreferencesPresenter(), flagImageResolver);
initWidget(uiBinder.createAndBindUi(this));
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/SharedDesktopResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/SharedDesktopResources.java
new file mode 100644
index 00000000000..b73672b12dc
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/SharedDesktopResources.java
@@ -0,0 +1,34 @@
+package com.sap.sailing.gwt.home.desktop.resources;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
+
+public interface SharedDesktopResources extends SharedHomeResources {
+
+ public static final SharedDesktopResources INSTANCE = GWT.create(SharedDesktopResources.class);
+
+ @Source("dropdown__check@2x.png")
+ ImageResource dropdownCheck();
+
+ @Source("liveraces.svg")
+ @MimeType("image/svg+xml")
+ DataResource liveraces();
+
+ @Source("icon-audio.png")
+ ImageResource audio();
+
+ @Source("icon-video.png")
+ ImageResource video();
+
+ @Source("icon-wind.png")
+ ImageResource wind();
+
+ @Source("raw_gps_fixes.png")
+ ImageResource gpsFixes();
+
+ @Source("arrow-down-filled-black.png")
+ ImageResource arrowDownFilledBlack();
+}
diff --git a/java/com.sap.sailing.gwt.ui/images/home/arrow-down-filled-black.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/arrow-down-filled-black.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/arrow-down-filled-black.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/arrow-down-filled-black.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/dropdown__check@2x.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/dropdown__check@2x.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/dropdown__check@2x.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/dropdown__check@2x.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/icon-audio.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-audio.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/icon-audio.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-audio.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/icon-video.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-video.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/icon-video.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-video.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/icon-wind.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-wind.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/icon-wind.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/icon-wind.png
diff --git a/java/com.sap.sailing.gwt.ui/images/home/liveraces.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/liveraces.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/liveraces.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/liveraces.svg
diff --git a/java/com.sap.sailing.gwt.ui/images/home/raw_gps_fixes.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/raw_gps_fixes.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/home/raw_gps_fixes.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/resources/raw_gps_fixes.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java
index f489cfc78d0..7a31ba34000 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java
@@ -6,13 +6,13 @@ import com.google.gwt.core.client.GWT;
import com.google.gwt.place.shared.Place;
import com.sap.sailing.gwt.home.mobile.places.error.ErrorActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.event.EventActivityProxy;
-import com.sap.sailing.gwt.home.mobile.places.events.EventsActivityProxy;
+import com.sap.sailing.gwt.home.mobile.places.events.EventsActivity;
import com.sap.sailing.gwt.home.mobile.places.morelogininformation.MoreLoginInformationActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.series.SeriesActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.series.minileaderboard.SeriesMiniOverallLeaderboardActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.series.minileaderboard.SeriesMiniOverallLeaderboardPlace;
import com.sap.sailing.gwt.home.mobile.places.solutions.SolutionsActivityProxy;
-import com.sap.sailing.gwt.home.mobile.places.start.StartActivityProxy;
+import com.sap.sailing.gwt.home.mobile.places.start.StartActivity;
import com.sap.sailing.gwt.home.mobile.places.user.authentication.AuthenticationActivityProxy;
import com.sap.sailing.gwt.home.mobile.places.user.authentication.AuthenticationPlace;
import com.sap.sailing.gwt.home.mobile.places.user.profile.UserProfileActivityProxy;
@@ -55,9 +55,9 @@ public class MobileActivityMapper implements ActivityMapper {
if (place instanceof ErrorPlace) {
return new ErrorActivityProxy((ErrorPlace) place, clientFactory);
} else if (place instanceof StartPlace) {
- return new StartActivityProxy((StartPlace) place, clientFactory);
+ return new StartActivity((StartPlace) place, clientFactory);
} else if (place instanceof EventsPlace) {
- return new EventsActivityProxy((EventsPlace) place, clientFactory);
+ return new EventsActivity((EventsPlace) place, clientFactory);
} else if (place instanceof AbstractEventPlace) {
return new EventActivityProxy((AbstractEventPlace) place, clientFactory);
} else if (place instanceof SeriesMiniOverallLeaderboardPlace) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/accordion/AccordionItem.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/accordion/AccordionItem.ui.xml
index 7265fe6c5af..fd9c30b3e3c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/accordion/AccordionItem.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/accordion/AccordionItem.ui.xml
@@ -2,10 +2,11 @@
![]()
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss
index b9f9282f293..89e1d70f740 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.gss
@@ -2,62 +2,12 @@
font-size: 1rem;
position: relative;
padding: 0.333333333333333em;
+ padding-bottom: 1em;
background: #f2f2f2;
-webkit-transition: top 0.3s ease-in-out;
-moz-transition: top 0.3s ease-in-out;
transition: top 0.3s ease-in-out;
}
-.eventheader .sidenavigation {
- display: none;
- position: absolute;
- top: 0;
- left: 0;
- width: 3em;
- height: 5.333333333333333em;
- z-index: 1;
-}
-.eventheader .sidenavigation_drawer {
- position: absolute;
- top: 1em;
- left: 0;
- width: 2em;
- height: 3.333333333333333em;
- background: DeepPink;
-}
-.eventheaderreduced {
- padding-bottom: 1em;
-}
-.eventheaderreduced .eventheader_info_subtitle {
- display: none;
-}
-.eventheaderreduced .quickfinder {
- display: none;
-}
-.eventheaderreduced .eventheader_inputwrapper {
- display: none;
-}
-.eventheaderfixedup {
- position: fixed;
- top: -3.533333333333333em;
- z-index: 10;
-}
-.eventheaderfixeddown {
- position: fixed;
- top: 0;
- z-index: 10;
-}
-.eventheadernobox {
- padding-bottom: 1em;
-}
-.eventheaderwithinputbox .eventheader_info {
- padding-top: 1em;
-}
-.eventheaderwithinputbox .sidenavigation_drawer {
- top: 0.333333333333333em;
-}
-.eventheaderwithinputbox .eventheader_inputwrapper {
- margin-top: 0.666666666666667em;
-}
.eventheader_info {
padding: 0.666666666666667em 0 0 0.666666666666667em;
}
@@ -103,39 +53,3 @@
.eventheader_info_subtitle_info_location {
visibility: visible;
}
-.eventheader_inputwrapper {
- padding: 0;
- margin-top: 0.666666666666667em;
-}
-.eventheader_input {
- float: left;
- display: block;
- font-weight: 600;
- padding: 0 2.333333333333333em 0 0.666666666666667em;
- width: 100%;
- height: 2.666666666666667em;
- border: none;
- vertical-align: middle;
-}
-.eventheader_button {
- float: left;
- width: 2.333333333333333em;
- height: 2.666666666666667em;
- margin-left: -2.333333333333333em;
- border: none;
- vertical-align: middle;
- background: url("../images/home/search-icon-yellow.svg") no-repeat;
- background-size: 1.333333333333333em 1.333333333333333em;
- background-position: center;
-}
-.eventheader .quickfinder {
- padding: 0;
- margin-top: 0.666666666666667em;
-}
-.eventheader .quickfinder_select {
- background: transparent;
- /* @alternate */ background: url("../images/home/quickfinder-arrow.svg") 100% no-repeat #f6f9fc;
-}
-.eventheaderplaceholder {
- font-size: inherit;
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml
index 6a49dca5fe8..86791f2d2a4 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeader.ui.xml
@@ -8,9 +8,7 @@
-
+
+
-
-
-
+
.popup {
position: fixed !important;
@@ -37,8 +38,8 @@
-
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/minileaderboard/MinileaderboardBox.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/minileaderboard/MinileaderboardBox.java
index 381517bf2ad..06afaa9edd3 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/minileaderboard/MinileaderboardBox.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/minileaderboard/MinileaderboardBox.java
@@ -20,6 +20,7 @@ import com.sap.sailing.gwt.home.mobile.partials.sectionHeader.SectionHeaderConte
import com.sap.sailing.gwt.home.mobile.partials.toggleButton.BigButton;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.common.client.DateAndTimeFormatterUtil;
@@ -38,9 +39,12 @@ public class MinileaderboardBox extends Composite implements RefreshableWidget placeNavigation = null;
private boolean isOverall;
+
+ private final FlagImageResolver flagImageResolver;
- public MinileaderboardBox(boolean isOverall) {
+ public MinileaderboardBox(boolean isOverall, FlagImageResolver flagImageResolver) {
this.isOverall = isOverall;
+ this.flagImageResolver = flagImageResolver;
initWidget(uiBinder.createAndBindUi(this));
}
@@ -78,7 +82,7 @@ public class MinileaderboardBox extends Composite implements RefreshableWidget
private final Map> navigations = new HashMap<>();
public Quickfinder() {
+ QuickfinderResources.INSTANCE.css().ensureInjected();
setElement(uiBinder.createAndBindUi(this));
Event.sinkEvents(selectUi, Event.ONCHANGE);
Event.setEventListener(selectUi, new EventListener() {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.ui.xml
index b99621bdb0b..fd4c444fbf9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.ui.xml
@@ -1,40 +1,8 @@
- .quickfinder {
- font-size: 1rem;
- text-align: center;
- padding: 0.666666666666667em;
- }
- .quickfinder_select::-ms-expand {
- display: none;
- }
- .quickfinder_select {
- font-weight: 600;
- width: 100%;
- height: auto;
- outline: none;
- appearance: none;
- -webkit-appearance: none;
- -moz-appearance: none;
- -ms-appearance: none;
- border: none;
- border-radius: 0;
- padding: 0.666666666666667em 0.666666666666667em 0.666666666666667em 1em;
- /* @alternate */
- background: transparent;
- background: url("images/mobile/quickfinder-arrow.svg") 100% no-repeat #ffffff;
- background-size: 3em 3em;
- }
-
- .quickfinder:-moz-focusring {
- color: transparent;
- text-shadow: 0 0 0 #0a0a0a;
- }
-
-
-
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusResources.java
index a18de2fa8d7..78c0d80a4a9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusResources.java
@@ -15,7 +15,6 @@ public interface RegattaStatusResources extends ClientBundle {
String grid();
String regattastatus_header();
String regattastatus_header_title();
- String regattastatus_header_select();
String regattastatus_content();
String regattastatus_content_regatta();
String regattastatus_content_regatta_race();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss
index 9f4535c7332..f4cc6530815 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss
@@ -138,7 +138,7 @@
display: inline-block;
width: 1.666666666666667em;
height: 1.1em;
- background: url("images/home/launch-loupe.svg") no-repeat center center;
+ background: resourceUrl("launchLoupe") no-repeat center center;
position: absolute;
right: 0;
top: 0.133333333333333em;
@@ -148,7 +148,7 @@
}
.regattacompetition_phase_fleet_race_arrow {
display: none;
- background: url("images/home/launch-loupe.svg") no-repeat center center;
+ background: resourceUrl("launchLoupe") no-repeat center center;
position: absolute;
top: 50%;
right: 1em;
@@ -158,10 +158,10 @@
transform: translateY(-50%);
}
.regattacompetition_phase_fleet_raceplanned .regattacompetition_phase_fleet_race_title:after {
- background: url("images/home/launch-play.svg") no-repeat center center;
+ background: resourceUrl("launchPlay") no-repeat center center;
}
.regattacompetition_phase_fleet_raceplanned .regattacompetition_phase_fleet_race_arrow {
- background: url("images/home/launch-play.svg") no-repeat center center;
+ background: resourceUrl("launchPlay") no-repeat center center;
}
.regattacompetition_phase_fleet_raceuntracked .regattacompetition_phase_fleet_race_arrow {
display: none;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionResources.java
index c0fa2dc729f..dd113f3c1de 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.mobile.partials.regattacompetition;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface RegattaCompetitionResources extends ClientBundle {
+public interface RegattaCompetitionResources extends SharedHomeResources {
public static final RegattaCompetitionResources INSTANCE = GWT.create(RegattaCompetitionResources.class);
@Source("RegattaCompetition.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResult.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResult.gss
index b016ad07887..9fcbec26f87 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResult.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResult.gss
@@ -37,7 +37,7 @@
margin-left: -2.333333333333333em;
border: none;
vertical-align: middle;
- background: url("images/mobile/search-icon-yellow.svg") no-repeat;
+ background: resourceUrl("search") no-repeat;
background-size: 1.333333333333333em 1.333333333333333em;
background-position: center;
}
@@ -93,7 +93,7 @@
}
.searchresult_item_arrow {
font-size: 1rem;
- background: url("images/home/arrow-down-grey.png");
+ background: resourceUrl("arrowDownGrey");
background-size: contain;
display: block;
width: 1.333333333333333em;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResultResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResultResources.java
index 10735e2707b..efc11d1cabe 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResultResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/SearchResultResources.java
@@ -1,14 +1,20 @@
package com.sap.sailing.gwt.home.mobile.partials.searchresult;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface SearchResultResources extends ClientBundle {
+public interface SearchResultResources extends SharedHomeResources {
public static final SearchResultResources INSTANCE = GWT.create(SearchResultResources.class);
@Source("SearchResult.gss")
LocalCss css();
+
+ @Source("search-icon-yellow.svg")
+ @MimeType("image/svg+xml")
+ DataResource search();
public interface LocalCss extends CssResource {
String searchresult();
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/search-icon-yellow.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/search-icon-yellow.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/search-icon-yellow.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/searchresult/search-icon-yellow.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeader.gss
index 128097d6d99..062a6491737 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeader.gss
@@ -73,13 +73,22 @@
font-weight: 700;
color: #008fcc;
}
-img.sectionheader_item_arrow {
+.sectionheader_item_arrow {
display: inline-block;
vertical-align: middle;
margin-left: 1em;
height: 0.8em;
+ width: 0.8em;
+ background-size: 125%;
+ background-position: center;
+ background-image: resourceUrl('arrowDownGrey');
+ background-repeat: no-repeat;
+ -webkit-transform: rotate(270deg);
+ -moz-transform: rotate(270deg);
+ -ms-transform: rotate(270deg);
+ transform: rotate(270deg);
}
-img.sectionheader_item_arrow.accordion {
+.sectionheader_item_arrow.accordion {
-webkit-transform: rotate(180deg);
-moz-transform: rotate(180deg);
-ms-transform: rotate(180deg);
@@ -88,7 +97,7 @@ img.sectionheader_item_arrow.accordion {
-moz-transition: -moz-transform 0.4s;
transition: transform 0.4s;
}
-img.sectionheader_item_arrow.accordion.collapsed {
+.sectionheader_item_arrow.accordion.collapsed {
-webkit-transform: rotate(0deg);
-moz-transform: rotate(0deg);
-ms-transform: rotate(0deg);
@@ -112,7 +121,7 @@ img.sectionheader_item_arrow.accordion.collapsed {
border: none;
border-radius: 0;
padding: 0.666666666666667em 2em 0.666666666666667em 1em;
- background: url("images/mobile/filter.svg") 100% no-repeat transparent;
+ background: resourceUrl("filter") 100% no-repeat transparent;
background-size: 1.333333333333333em;
}
.sectionheader_item_adjust_title_left {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.java
index f935c88af85..3c7f426f38d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.java
@@ -5,7 +5,6 @@ import com.google.gwt.dom.client.AnchorElement;
import com.google.gwt.dom.client.DivElement;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.HeadingElement;
-import com.google.gwt.dom.client.ImageElement;
import com.google.gwt.dom.client.Style.Display;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -42,7 +41,7 @@ public class SectionHeaderContent extends Composite {
@UiField DivElement subtitleUi;
@UiField DivElement headerRightUi;
@UiField DivElement infoTextUi;
- @UiField ImageElement actionArrowUi;
+ @UiField DivElement actionArrowUi;
@UiField SimplePanel filterSelectContainerUi;
public SectionHeaderContent() {
@@ -94,7 +93,6 @@ public class SectionHeaderContent extends Composite {
animation.animate(collapsed);
}
});
- actionArrowUi.setSrc("images/mobile/arrow-down-grey.png");
actionArrowUi.addClassName(SectionHeaderResources.INSTANCE.css().accordion());
titleAndLabelContainerUi
.addClassName(SectionHeaderResources.INSTANCE.css().sectionheader_item_adjust_title_right());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.ui.xml
index fc23b72cc9d..13ab0f8ee35 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderContent.ui.xml
@@ -3,6 +3,7 @@
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeaderResources.java
index e762dfc7a08..e041956b12f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventheader/EventHeaderResources.java
@@ -12,17 +12,8 @@ public interface EventHeaderResources extends ClientBundle {
public interface LocalCss extends CssResource {
String eventheader();
- String sidenavigation();
- String sidenavigation_drawer();
- String eventheaderreduced();
String eventheader_info_subtitle();
- String quickfinder();
- String eventheader_inputwrapper();
- String eventheaderfixedup();
- String eventheaderfixeddown();
- String eventheadernobox();
- String eventheaderwithinputbox();
String eventheader_info();
String eventheader_info_title();
String eventheader_info_title_text();
@@ -32,9 +23,5 @@ public interface EventHeaderResources extends ClientBundle {
String eventheader_info_subtitle_info();
String eventheader_info_subtitle_info_date();
String eventheader_info_subtitle_info_location();
- String eventheader_input();
- String eventheader_button();
- String quickfinder_select();
- String eventheaderplaceholder();
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
index a2555bf8c5c..7cece0b816b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
@@ -4,10 +4,11 @@
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss
index c253f8427ea..61229c0c9a2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss
@@ -133,7 +133,7 @@ img.header_logo_image {
background: none;
}
.header_navigation_nav_sublist_item:before {
- background: url('images/home/arrow-down-grey.png');
+ background: resourceUrl('arrowDownGrey');
display: block;
height: 25px;
background-position: center;
@@ -155,12 +155,12 @@ img.header_logo_image {
transform: translate(-50%, -50%);
width: 1em;
height: 1.333333333333333em;
- background-image: url("images/mobile/navigation-icon.svg");
+ background-image: resourceUrl("navigation");
background-repeat: no-repeat;
background-size: contain;
background-position: center center;
}
.header_navigation_iconsignedin {
width: 1.666666666666667em;
- background-image: url("images/mobile/navigation-icon-signedin.svg");
+ background-image: resourceUrl("navigationSignedin");
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml
index 680f867dce5..0b820bf018e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml
@@ -30,7 +30,7 @@
+
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/HeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/HeaderResources.java
index bcb09e99e1a..64a3a12708a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/HeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/HeaderResources.java
@@ -1,15 +1,25 @@
package com.sap.sailing.gwt.home.mobile.partials.header;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface HeaderResources extends ClientBundle {
+public interface HeaderResources extends SharedHomeResources {
public static final HeaderResources INSTANCE = GWT.create(HeaderResources.class);
@Source("Header.gss")
LocalCss css();
+ @Source("navigation-icon-signedin.svg")
+ @MimeType("image/svg+xml")
+ DataResource navigationSignedin();
+
+ @Source("navigation-icon.svg")
+ @MimeType("image/svg+xml")
+ DataResource navigation();
+
public interface LocalCss extends CssResource {
String header();
String header_logo();
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon-signedin.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/navigation-icon-signedin.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon-signedin.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/navigation-icon-signedin.svg
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/navigation-icon.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/navigation-icon.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/imagegallery/MobileFullscreenGallery.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/imagegallery/MobileFullscreenGallery.ui.xml
index 64b863bd918..7216e3d8bdc 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/imagegallery/MobileFullscreenGallery.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/imagegallery/MobileFullscreenGallery.ui.xml
@@ -1,6 +1,7 @@
+
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYearEvent.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYearEvent.ui.xml
index eb3006d5ca2..58f66f98ef2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYearEvent.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYearEvent.ui.xml
@@ -7,6 +7,7 @@
type="com.sap.sailing.gwt.common.client.SharedResources" />
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatus.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatus.gss
index fda1fa1ba6e..4b4f7107b6a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatus.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatus.gss
@@ -15,27 +15,6 @@
font-size: 1.066666666666667em;
font-weight: 700;
}
-.regattastatus_header_select {
- position: absolute;
- top: 50%;
- right: 1em;
- -webkit-transform: translateY(-50%);
- -moz-transform: translateY(-50%);
- -ms-transform: translateY(-50%);
- transform: translateY(-50%);
- font-weight: 600;
- height: auto;
- width: 10.666666666666666em;
- appearance: none;
- -webkit-appearance: none;
- -moz-appearance: none;
- color: #008fcc;
- border: none;
- border-radius: 0;
- padding: 0.666666666666667em 2em 0.666666666666667em 1em;
- background: url("../images/home/filter.svg") 100% no-repeat transparent;
- background-size: 1.333333333333333em;
-}
.regattastatus_content {
visibility: visible;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.ui.xml
index cab25b6e7d6..70b2bf72d03 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.ui.xml
@@ -4,6 +4,7 @@
+
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/QuickfinderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/QuickfinderResources.java
new file mode 100644
index 00000000000..4507577f8cf
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/QuickfinderResources.java
@@ -0,0 +1,24 @@
+package com.sap.sailing.gwt.home.mobile.partials.quickfinder;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+
+public interface QuickfinderResources extends ClientBundle {
+
+ public static final QuickfinderResources INSTANCE = GWT.create(QuickfinderResources.class);
+
+ @Source("Quickfinder.gss")
+ LocalCss css();
+
+ @Source("quickfinder-arrow.svg")
+ @MimeType("image/svg+xml")
+ DataResource arrow();
+
+ public interface LocalCss extends CssResource {
+ String quickfinder();
+ String quickfinder_select();
+ }
+}
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/quickfinder-arrow.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/quickfinder-arrow.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/quickfinder-arrow.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/quickfinder-arrow.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventOverviewRecentSeriesInfo.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventOverviewRecentSeriesInfo.ui.xml
index 5c471590b66..c7d7b71d1d9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventOverviewRecentSeriesInfo.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventOverviewRecentSeriesInfo.ui.xml
@@ -3,13 +3,14 @@
-
+
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYear.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYear.ui.xml
index a50d8348c0e..1930e71dc49 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYear.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/recents/EventsOverviewRecentYear.ui.xml
@@ -3,6 +3,7 @@
xmlns:mp="urn:import:com.sap.sailing.gwt.home.mobile.partials" xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
+
-
-
@@ -30,7 +31,7 @@
@@ -17,8 +18,7 @@
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderResources.java
index 958321c349b..b70635b2283 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/SectionHeaderResources.java
@@ -1,14 +1,20 @@
package com.sap.sailing.gwt.home.mobile.partials.sectionHeader;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface SectionHeaderResources extends ClientBundle {
+public interface SectionHeaderResources extends SharedHomeResources {
public static final SectionHeaderResources INSTANCE = GWT.create(SectionHeaderResources.class);
@Source("SectionHeader.gss")
LocalCss css();
+
+ @Source("filter.svg")
+ @MimeType("image/svg+xml")
+ DataResource filter();
public interface LocalCss extends CssResource {
String sectionheader();
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/filter.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/filter.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/filter.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/sectionHeader/filter.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.gss
index b9f9282f293..89e1d70f740 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.gss
@@ -2,62 +2,12 @@
font-size: 1rem;
position: relative;
padding: 0.333333333333333em;
+ padding-bottom: 1em;
background: #f2f2f2;
-webkit-transition: top 0.3s ease-in-out;
-moz-transition: top 0.3s ease-in-out;
transition: top 0.3s ease-in-out;
}
-.eventheader .sidenavigation {
- display: none;
- position: absolute;
- top: 0;
- left: 0;
- width: 3em;
- height: 5.333333333333333em;
- z-index: 1;
-}
-.eventheader .sidenavigation_drawer {
- position: absolute;
- top: 1em;
- left: 0;
- width: 2em;
- height: 3.333333333333333em;
- background: DeepPink;
-}
-.eventheaderreduced {
- padding-bottom: 1em;
-}
-.eventheaderreduced .eventheader_info_subtitle {
- display: none;
-}
-.eventheaderreduced .quickfinder {
- display: none;
-}
-.eventheaderreduced .eventheader_inputwrapper {
- display: none;
-}
-.eventheaderfixedup {
- position: fixed;
- top: -3.533333333333333em;
- z-index: 10;
-}
-.eventheaderfixeddown {
- position: fixed;
- top: 0;
- z-index: 10;
-}
-.eventheadernobox {
- padding-bottom: 1em;
-}
-.eventheaderwithinputbox .eventheader_info {
- padding-top: 1em;
-}
-.eventheaderwithinputbox .sidenavigation_drawer {
- top: 0.333333333333333em;
-}
-.eventheaderwithinputbox .eventheader_inputwrapper {
- margin-top: 0.666666666666667em;
-}
.eventheader_info {
padding: 0.666666666666667em 0 0 0.666666666666667em;
}
@@ -103,39 +53,3 @@
.eventheader_info_subtitle_info_location {
visibility: visible;
}
-.eventheader_inputwrapper {
- padding: 0;
- margin-top: 0.666666666666667em;
-}
-.eventheader_input {
- float: left;
- display: block;
- font-weight: 600;
- padding: 0 2.333333333333333em 0 0.666666666666667em;
- width: 100%;
- height: 2.666666666666667em;
- border: none;
- vertical-align: middle;
-}
-.eventheader_button {
- float: left;
- width: 2.333333333333333em;
- height: 2.666666666666667em;
- margin-left: -2.333333333333333em;
- border: none;
- vertical-align: middle;
- background: url("../images/home/search-icon-yellow.svg") no-repeat;
- background-size: 1.333333333333333em 1.333333333333333em;
- background-position: center;
-}
-.eventheader .quickfinder {
- padding: 0;
- margin-top: 0.666666666666667em;
-}
-.eventheader .quickfinder_select {
- background: transparent;
- /* @alternate */ background: url("../images/home/quickfinder-arrow.svg") 100% no-repeat #f6f9fc;
-}
-.eventheaderplaceholder {
- font-size: inherit;
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.ui.xml
index 7179cac81ad..b1cf4afe5a6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeader.ui.xml
@@ -8,9 +8,7 @@
+
-
-
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeaderResources.java
index 87ce180bcac..79b73dd3d07 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeaderResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/seriesheader/SeriesHeaderResources.java
@@ -12,17 +12,8 @@ public interface SeriesHeaderResources extends ClientBundle {
public interface LocalCss extends CssResource {
String eventheader();
- String sidenavigation();
- String sidenavigation_drawer();
- String eventheaderreduced();
String eventheader_info_subtitle();
- String quickfinder();
- String eventheader_inputwrapper();
- String eventheaderfixedup();
- String eventheaderfixeddown();
- String eventheadernobox();
- String eventheaderwithinputbox();
String eventheader_info();
String eventheader_info_title();
String eventheader_info_title_text();
@@ -32,9 +23,5 @@ public interface SeriesHeaderResources extends ClientBundle {
String eventheader_info_subtitle_info();
String eventheader_info_subtitle_info_date();
String eventheader_info_subtitle_info_location();
- String eventheader_input();
- String eventheader_button();
- String quickfinder_select();
- String eventheaderplaceholder();
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml
index 16989c71521..43f11e48734 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml
@@ -3,6 +3,7 @@
@@ -14,7 +15,7 @@
-
+
+
-
+
+ image="{res_local.sapInSailing}" showInitial="true">
+ image="{res_local.sapTrimmed}" showInitial="false">
+ image="{res_local.race}" showInitial="false">
+ image="{res_local.sapSailingInsight}" showInitial="false">
+ image="{res_local.sapSailingBuoyPinger}" showInitial="false">
+ image="{res_local.postTrimmed}" showInitial="false">
+ image="{res_local.simulatorTrimmed}" showInitial="false">
-
+
+ @@ -60,7 +61,7 @@
@@ -78,7 +79,7 @@
@@ -94,7 +95,7 @@
@@ -111,7 +112,7 @@
@@ -127,7 +128,7 @@
@@ -142,7 +143,7 @@
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java
index d841792ee5c..9d42fcc7031 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java
@@ -1,13 +1,14 @@
package com.sap.sailing.gwt.home.mobile.partials.solutions;
+import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.uibinder.client.UiConstructor;
import com.sap.sailing.gwt.home.mobile.partials.accordion.AccordionItem;
public class SolutionsItem extends AccordionItem {
@UiConstructor
- public SolutionsItem(String title, String imageUrl, boolean showInitial) {
- super(title, imageUrl, title, showInitial);
+ public SolutionsItem(String title, ImageResource image, boolean showInitial) {
+ super(title, image, title, showInitial);
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsResources.java
new file mode 100644
index 00000000000..170406cf0c9
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsResources.java
@@ -0,0 +1,20 @@
+package com.sap.sailing.gwt.home.mobile.partials.solutions;
+
+import com.google.gwt.resources.client.ImageResource;
+import com.sap.sailing.gwt.home.shared.partials.solutions.SolutionsSharedResources;
+
+public interface SolutionsResources extends SolutionsSharedResources {
+
+ @Source("solutions-sap-trimmed.png")
+ ImageResource sapTrimmed();
+
+ @Source("solutions-race.png")
+ ImageResource race();
+
+ @Source("solutions-post-trimmed.png")
+ ImageResource postTrimmed();
+
+ @Source("solutions-simulator-trimmed.png")
+ ImageResource simulatorTrimmed();
+
+}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-post-trimmed.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-post-trimmed.png
new file mode 100644
index 00000000000..80d1b3172a4
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-post-trimmed.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-race.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-race.png
new file mode 100644
index 00000000000..ee141f53532
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-race.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sap-trimmed.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sap-trimmed.png
new file mode 100644
index 00000000000..9b1e60bed59
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sap-trimmed.png differ
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/solutions-simulator-trimmed.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-simulator-trimmed.png
similarity index 93%
rename from java/com.sap.sailing.gwt.ui/images/mobile/solutions-simulator-trimmed.png
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-simulator-trimmed.png
index 522e7eeedd4..25ec681ee0b 100644
Binary files a/java/com.sap.sailing.gwt.ui/images/mobile/solutions-simulator-trimmed.png and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-simulator-trimmed.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcoming.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcoming.ui.xml
index e4d65742f73..50620b4e50d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcoming.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcoming.ui.xml
@@ -5,11 +5,12 @@
+
@@ -17,7 +18,7 @@
-
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingEvent.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingEvent.ui.xml
index a881101438e..12d6ea157d0 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingEvent.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingEvent.ui.xml
@@ -5,6 +5,7 @@
.holder {
@@ -25,7 +26,7 @@
-
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingResources.java
index 408bbae56cf..8d6251cbb2d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/EventsOverviewUpcomingResources.java
@@ -3,12 +3,18 @@ package com.sap.sailing.gwt.home.mobile.partials.upcoming;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
public interface EventsOverviewUpcomingResources extends ClientBundle {
public static final EventsOverviewUpcomingResources INSTANCE = GWT.create(EventsOverviewUpcomingResources.class);
@Source("EventsOverviewUpcoming.gss")
LocalCss css();
+
+ @Source("calender-icon-blue.svg")
+ @MimeType("image/svg+xml")
+ DataResource calendar();
public interface LocalCss extends CssResource {
String accordion();
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/calender-icon-blue.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/calender-icon-blue.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/calender-icon-blue.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/upcoming/calender-icon-blue.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBox.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBox.gss
index a05bc5e5f9b..5da0d909f16 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBox.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBox.gss
@@ -44,11 +44,22 @@
position: relative;
color: #0a0a0a;
}
-.updatesbox_itemlink {
- background-image: url("images/home/arrow-grey-right.png");
+.updatesbox_itemlink:before {
+ position: absolute;
+ content: "";
+ right: 1em;
+ /* @alternate */ top: 50%;
+ /* @alternate */ top: calc(50% - 1.3333334em / 2);
+ height: 1.3333334em;
+ width: 1.3333334em;
+ background-size: 100%;
+ background-position: center;
+ background-image: resourceUrl('arrowDownGrey');
background-repeat: no-repeat;
- background-size: 9px 16px;
- background-position: 95% 50%;
+ -webkit-transform: rotate(270deg);
+ -moz-transform: rotate(270deg);
+ -ms-transform: rotate(270deg);
+ transform: rotate(270deg);
}
.updatesbox_itemlink:hover {
text-decoration: none;
@@ -68,6 +79,7 @@
background-repeat: no-repeat;
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
+ background-image: resourceUrl("news");
}
@media (max-width: 1190px) {
.updatesbox_item_icon {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.ui.xml
index c5c35020e10..ea41ccf45b9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.ui.xml
@@ -4,7 +4,7 @@
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxResources.java
index 046477e0f1e..283441e9247 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxResources.java
@@ -1,10 +1,10 @@
package com.sap.sailing.gwt.home.mobile.partials.updatesBox;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
+import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources;
-public interface UpdatesBoxResources extends ClientBundle {
+public interface UpdatesBoxResources extends SharedHomeResources {
public static final UpdatesBoxResources INSTANCE = GWT.create(UpdatesBoxResources.class);
@Source("UpdatesBox.gss")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGallery.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGallery.gss
index a7a07165871..92274edc530 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGallery.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGallery.gss
@@ -10,15 +10,6 @@
.videoitem .info {
font-size: inherit;
}
-.videoitem .playicon {
- position: absolute;
- cursor: pointer;
- width: 100%;
- height: 100%;
- background: url("../images/home/play-icon.svg") no-repeat;
- background-size: 2.333333333333333em 2.333333333333333em;
- background-position: center;
-}
.videoitem .videoplaceholder {
height: 100%;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGalleryResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGalleryResources.java
index 40a9853d96e..666e8555f08 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGalleryResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/videogallery/VideoGalleryResources.java
@@ -14,7 +14,6 @@ public interface VideoGalleryResources extends ClientBundle {
String videoitem();
String playbutton();
String info();
- String playicon();
String videoplaceholder();
String videoplaceholder_image();
String video();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java
index 1a0375faa50..85013e065d7 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java
@@ -1,6 +1,11 @@
package com.sap.sailing.gwt.home.mobile.places.event;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.communication.eventview.EventViewDTO;
import com.sap.sailing.gwt.home.desktop.places.event.multiregatta.mediatab.MultiregattaMediaPlace;
import com.sap.sailing.gwt.home.desktop.places.event.multiregatta.overviewtab.MultiregattaOverviewPlace;
@@ -19,6 +24,7 @@ import com.sap.sailing.gwt.home.mobile.places.event.overview.regatta.RegattaActi
import com.sap.sailing.gwt.home.mobile.places.event.races.RacesActivity;
import com.sap.sailing.gwt.home.shared.places.event.AbstractEventActivityProxy;
import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
public class EventActivityProxy extends AbstractEventActivityProxy {
@@ -35,17 +41,32 @@ public class EventActivityProxy extends AbstractEventActivityProxy new RegattaActivity((RegattaOverviewPlace) place, event, getNavigationPathDisplay(), clientFactory, flagImageResolver));
} else if (place instanceof RegattaRacesPlace) {
super.onSuccess(new RacesActivity((RegattaRacesPlace) place, event, getNavigationPathDisplay(), clientFactory));
} else if (place instanceof MiniLeaderboardPlace) {
- super.onSuccess(new MiniLeaderboardActivity((MiniLeaderboardPlace) place, event, getNavigationPathDisplay(), clientFactory));
+ withFlagImageResolver(flagImageResolver -> new MiniLeaderboardActivity((MiniLeaderboardPlace) place, event, getNavigationPathDisplay(), clientFactory, flagImageResolver));
} else if (place instanceof LatestNewsPlace) {
super.onSuccess(new LatestNewsActivity((LatestNewsPlace) place, event, getNavigationPathDisplay(), clientFactory));
} else if (place instanceof RegattaMediaPlace || place instanceof MultiregattaMediaPlace) {
super.onSuccess(new MediaActivity(place, event, getNavigationPathDisplay(), clientFactory));
}
}
+
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
+ }
});
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/minileaderboard/MiniLeaderboardActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/minileaderboard/MiniLeaderboardActivity.java
index 6cb83f64322..e72e6a7782c 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/minileaderboard/MiniLeaderboardActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/minileaderboard/MiniLeaderboardActivity.java
@@ -9,12 +9,16 @@ import com.sap.sailing.gwt.home.mobile.places.event.EventViewBase;
import com.sap.sailing.gwt.home.mobile.places.event.minileaderboard.MiniLeaderboardView.Presenter;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class MiniLeaderboardActivity extends AbstractEventActivity implements Presenter {
- public MiniLeaderboardActivity(MiniLeaderboardPlace place, EventViewDTO eventDTO, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory) {
+ private final FlagImageResolver flagImageResolver;
+
+ public MiniLeaderboardActivity(MiniLeaderboardPlace place, EventViewDTO eventDTO, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
super(place, eventDTO, clientFactory);
+ this.flagImageResolver = flagImageResolver;
initNavigationPath(navigationPathDisplay);
}
@@ -27,7 +31,7 @@ public class MiniLeaderboardActivity extends AbstractEventActivity implements MiniLeaderboardView {
@@ -12,9 +13,9 @@ public class MiniLeaderboardViewImpl extends AbstractEventView implements EventViewBase.Presenter {
- public RegattaActivity(RegattaOverviewPlace place, EventViewDTO eventDTO, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory) {
+ private final FlagImageResolver flagImageResolver;
+
+ public RegattaActivity(RegattaOverviewPlace place, EventViewDTO eventDTO, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
super(place, eventDTO, clientFactory);
+ this.flagImageResolver = flagImageResolver;
initNavigationPath(navigationPathDisplay);
}
@@ -25,7 +29,7 @@ public class RegattaActivity extends AbstractEventActivity
@Override
protected EventViewBase initView() {
- final AbstractEventOverview view = new RegattaOverviewImpl(this);
+ final AbstractEventOverview view = new RegattaOverviewImpl(this, flagImageResolver);
initSeriesNavigation(view);
initQuickfinder(view, true);
if (!isMultiRegattaEvent()) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/overview/regatta/RegattaOverviewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/overview/regatta/RegattaOverviewImpl.java
index 629832b022a..83403e8d3a8 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/overview/regatta/RegattaOverviewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/overview/regatta/RegattaOverviewImpl.java
@@ -19,6 +19,7 @@ import com.sap.sailing.gwt.home.mobile.partials.quickfinder.Quickfinder;
import com.sap.sailing.gwt.home.mobile.places.QuickfinderPresenter;
import com.sap.sailing.gwt.home.mobile.places.event.EventViewBase;
import com.sap.sailing.gwt.home.mobile.places.event.overview.AbstractEventOverview;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class RegattaOverviewImpl extends AbstractEventOverview {
@@ -28,8 +29,11 @@ public class RegattaOverviewImpl extends AbstractEventOverview {
private EventSteps eventStepsUi;
private RegattaLiveRaces liveRacesUi;
- public RegattaOverviewImpl(EventViewBase.Presenter presenter) {
+ private final FlagImageResolver flagImageResolver;
+
+ public RegattaOverviewImpl(EventViewBase.Presenter presenter, FlagImageResolver flagImageResolver) {
super(presenter, presenter.isMultiRegattaEvent(), presenter.isMultiRegattaEvent());
+ this.flagImageResolver = flagImageResolver;
FlowPanel container = new FlowPanel();
if (presenter.getRegatta() != null) {
this.setupProgress(container);
@@ -62,7 +66,7 @@ public class RegattaOverviewImpl extends AbstractEventOverview {
}
private void setupMiniLeaderboard(Panel container) {
- MinileaderboardBox miniLeaderboard = new MinileaderboardBox(false);
+ MinileaderboardBox miniLeaderboard = new MinileaderboardBox(false, flagImageResolver);
miniLeaderboard.setAction(MSG.showAll(), currentPresenter.getRegattaMiniLeaderboardNavigation(getRegattaId()));
if (currentPresenter.getRegatta() != null) {
refreshManager.add(miniLeaderboard, new GetMiniLeaderbordAction(getEventId(), getRegattaId(), 3));
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/events/EventsActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/events/EventsActivityProxy.java
deleted file mode 100755
index 4d65e26ae5f..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/events/EventsActivityProxy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sap.sailing.gwt.home.mobile.places.events;
-
-import com.google.gwt.core.client.GWT;
-import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
-import com.sap.sailing.gwt.home.shared.places.events.EventsPlace;
-import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
-
-public class EventsActivityProxy extends AbstractActivityProxy {
-
- private final MobileApplicationClientFactory clientFactory;
- private final EventsPlace currentPlace;
-
- public EventsActivityProxy(EventsPlace place, MobileApplicationClientFactory clientFactory) {
- this.currentPlace = place;
- this.clientFactory = clientFactory;
- }
-
- @Override
- protected void startAsync() {
- GWT.runAsync(new AbstractRunAsyncCallback() {
- @Override
- public void onSuccess() {
- super.onSuccess(new EventsActivity(currentPlace, clientFactory));
- }
- });
- }
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java
index 0dfb716bcac..43d87f3c873 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java
@@ -18,17 +18,20 @@ import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
public class SeriesActivity extends AbstractActivity implements SeriesView.Presenter {
private final MobileApplicationClientFactory clientFactory;
private final AbstractSeriesPlace place;
private EventSeriesViewDTO series;
private final NavigationPathDisplay navigationPathDisplay;
+ private final FlagImageResolver flagImageResolver;
- public SeriesActivity(AbstractSeriesPlace place, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory) {
+ public SeriesActivity(AbstractSeriesPlace place, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
this.navigationPathDisplay = navigationPathDisplay;
this.clientFactory = clientFactory;
this.place = place;
+ this.flagImageResolver = flagImageResolver;
}
@Override
@@ -46,7 +49,7 @@ public class SeriesActivity extends AbstractActivity implements SeriesView.Prese
}
private void initUi(final AcceptsOneWidget panel, EventBus eventBus, EventSeriesViewDTO series) {
- final SeriesView view = new SeriesViewImpl(this);
+ final SeriesView view = new SeriesViewImpl(this, flagImageResolver);
view.setQuickFinderValues(series.getDisplayName(), series.getEventsDescending());
panel.setWidget(view.asWidget());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivityProxy.java
index 1bd0f3811f5..4ce421ea3b8 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivityProxy.java
@@ -1,10 +1,16 @@
package com.sap.sailing.gwt.home.mobile.places.series;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
public class SeriesActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath {
@@ -28,7 +34,21 @@ public class SeriesActivityProxy extends AbstractActivityProxy implements Provid
GWT.runAsync(new AbstractRunAsyncCallback() {
@Override
public void onSuccess() {
- super.onSuccess(new SeriesActivity(currentPlace, navigationPathDisplay, clientFactory));
+ withFlagImageResolver(flagImageResolver -> new SeriesActivity(currentPlace, navigationPathDisplay, clientFactory, flagImageResolver));
+ }
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
}
});
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesViewImpl.java
index 29f105b7b72..400bafadfcb 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesViewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesViewImpl.java
@@ -22,6 +22,7 @@ import com.sap.sailing.gwt.home.mobile.places.QuickfinderPresenter;
import com.sap.sailing.gwt.home.shared.partials.statistics.EventStatisticsBox;
import com.sap.sailing.gwt.home.shared.refresh.LifecycleRefreshManager;
import com.sap.sailing.gwt.home.shared.refresh.RefreshManager;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class SeriesViewImpl extends Composite implements SeriesView {
@@ -40,13 +41,13 @@ public class SeriesViewImpl extends Composite implements SeriesView {
private final Presenter currentPresenter;
private final RefreshManager refreshManager;
- public SeriesViewImpl(SeriesView.Presenter presenter) {
+ public SeriesViewImpl(SeriesView.Presenter presenter, FlagImageResolver flagImageResolver) {
this.currentPresenter = presenter;
this.refreshManager = new LifecycleRefreshManager(this, currentPresenter.getDispatch());
EventSeriesViewDTO series = currentPresenter.getSeriesDTO();
eventHeaderUi = new SeriesHeader(series);
this.setupStatisticsBox(series);
- leaderboardUi = new MinileaderboardBox(true);
+ leaderboardUi = new MinileaderboardBox(true, flagImageResolver);
initWidget(uiBinder.createAndBindUi(this));
this.setupListContent(series);
this.setupEventListContent(series);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java
index 71b98f481bd..4f669b1ef93 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java
@@ -17,6 +17,7 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class SeriesMiniOverallLeaderboardActivity extends AbstractActivity implements SeriesMiniOverallLeaderboardView.Presenter {
@@ -24,11 +25,13 @@ public class SeriesMiniOverallLeaderboardActivity extends AbstractActivity imple
private final SeriesMiniOverallLeaderboardPlace place;
private EventSeriesViewDTO series;
private final NavigationPathDisplay navigationPathDisplay;
+ private final FlagImageResolver flagImageResolver;
- public SeriesMiniOverallLeaderboardActivity(SeriesMiniOverallLeaderboardPlace place, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory) {
+ public SeriesMiniOverallLeaderboardActivity(SeriesMiniOverallLeaderboardPlace place, NavigationPathDisplay navigationPathDisplay, MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
this.navigationPathDisplay = navigationPathDisplay;
this.clientFactory = clientFactory;
this.place = place;
+ this.flagImageResolver = flagImageResolver;
}
@Override
@@ -47,7 +50,7 @@ public class SeriesMiniOverallLeaderboardActivity extends AbstractActivity imple
}
private void initUi(AcceptsOneWidget panel, EventBus eventBus, EventSeriesViewDTO series) {
- final SeriesMiniOverallLeaderboardView view = new SeriesMiniOverallLeaderboardViewImpl(this);
+ final SeriesMiniOverallLeaderboardView view = new SeriesMiniOverallLeaderboardViewImpl(this, flagImageResolver);
view.setQuickFinderValues(series.getDisplayName(), series.getEventsDescending());
panel.setWidget(view.asWidget());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivityProxy.java
index 6a78c02729b..37542e98c03 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivityProxy.java
@@ -1,9 +1,15 @@
package com.sap.sailing.gwt.home.mobile.places.series.minileaderboard;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay;
import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
public class SeriesMiniOverallLeaderboardActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath {
@@ -27,8 +33,23 @@ public class SeriesMiniOverallLeaderboardActivityProxy extends AbstractActivityP
GWT.runAsync(new AbstractRunAsyncCallback() {
@Override
public void onSuccess() {
- super.onSuccess(new SeriesMiniOverallLeaderboardActivity(currentPlace, navigationPathDisplay, clientFactory));
+ withFlagImageResolver(flagImageResolver -> new SeriesMiniOverallLeaderboardActivity(currentPlace, navigationPathDisplay, clientFactory, flagImageResolver));
+ }
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
}
});
+
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardViewImpl.java
index c30a3667813..71dd3b0716d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardViewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardViewImpl.java
@@ -17,6 +17,7 @@ import com.sap.sailing.gwt.home.mobile.places.QuickfinderPresenter;
import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
import com.sap.sailing.gwt.home.shared.refresh.LifecycleRefreshManager;
import com.sap.sailing.gwt.home.shared.refresh.RefreshManager;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.ui.client.StringMessages;
public class SeriesMiniOverallLeaderboardViewImpl extends Composite implements SeriesMiniOverallLeaderboardView {
@@ -33,9 +34,9 @@ public class SeriesMiniOverallLeaderboardViewImpl extends Composite implements S
@UiField(provided = true)
MinileaderboardBox minileaderboardUi;
- public SeriesMiniOverallLeaderboardViewImpl(Presenter presenter) {
+ public SeriesMiniOverallLeaderboardViewImpl(Presenter presenter, FlagImageResolver flagImageResolver) {
this.currentPresenter = presenter;
- minileaderboardUi = new MinileaderboardBox(true);
+ minileaderboardUi = new MinileaderboardBox(true, flagImageResolver);
eventHeaderUi = new SeriesHeader(presenter.getSeriesDTO(), presenter.getSeriesNavigation());
initWidget(uiBinder.createAndBindUi(this));
RefreshManager refreshManager = new LifecycleRefreshManager(this, currentPresenter.getDispatch());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/start/StartActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/start/StartActivityProxy.java
deleted file mode 100755
index 6a1003aed31..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/start/StartActivityProxy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sap.sailing.gwt.home.mobile.places.start;
-
-import com.google.gwt.core.client.GWT;
-import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
-import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
-import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
-
-public class StartActivityProxy extends AbstractActivityProxy {
-
- private final MobileApplicationClientFactory clientFactory;
- private final StartPlace currentPlace;
-
- public StartActivityProxy(StartPlace place, MobileApplicationClientFactory clientFactory) {
- this.currentPlace = place;
- this.clientFactory = clientFactory;
- }
-
- @Override
- protected void startAsync() {
- GWT.runAsync(new AbstractRunAsyncCallback() {
- @Override
- public void onSuccess() {
- super.onSuccess(new StartActivity(currentPlace, clientFactory));
- }
- });
- }
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileActivityProxy.java
index cd5cc98ec32..ce0a9698adc 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileActivityProxy.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileActivityProxy.java
@@ -1,6 +1,11 @@
package com.sap.sailing.gwt.home.mobile.places.user.profile;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
import com.sap.sailing.gwt.home.mobile.places.user.profile.details.UserProfileDetailsActivity;
import com.sap.sailing.gwt.home.mobile.places.user.profile.preferences.UserProfilePreferencesActivity;
@@ -8,6 +13,7 @@ import com.sap.sailing.gwt.home.mobile.places.user.profile.settings.UserProfileS
import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserProfilePreferencesPlace;
import com.sap.sailing.gwt.home.shared.places.user.profile.settings.UserProfileSettingsPlace;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
public class UserProfileActivityProxy extends AbstractActivityProxy {
@@ -27,13 +33,27 @@ public class UserProfileActivityProxy extends AbstractActivityProxy {
public void onSuccess() {
if (currentPlace instanceof UserProfilePreferencesPlace) {
UserProfilePreferencesPlace userProfilePrefsPlace = (UserProfilePreferencesPlace) currentPlace;
- super.onSuccess(new UserProfilePreferencesActivity(userProfilePrefsPlace, clientFactory));
+ withFlagImageResolver(flagImageResolver -> new UserProfilePreferencesActivity(userProfilePrefsPlace, clientFactory, flagImageResolver));
} else if(currentPlace instanceof UserProfileSettingsPlace) {
super.onSuccess(new UserProfileSettingsActivity((UserProfileSettingsPlace) currentPlace, clientFactory));
} else {
super.onSuccess(new UserProfileDetailsActivity(currentPlace, clientFactory));
}
}
+ private void withFlagImageResolver(final Function activityFactory) {
+ final Consumer onSuccess = super::onSuccess;
+ final Consumer onFailure = super::onFailure;
+ FlagImageResolver.get(new AsyncCallback() {
+ @Override
+ public void onSuccess(FlagImageResolver result) {
+ onSuccess.accept(activityFactory.apply(result));
+ }
+ @Override
+ public void onFailure(Throwable caught) {
+ onFailure.accept(caught);
+ }
+ });
+ }
});
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesActivity.java
index 52a76ca1ff3..4b1c44212c6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesActivity.java
@@ -7,6 +7,7 @@ import com.sap.sailing.gwt.home.mobile.places.user.profile.AbstractUserProfileAc
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferencesPresenter;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferencesView;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferencesView.Presenter;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserProfilePreferencesPlace;
import com.sap.sse.security.ui.authentication.AuthenticationContextEvent;
@@ -16,10 +17,10 @@ public class UserProfilePreferencesActivity extends AbstractUserProfileActivity
private final UserProfilePreferencesView currentView;
public UserProfilePreferencesActivity(UserProfilePreferencesPlace place,
- MobileApplicationClientFactory clientFactory) {
+ MobileApplicationClientFactory clientFactory, FlagImageResolver flagImageResolver) {
super(clientFactory);
this.userPreferencesPresenter = new UserPreferencesPresenter(clientFactory);
- this.currentView = new UserProfilePreferencesViewImpl(this);
+ this.currentView = new UserProfilePreferencesViewImpl(this, flagImageResolver);
}
@Override
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesViewImpl.java
index 40ce89ce96b..d68f284d3f6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesViewImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/preferences/UserProfilePreferencesViewImpl.java
@@ -3,14 +3,15 @@ package com.sap.sailing.gwt.home.mobile.places.user.profile.preferences;
import com.sap.sailing.gwt.home.mobile.places.user.profile.AbstractUserProfileView;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferences;
import com.sap.sailing.gwt.home.shared.places.user.profile.preferences.UserPreferencesView;
+import com.sap.sailing.gwt.ui.client.FlagImageResolver;
public class UserProfilePreferencesViewImpl extends AbstractUserProfileView implements UserProfilePreferencesView {
private final UserPreferencesView userPreferencesView;
- public UserProfilePreferencesViewImpl(UserProfilePreferencesView.Presenter presenter) {
+ public UserProfilePreferencesViewImpl(UserProfilePreferencesView.Presenter presenter, FlagImageResolver flagImageResolver) {
super(presenter);
- this.userPreferencesView = new UserPreferences(presenter.getUserPreferencesPresenter());
+ this.userPreferencesView = new UserPreferences(presenter.getUserPreferencesPresenter(), flagImageResolver);
this.userPreferencesView.setEdgeToEdge(true);
this.setViewContent(userPreferencesView);
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/SwitchingEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/SwitchingEntryPoint.java
index e58ad8506f6..7b26afed818 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/SwitchingEntryPoint.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/SwitchingEntryPoint.java
@@ -10,7 +10,6 @@ import java.util.logging.Logger;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.dom.client.Document;
@@ -18,8 +17,6 @@ import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceHistoryMapper;
import com.google.gwt.user.client.Cookies;
import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.RootPanel;
import com.sap.sailing.gwt.common.client.SharedResources;
import com.sap.sailing.gwt.home.desktop.DesktopEntryPoint;
import com.sap.sailing.gwt.home.mobile.MobileEntryPoint;
@@ -35,9 +32,10 @@ import com.sap.sse.gwt.client.formfactor.DeviceDetector;
*
* The decision is made on the following aspects:
* {
- private static final String ANNOUNCEMENT_ICON = "images/mobile/icon-bottle-white.svg";
+ private static final String ANNOUNCEMENT_ICON = AnniversaryResources.INSTANCE.bottle().getSafeUri().asString();
private static final StringMessages I18N = StringMessages.INSTANCE;
private static final NumberFormat COUNT_FORMAT = NumberFormat.getFormat("#,###");
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversaryResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversaryResources.java
new file mode 100644
index 00000000000..9f40a96d1e0
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversaryResources.java
@@ -0,0 +1,15 @@
+package com.sap.sailing.gwt.home.shared.partials.anniversary;
+
+import com.google.gwt.core.shared.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.DataResource;
+import com.google.gwt.resources.client.DataResource.MimeType;
+
+public interface AnniversaryResources extends ClientBundle {
+
+ public static final AnniversaryResources INSTANCE = GWT.create(AnniversaryResources.class);
+
+ @Source("icon-bottle-white.svg")
+ @MimeType("image/svg+xml")
+ DataResource bottle();
+}
diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/icon-bottle-white.svg b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/icon-bottle-white.svg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/mobile/icon-bottle-white.svg
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/icon-bottle-white.svg
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/countdown/Countdown.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/countdown/Countdown.gss
index 2d1d1467eef..5449fa3af82 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/countdown/Countdown.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/countdown/Countdown.gss
@@ -13,7 +13,6 @@
height: 100%;
background-size: cover;
background-position: center;
- background-image: url("images/home/countdown-thumbnail.png");
}
.countdown_content {
position: absolute;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml
index 9e72e0da75c..cc87c47267e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml
@@ -1,6 +1,7 @@
.popup {
position: fixed !important;
@@ -93,7 +94,7 @@
-
- *
- the type of device (desktop, phone, table) - *
- the place to be shown and if the place is available for one or the other form factor - *
- the user preference that is being triggered by the user clicking "desktop version" or "mobile version" links in the page footer + *
- the type of device (desktop, phone, table) + *
- the place to be shown and if the place is available for one or the other form factor + *
- the user preference that is being triggered by the user clicking "desktop version" or "mobile version" links in + * the page footer *
true if the given {@link Place} implements {@link HasMobileVersion} interface or the implemented
- * {@link MobileSupport#hasMobileVersion()} method returns true, false otherwise
+ * @return true if the given {@link Place} implements {@link HasMobileVersion} interface or the
+ * implemented {@link MobileSupport#hasMobileVersion()} method returns true, false
+ * otherwise
*/
public static boolean hasMobileVersion(Place place) {
return place instanceof HasMobileVersion
@@ -111,12 +110,7 @@ public class SwitchingEntryPoint implements EntryPoint {
// only force "not mobile" on mobile devices
Cookies.setCookie(SAPSAILING_MOBILE, "false");
}
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
- @Override
- public void execute() {
- Window.Location.reload();
- }
- });
+ reloadApp();
}
public static void switchToMobile() {
@@ -126,48 +120,22 @@ public class SwitchingEntryPoint implements EntryPoint {
// only force mobile version on desktop
Cookies.setCookie(SAPSAILING_MOBILE, "true");
}
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
- @Override
- public void execute() {
- Window.Location.reload();
- }
- });
+ reloadApp();
}
private void startMobile() {
configureMobileHeader();
- GWT.runAsync(MobileEntryPoint.class, new RunAsyncCallback() {
- @Override
- public void onSuccess() {
- new MobileEntryPoint().onModuleLoad();
- }
-
- @Override
- public void onFailure(Throwable reason) {
- LOG.severe("Failed to async start mobile version: " + reason.getMessage());
- RootPanel.get().add(new Label("Failed to load mobile version"));
- }
- });
+ new MobileEntryPoint().onModuleLoad();
}
private void startDesktop() {
configureDesktopHeader();
- GWT.runAsync(DesktopEntryPoint.class, new RunAsyncCallback() {
- @Override
- public void onSuccess() {
- new DesktopEntryPoint().onModuleLoad();
- }
-
- @Override
- public void onFailure(Throwable reason) {
- LOG.severe("Failed to async start desktop version: " + reason.getMessage());
- RootPanel.get().add(new Label("Failed to load desktop version"));
- }
- });
+ new DesktopEntryPoint().onModuleLoad();
}
private void configureDesktopHeader() {
- setViewportToDeviceWidth(DeviceDetector.isTablet() ? SCALE_VALUE_SMALLER : SCALE_VALUE_SMALL, SCALE_VALUE_LARGE);
+ setViewportToDeviceWidth(DeviceDetector.isTablet() ? SCALE_VALUE_SMALLER : SCALE_VALUE_SMALL,
+ SCALE_VALUE_LARGE);
}
private void configureMobileHeader() {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversariesPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversariesPresenter.java
index 3a53653758b..2b6a16002b7 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversariesPresenter.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/anniversary/AnniversariesPresenter.java
@@ -23,7 +23,7 @@ import com.sap.sse.gwt.client.shared.perspective.PerspectiveCompositeSettings;
*/
public class AnniversariesPresenter implements RefreshableWidget
+