7a1e93c4fb1dc9c951c732eb2a381a30cd7fbab4
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java
| ... | ... | @@ -49,10 +49,8 @@ public class Footer extends Composite { |
| 49 | 49 | public Footer(final DesktopPlacesNavigator navigator, EventBus eventBus) { |
| 50 | 50 | FooterResources.INSTANCE.css().ensureInjected(); |
| 51 | 51 | releaseNotesNavigation = navigator.getWhatsNewNavigation(WhatsNewNavigationTabs.SailingAnalytics); |
| 52 | - |
|
| 53 | 52 | initWidget(uiBinder.createAndBindUi(this)); |
| 54 | 53 | navigator.getImprintNavigation().configureAnchorElement(imprintAnchorLink); |
| 55 | - |
|
| 56 | 54 | DOM.sinkEvents(mobileUi, Event.ONCLICK); |
| 57 | 55 | DOM.setEventListener(mobileUi, new EventListener() { |
| 58 | 56 | @Override |
| ... | ... | @@ -67,7 +65,6 @@ public class Footer extends Composite { |
| 67 | 65 | copyrightDiv.getStyle().setDisplay(NONE); |
| 68 | 66 | languageSelector.setLabelText(StringMessages.INSTANCE.whitelabelFooterLanguage()); |
| 69 | 67 | supportAnchor.getStyle().setDisplay(Display.NONE); |
| 70 | - whatsNewAnchor.getStyle().setDisplay(Display.NONE); |
|
| 71 | 68 | privacyAnchorLink.getStyle().setDisplay(Display.NONE); |
| 72 | 69 | jobsAnchor.getStyle().setDisplay(Display.NONE); |
| 73 | 70 | } else { |
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/TabletAndDesktopWhatsNewView.java
| ... | ... | @@ -51,7 +51,6 @@ public class TabletAndDesktopWhatsNewView extends Composite implements WhatsNewV |
| 51 | 51 | private final PlaceNavigation<WhatsNewPlace> raceCommitteeAppNotesNavigation; |
| 52 | 52 | private final PlaceNavigation<WhatsNewPlace> inSightAppNotesNavigation; |
| 53 | 53 | private final PlaceNavigation<WhatsNewPlace> buoyPingerAppNotesNavigation; |
| 54 | - |
|
| 55 | 54 | private final List<Anchor> links; |
| 56 | 55 | private final List<HTML> contentWidgets; |
| 57 | 56 | |
| ... | ... | @@ -70,7 +69,6 @@ public class TabletAndDesktopWhatsNewView extends Composite implements WhatsNewV |
| 70 | 69 | setBrandedHeadlineInWidget(sailingAnalyticsNotes, "h4", "What's New - {0} Sailing Analytics"); |
| 71 | 70 | setBrandedHeadlineInWidget(inSightAppNotes, "h4", "What's New - Sail Insight powered by {0}"); |
| 72 | 71 | setBrandedHeadlineInWidget(buoyPingerAppNotes, "h4", "What's New - {0} Sailing Buoy Pinger"); |
| 73 | - |
|
| 74 | 72 | } |
| 75 | 73 | // set notes navigation |
| 76 | 74 | sailingAnalyticNotesNavigation = placesNavigator.getWhatsNewNavigation(WhatsNewNavigationTabs.SailingAnalytics); |
| ... | ... | @@ -178,6 +176,4 @@ public class TabletAndDesktopWhatsNewView extends Composite implements WhatsNewV |
| 178 | 176 | String text = templateWithBrandPlaceholder.replace("{0}", brandName); |
| 179 | 177 | target.setInnerText(text); |
| 180 | 178 | } |
| 181 | - |
|
| 182 | - |
|
| 183 | 179 | } |
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
| ... | ... | @@ -6130,6 +6130,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet |
| 6130 | 6130 | } |
| 6131 | 6131 | } |
| 6132 | 6132 | } catch (InterruptedException e) { |
| 6133 | + logger.warning("Waiting for branding configuration service got interrupted. Continuing without brand affiliation message."); |
|
| 6133 | 6134 | } |
| 6134 | 6135 | } |
| 6135 | 6136 | return result; |
java/com.sap.sse.branding.sap/src/com/sap/sse/branding/sap/SAPBrandingConfiguration.java
| ... | ... | @@ -13,6 +13,12 @@ public class SAPBrandingConfiguration implements BrandingConfiguration { |
| 13 | 13 | private String greyTransparentLogoURL; |
| 14 | 14 | private final ResourceBundleStringMessages sailingServerStringMessages; |
| 15 | 15 | private static final String STRING_MESSAGES_BASE_NAME = "stringmessages/SAPBrandingStringMessages"; |
| 16 | + |
|
| 17 | + /** |
|
| 18 | + * The following path consists of the "Web-ContextPath" from the bundle's MANIFEST.MF, followed by the |
|
| 19 | + * images folder name and hence constitutes the URL path to which a "/" and the image file name has to |
|
| 20 | + * be appended to obtain a URL path to an image. |
|
| 21 | + */ |
|
| 16 | 22 | private static final String IMAGES_ROOT = "/sap-branding/images"; |
| 17 | 23 | |
| 18 | 24 | public SAPBrandingConfiguration() { |