java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java
... ...
@@ -374,7 +374,7 @@ public class Header extends Composite implements HeaderConstants {
374 374
solutionsPageLink.getElement().getStyle().setDisplay(Display.NONE);
375 375
logoAnchor.setHref("");
376 376
logoAnchor.setTitle(StringMessages.INSTANCE.sailingAnalytics());
377
- menuItemVisibilityHandler.addIgnore(solutionsPageLink);
377
+ //menuItemVisibilityHandler.addIgnore(solutionsPageLink);
378 378
} else {
379 379
logoAnchor.setHref(UriUtils.fromString(StringMessages.INSTANCE.sapAnalyticsURL()).asString());
380 380
}
... ...
@@ -383,7 +383,6 @@ public class Header extends Composite implements HeaderConstants {
383 383
subscriptionsPageLink.getElement().setAttribute(DEBUG_ID_ATTRIBUTE, "subscriptionsPageLink");
384 384
logoAnchor.setAttribute(DEBUG_ID_ATTRIBUTE, "logoAnchor");
385 385
eventsPageLink.getElement().setAttribute(DEBUG_ID_ATTRIBUTE, "eventsPage");
386
- //remaining entries please see at registration for AuthenticationContextEvent
387 386
menuItemVisibilityHandler.refreshVisibilityDeferred();
388 387
}
389 388
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.gss
... ...
@@ -117,6 +117,7 @@
117 117
background-repeat: no-repeat;
118 118
background-position: left center;
119 119
background-size: 100%;
120
+ background-image: resourceUrl("solutionsImage");
120 121
padding: 4em 0 4.333333333333333em;
121 122
}
122 123
@media (min-width: 45em) {
... ...
@@ -138,6 +139,7 @@
138 139
max-width: 88em;
139 140
background-repeat: no-repeat;
140 141
background-size: 40%;
142
+ background-image: resourceUrl("raceManagerImage");
141 143
background-position: center right;
142 144
}
143 145
@media (min-width: 45em) {
... ...
@@ -159,6 +161,7 @@
159 161
background-repeat: no-repeat;
160 162
background-position: left center;
161 163
background-size: 40%;
164
+ background-image: resourceUrl("sailingInsightImage");
162 165
padding: 4em 0 4.333333333333333em;
163 166
}
164 167
@media (min-width: 45em) {
... ...
@@ -179,6 +182,7 @@
179 182
padding: 4em 50% 4.333333333333333em 0;
180 183
max-width: 88em;
181 184
background-repeat: no-repeat;
185
+ background-image: resourceUrl("buoyPingerImage");
182 186
background-size: 40%;
183 187
background-position: center right;
184 188
}
... ...
@@ -197,6 +201,7 @@
197 201
}
198 202
.solutions_contentsimulator .gridalternator {
199 203
background-repeat: no-repeat;
204
+ background-image: resourceUrl("simulatorImage");
200 205
background-position: left center;
201 206
background-size: 100%;
202 207
padding: 3.333333333333333em 0 3.333333333333333em;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.java
... ...
@@ -28,6 +28,7 @@ import com.sap.sailing.gwt.ui.client.StringMessages;
28 28
import com.sap.sse.gwt.shared.ClientConfiguration;
29 29
import com.google.gwt.dom.client.HeadingElement;
30 30
import com.google.gwt.dom.client.ParagraphElement;
31
+import com.google.gwt.dom.client.Style.Display;
31 32
32 33
public class Solutions extends Composite {
33 34
interface SolutionsUiBinder extends UiBinder<Widget, Solutions> {
... ...
@@ -126,6 +127,25 @@ public class Solutions extends Composite {
126 127
simulatorDivAlternator.getStyle().setBackgroundImage("url(\'"+ClientConfiguration.getInstance().getSailingSimulatorImageURL()+"\')");
127 128
raceDivGridAlternator.getStyle().setBackgroundImage("url(\'"+ClientConfiguration.getInstance().getSailingRaceManagerAppImageURL()+"\')");
128 129
buoyPingerDivAlternator.getStyle().setBackgroundImage("url(\'"+ClientConfiguration.getInstance().getBuoyPingerAppImageURL()+"\')");
130
+ } else {
131
+ inSailingAnchor.setVisible(false);
132
+ sailingAnalyticsAnchor.setText(i18n.solutionsAnalyticsHeadline(""));
133
+ raceAnchor.setText(i18n.solutionsRaceHeadline(""));
134
+ inSightAnchor.setText(i18n.sailInSightName());
135
+ buoyPingerAnchor.setText(i18n.solutionsBuoyPingerHeadline(""));
136
+
137
+
138
+ inSailingDiv.getStyle().setDisplay(Display.NONE);
139
+ sailingAnalyticsTitleHeader.setInnerText(i18n.sailingAnalyticsTitle(""));
140
+ contentSailingAnalytics1.setInnerText(i18n.contentSailingAnalytics1(""));
141
+ contentSailingAnalytics2.setInnerText(i18n.contentSailingAnalytics2(""));
142
+ sailingRaceManagerHeader.setInnerText(i18n.sailingRaceManager(""));
143
+ contentSailingRaceManager.setInnerText(i18n.contentSailingRaceManager(""));
144
+ sailInSightHeader.setInnerText(i18n.sailInSightName());
145
+ contentSailInSight.setInnerText(i18n.contentSailInSight(""));
146
+ sailingBuoyPingerHeader.setInnerText(i18n.sailingBuoyPinger(""));
147
+ contentSailingBuoyPinger.setInnerText(i18n.contentSailingBuoyPinger(""));
148
+
129 149
}
130 150
sailingAnalyticsDetailsNavigation = placesNavigator.getWhatsNewNavigation(WhatsNewNavigationTabs.SailingAnalytics);
131 151
raceCommitteeAppDetailsNavigation = placesNavigator.getWhatsNewNavigation(WhatsNewNavigationTabs.RaceManagerApp);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/SolutionsResources.java
... ...
@@ -4,6 +4,7 @@ import com.google.gwt.core.client.GWT;
4 4
import com.google.gwt.resources.client.ClientBundle;
5 5
import com.google.gwt.resources.client.CssResource;
6 6
import com.google.gwt.resources.client.CssResource.Shared;
7
+import com.google.gwt.resources.client.ImageResource;
7 8
8 9
public interface SolutionsResources extends ClientBundle {
9 10
public static final SolutionsResources INSTANCE = GWT.create(SolutionsResources.class);
... ...
@@ -11,6 +12,17 @@ public interface SolutionsResources extends ClientBundle {
11 12
@Source("Solutions.gss")
12 13
LocalCss css();
13 14
15
+ @Source("solutions-sailing-insight.png")
16
+ ImageResource sailingInsightImage();
17
+ @Source("solutions-sailing-buoy-pinger.png")
18
+ ImageResource buoyPingerImage();
19
+ @Source("solutions-sailing-race-manager.png")
20
+ ImageResource raceManagerImage();
21
+ @Source("solutions-simulator.png")
22
+ ImageResource simulatorImage();
23
+ @Source("solutions.png")
24
+ ImageResource solutionsImage();
25
+
14 26
@Shared
15 27
public interface LocalCss extends CssResource {
16 28
String solutions();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions-sailing-buoy-pinger.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions-sailing-buoy-pinger.png differ
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions-sailing-insight.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions-sailing-insight.png differ
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions-sailing-race-manager.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions-sailing-race-manager.png differ
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions-simulator.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions-simulator.png differ
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/solutions.png differ
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java
... ...
@@ -67,10 +67,8 @@ public class Header extends Composite implements HeaderConstants {
67 67
navigationPathDisplay = new DropdownNavigationPathDisplay();
68 68
addNavigation(placeNavigator.getHomeNavigation(), StringMessages.INSTANCE.home());
69 69
addNavigation(placeNavigator.getEventsNavigation(), StringMessages.INSTANCE.events());
70
- if (ClientConfiguration.getInstance().isBrandingActive()) {
71
- addNavigation(placeNavigator.getSolutionsNavigation(SolutionsNavigationTabs.SailingAnalytics),
72
- StringMessages.INSTANCE.solutions());
73
- }
70
+ addNavigation(placeNavigator.getSolutionsNavigation(SolutionsNavigationTabs.SailingAnalytics),
71
+ StringMessages.INSTANCE.solutions());
74 72
addNavigation(placeNavigator.getSubscriptionsNavigation(),
75 73
StringMessages.INSTANCE.subscriptions());
76 74
HeaderNavigationItem manageEventsNavItem = addNavigation(ADMIN_CONSOLE_PATH,
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.java
... ...
@@ -68,6 +68,18 @@ public class Solutions extends Composite {
68 68
sailingBuoyPinger.setImageUrl(ClientConfiguration.getInstance().getBuoyPingerAppImageURL());
69 69
strategySimulator.setImageUrl(ClientConfiguration.getInstance().getSailingSimulatorTrimmedImageURL());
70 70
sailingAnalyticsDetailsAnchor.setInnerText(ClientConfiguration.getInstance().getSailingAnalyticsReadMoreText(Optional.empty()));
71
+ } else {
72
+ brandInSailingItem.setVisible(false);
73
+ sailingAnalyticsItem.setHeaderText(i18n.sailingAnalyticsTitle(""));
74
+ sailingRaceManager.setHeaderText(i18n.sailingRaceManager(""));
75
+ sailInSight.setHeaderText(i18n.sailInSightName());
76
+ sailingBuoyPinger.setHeaderText(i18n.sailingBuoyPinger(""));
77
+
78
+ contentSailingAnalytics1.setInnerText(i18n.contentSailingAnalytics1(""));
79
+ contentSailingAnalytics2.setInnerText(i18n.contentSailingAnalytics2(""));
80
+ contentSailingRaceManager.setInnerText(i18n.contentSailingRaceManager(""));
81
+ contentSailInSight.setInnerText(i18n.contentSailInSight(""));
82
+ contentSailingBuoyPinger.setInnerText(i18n.contentSailingBuoyPinger(""));
71 83
}
72 84
initWhatsNewLink(placesNavigator, WhatsNewNavigationTabs.SailingAnalytics, sailingAnalyticsDetailsAnchor);
73 85
initWhatsNewLink(placesNavigator, WhatsNewNavigationTabs.RaceManagerApp, raceManagerAppDetailsAnchor);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.ui.xml
... ...
@@ -5,9 +5,10 @@
5 5
xmlns:sb="urn:import:com.sap.sailing.gwt.home.shared.partials.storebadges">
6 6
<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
7 7
<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
8
+ <ui:with field="res_local" type="com.sap.sailing.gwt.home.mobile.partials.solutions.SolutionsResources" />
8 9
<a:Accordion>
9 10
<a:item>
10
- <s:SolutionsItem ui:field="brandInSailingItem" title="" showInitial="true">
11
+ <s:SolutionsItem ui:field="brandInSailingItem" image="{res_local.solutionsImage}" title="" showInitial="true">
11 12
<s:content>
12 13
<g:HTMLPanel>
13 14
<div ui:field="inSailingContentDiv"></div>
... ...
@@ -16,19 +17,20 @@
16 17
</s:SolutionsItem>
17 18
</a:item>
18 19
<a:item>
19
- <s:SolutionsItem ui:field="sailingAnalyticsItem" title="" showInitial="false">
20
+ <s:SolutionsItem ui:field="sailingAnalyticsItem" title="" image="{res_local.solutionsImage}" showInitial="false">
20 21
<s:content>
21 22
<g:HTMLPanel>
22 23
<p ui:field="contentSailingAnalytics1" />
23 24
<p ui:field="contentSailingAnalytics2" />
24 25
<a class="{res.mainCss.button}" ui:field="sailingAnalyticsDetailsAnchor">
26
+ <ui:text from="{i18n.sailingRaceManagerReadMore}"/>
25 27
</a>
26 28
</g:HTMLPanel>
27 29
</s:content>
28 30
</s:SolutionsItem>
29 31
</a:item>
30 32
<a:item>
31
- <s:SolutionsItem ui:field="sailingRaceManager" title="" showInitial="false">
33
+ <s:SolutionsItem ui:field="sailingRaceManager" title="" image="{res_local.raceManagerImage}" showInitial="false">
32 34
<s:content>
33 35
<g:HTMLPanel>
34 36
<p ui:field="contentSailingRaceManager" />
... ...
@@ -41,7 +43,7 @@
41 43
</s:SolutionsItem>
42 44
</a:item>
43 45
<a:item>
44
- <s:SolutionsItem ui:field="sailInSight" title="" showInitial="false">
46
+ <s:SolutionsItem ui:field="sailInSight" title="" image="{res_local.sailingInsightImage}" showInitial="false">
45 47
<s:content>
46 48
<g:HTMLPanel>
47 49
<p ui:field="contentSailInSight" />
... ...
@@ -55,7 +57,7 @@
55 57
</s:SolutionsItem>
56 58
</a:item>
57 59
<a:item>
58
- <s:SolutionsItem ui:field="sailingBuoyPinger" title="" showInitial="false">
60
+ <s:SolutionsItem ui:field="sailingBuoyPinger" title="" image="{res_local.buoyPingerImage}" showInitial="false">
59 61
<s:content>
60 62
<g:HTMLPanel>
61 63
<p ui:field="contentSailingBuoyPinger" />
... ...
@@ -68,7 +70,7 @@
68 70
</s:SolutionsItem>
69 71
</a:item>
70 72
<a:item>
71
- <s:SolutionsItem ui:field="strategySimulator" title="{i18n.strategySimulator}" showInitial="false">
73
+ <s:SolutionsItem ui:field="strategySimulator" title="{i18n.strategySimulator}" image="{res_local.simulatorImage}" showInitial="false">
72 74
<s:content>
73 75
<g:HTMLPanel>
74 76
<p>
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsItem.java
... ...
@@ -7,7 +7,7 @@ import com.sap.sailing.gwt.home.mobile.partials.accordion.AccordionItem;
7 7
public class SolutionsItem extends AccordionItem {
8 8
9 9
@UiConstructor
10
- public SolutionsItem(String title, boolean showInitial) {
11
- super(title, /* image URL to be set through setImageUrl */ (ImageResource) null, title, showInitial);
10
+ public SolutionsItem(String title, ImageResource image, boolean showInitial) {
11
+ super(title, image, title, showInitial);
12 12
}
13 13
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/SolutionsResources.java
... ...
@@ -0,0 +1,20 @@
1
+package com.sap.sailing.gwt.home.mobile.partials.solutions;
2
+
3
+import com.google.gwt.core.client.GWT;
4
+import com.google.gwt.resources.client.ClientBundle;
5
+import com.google.gwt.resources.client.ImageResource;
6
+
7
+public interface SolutionsResources extends ClientBundle {
8
+ public static final SolutionsResources INSTANCE = GWT.create(SolutionsResources.class);
9
+
10
+ @Source("solutions-sailing-insight.png")
11
+ ImageResource sailingInsightImage();
12
+ @Source("solutions-sailing-buoy-pinger.png")
13
+ ImageResource buoyPingerImage();
14
+ @Source("solutions-race.png")
15
+ ImageResource raceManagerImage();
16
+ @Source("solutions-simulator-trimmed.png")
17
+ ImageResource simulatorImage();
18
+ @Source("solutions-trimmed.png")
19
+ ImageResource solutionsImage();
20
+}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-race.png
... ...
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
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sailing-buoy-pinger.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sailing-buoy-pinger.png differ
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sailing-insight.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-sailing-insight.png differ
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-simulator-trimmed.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-simulator-trimmed.png differ
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-trimmed.png
... ...
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/solutions-trimmed.png differ
java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/login/LoginHintContent.java
... ...
@@ -70,10 +70,5 @@ public class LoginHintContent extends Composite {
70 70
}
71 71
}
72 72
});
73
-
74
- if (!ClientConfiguration.getInstance().isBrandingActive()) {
75
- moreInfo.getElement().getStyle().setDisplay(Display.NONE);
76
- }
77
-
78 73
}
79 74
}