From 2209ceb0f2bcd13affa293f42180ed79d861530e Mon Sep 17 00:00:00 2001
From: Georg Herdt <herdt@agima-it.de>
Date: Fri, 14 Feb 2020 16:13:16 +0100
Subject: [PATCH] bug 5153 debranding logic for ui elements

---
 java/com.sap.sailing.gwt.ui/Home.html         |  2 +-
 .../home/desktop/partials/footer/Footer.java  | 23 +++++++++++++++++-
 .../desktop/partials/footer/Footer.ui.xml     | 10 ++++----
 .../home/desktop/partials/header/Header.java  |  4 ++++
 .../desktop/partials/header/Header.ui.xml     |  2 +-
 .../partials/sharing/SharingButtons.java      | 12 ++++++++++
 .../partials/sharing/SharingButtons.ui.xml    |  2 +-
 .../partials/socialfooter/SocialFooter.java   | 13 +++++++++-
 .../partials/socialfooter/SocialFooter.ui.xml |  2 +-
 .../start/TabletAndDesktopStartView.java      |  1 +
 .../start/TabletAndDesktopStartView.ui.xml    |  2 +-
 .../home/mobile/partials/footer/Footer.java   | 24 ++++++++++++++++++-
 .../home/mobile/partials/footer/Footer.ui.xml |  8 +++----
 .../home/mobile/partials/header/Header.java   | 10 ++++++++
 .../home/mobile/partials/header/Header.ui.xml |  4 ++--
 .../partials/socialfooter/SocialFooter.java   | 10 ++++++++
 .../partials/socialfooter/SocialFooter.ui.xml |  2 +-
 .../sailing/gwt/ui/client/StringMessages.java |  2 ++
 .../gwt/ui/client/StringMessages.properties   |  4 +++-
 19 files changed, 116 insertions(+), 21 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/Home.html b/java/com.sap.sailing.gwt.ui/Home.html
index 4cbc22ab4b9..784e87ad219 100644
--- a/java/com.sap.sailing.gwt.ui/Home.html
+++ b/java/com.sap.sailing.gwt.ui/Home.html
@@ -26,7 +26,7 @@
 	<script>
   		videojs.options.techOrder = ['vimeo', 'youtube',  'html5'];
 	</script>
-	
+
 	<script src="com.sap.sailing.gwt.home.Home/com.sap.sailing.gwt.home.Home.nocache.js"></script>
 	<style type="text/css">
 	.loading {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java
index d56dd87fbc3..bb42776d20a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java
@@ -1,7 +1,11 @@
 package com.sap.sailing.gwt.home.desktop.partials.footer;
 
+import static com.google.gwt.dom.client.Style.Display.NONE;
+
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.AnchorElement;
+import com.google.gwt.dom.client.DivElement;
+import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.DOM;
@@ -15,13 +19,21 @@ import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace;
 import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace.WhatsNewNavigationTabs;
 import com.sap.sailing.gwt.home.shared.SwitchingEntryPoint;
 import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
+import com.sap.sailing.gwt.ui.client.StringMessages;
+import com.sap.sse.gwt.client.controls.languageselect.LanguageSelector;
+import com.sap.sse.gwt.shared.Branding;
 
 public class Footer extends Composite {
     private static FooterPanelUiBinder uiBinder = GWT.create(FooterPanelUiBinder.class);
 
     interface FooterPanelUiBinder extends UiBinder<Widget, Footer> {
     }
-
+    
+    @UiField AnchorElement whatsNewAnchor;
+    @UiField AnchorElement sapJobsAnchor;
+    @UiField AnchorElement feedbackAnchor;
+    @UiField LanguageSelector languageSelector;
+    @UiField DivElement copyrightDiv;
     @UiField AnchorElement imprintAnchorLink;
     @UiField AnchorElement mobileUi;
     @UiField(provided = true)
@@ -44,6 +56,15 @@ public class Footer extends Composite {
                 }
             }
         });
+
+        if (!Branding.getInstance().isActive()) {
+            copyrightDiv.getStyle().setDisplay(NONE);
+            languageSelector.setLabelText(StringMessages.INSTANCE.whitelabelFooterLanguage());
+            sapJobsAnchor.getStyle().setDisplay(Display.NONE);
+            feedbackAnchor.getStyle().setDisplay(Display.NONE);
+            whatsNewAnchor.getStyle().setDisplay(Display.NONE);
+            imprintAnchorLink.getStyle().setDisplay(Display.NONE);
+        }
     }
     
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml
index 5a5f31122ef..ec5dcfeaa57 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml
@@ -10,7 +10,7 @@
     <!-- Website footer-->
       <div class="{res.mediaCss.grid}">
         <div class="{res.mediaCss.small12} {res.mediaCss.medium9} {res.mediaCss.columns}">
-          <div class="{local_res.css.sitefooter_copyright}">
+          <div ui:field="copyrightDiv" class="{local_res.css.sitefooter_copyright}">
             <ui:text from='{i18n.footerCopyright}' />
           </div>
           <div class="{local_res.css.sitefooter_links}">
@@ -20,22 +20,22 @@
             <a href="https://www.sap.com/about/legal/privacy.html" target="_blank" class="{local_res.css.sitefooter_links_link}">
               <ui:text from='{i18n.footerPrivacy}' />
             </a>
-	          <a href="https://jobs.sap.com" target="_blank" class="{local_res.css.sitefooter_links_link}">
+	          <a ui:field="sapJobsAnchor" href="https://jobs.sap.com" target="_blank" class="{local_res.css.sitefooter_links_link}">
 	              <ui:text from='{i18n.footerJobs}'/>
 	          </a>
-            <a href="mailto:sailing_analytics%40sap.com?subject=[SAP Sailing] Feedback" target="_blank" class="{local_res.css.sitefooter_links_link}">
+            <a ui:field="feedbackAnchor" href="mailto:sailing_analytics%40sap.com?subject=[SAP Sailing] Feedback" target="_blank" class="{local_res.css.sitefooter_links_link}">
               <ui:text from='{i18n.footerFeedback}' />
             </a>
             <a ui:field="mobileUi" href="HomeMobile.html" 
             		class="{local_res.css.sitefooter_links_link} {res.mediaCss.showonsmall} {res.mediaCss.hideonmedium} {res.mediaCss.hideonlarge}">
               Mobile
             </a>
-            <a href="{releaseNotesNavigation.getSafeTargetUrl}" class="{local_res.css.sitefooter_links_link}">
+            <a ui:field="whatsNewAnchor" href="{releaseNotesNavigation.getSafeTargetUrl}" class="{local_res.css.sitefooter_links_link}">
               <ui:text from='{i18n.whatsNew}' />
             </a>
           </div>
         </div>
-        <l:LanguageSelector labelText="{i18n.footerLanguage}" addStyleNames="{res.mediaCss.small12}
+        <l:LanguageSelector ui:field="languageSelector" labelText="{i18n.footerLanguage}" addStyleNames="{res.mediaCss.small12}
                 {res.mediaCss.medium3} {res.mediaCss.columns} {local_res.css.sitefooter_language}" />
       </div>
   </g:HTMLPanel>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java
index 33ce5c9b742..98edb2f29ea 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java
@@ -4,6 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.AnchorElement;
 import com.google.gwt.dom.client.ImageElement;
 import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -42,6 +43,7 @@ public class Header extends Composite {
     @UiField Anchor startPageLink;
     @UiField Anchor eventsPageLink;
     @UiField Anchor solutionsPageLink;
+    @UiField AnchorElement logoAnchor;
 //    @UiField Anchor sponsoringPageLink;
     
     @UiField TextBox searchText;
@@ -104,6 +106,8 @@ public class Header extends Composite {
         
         if (!Branding.getInstance().isActive()) {
             logoImage.getStyle().setDisplay(Display.NONE);
+            solutionsPageLink.getElement().getStyle().setDisplay(Display.NONE);
+            logoAnchor.setHref("");
         }
     }
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml
index 051674dc271..f5c9eba5464 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml
@@ -9,7 +9,7 @@
     <!-- Website header-->
       <div class="{res.mediaCss.grid}">
         <div class="{local_res.css.siteheader_logo} {res.mediaCss.small2} {res.mediaCss.medium2} {res.mediaCss.large3} {res.mediaCss.columns}">
-          <a href="https://www.sap.com/sponsorships">
+          <a ui:field="logoAnchor" href="https://www.sap.com/sponsorships">
             <img ui:field="logoImage" src="images/home/logo-small@2x.png" alt="{i18n.headerLogo}" class="{local_res.css.siteheader_logo_image}"></img>
             <p class="{local_res.css.siteheader_logo_title}">
               <ui:text from='{i18n.headerLogo}' />
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.java
index f056d16fcae..be0a4fc82d3 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.java
@@ -1,5 +1,7 @@
 package com.sap.sailing.gwt.home.desktop.partials.sharing;
 
+import static com.google.gwt.dom.client.Style.Display.NONE;
+
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.AnchorElement;
 import com.google.gwt.http.client.UrlBuilder;
@@ -7,7 +9,9 @@ import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.sap.sse.gwt.shared.Branding;
 
 public class SharingButtons extends Composite {
 
@@ -16,6 +20,7 @@ public class SharingButtons extends Composite {
     interface SharingButtonsUiBinder extends UiBinder<Widget, SharingButtons> {
     }
     
+    @UiField HTMLPanel htmlPanel;
     @UiField AnchorElement mail;
     @UiField AnchorElement twitter;
     @UiField AnchorElement facebook;
@@ -23,9 +28,16 @@ public class SharingButtons extends Composite {
     public SharingButtons() {
         SharingButtonsResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
+        if (!Branding.getInstance().isActive()) {
+            htmlPanel.getElement().getStyle().setDisplay(NONE);
+        } 
     }
     
     public void setUp(SharingMetadataProvider provider) {
+        if (!Branding.getInstance().isActive()) {
+            return;
+        }
+        
         String shortText = provider.getShortText();
         String longText = provider.getLongText(Window.Location.getHref());
         
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.ui.xml
index 0f2a2fd737b..7a3b4ab9fe9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.ui.xml
@@ -3,7 +3,7 @@
 	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
 	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
 	<ui:with field="local_res" type="com.sap.sailing.gwt.home.desktop.partials.sharing.SharingButtonsResources" />
-  	<g:HTMLPanel addStyleNames="{local_res.css.eventheader_sharing}">
+  	<g:HTMLPanel addStyleNames="{local_res.css.eventheader_sharing}" ui:field="htmlPanel">
     	<a ui:field="mail" title="{i18n.sharingMailTooltip}" 
     			class="{local_res.css.eventheader_sharing_item} {local_res.css.eventheader_sharing_itememail}"></a>
     	<a ui:field="twitter" title="{i18n.sharingTwitterTooltip}" target="_blank"
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.java
index 2c7e204aa13..57af27dc975 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.java
@@ -1,20 +1,31 @@
 package com.sap.sailing.gwt.home.desktop.partials.socialfooter;
 
+import static com.google.gwt.dom.client.Style.Display.NONE;
+
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.sap.sse.gwt.shared.Branding;
 
 public class SocialFooter extends Composite {
 
     interface SocialFooterUiBinder extends UiBinder<Widget, SocialFooter> {
     }
-    
+
     private static SocialFooterUiBinder uiBinder = GWT.create(SocialFooterUiBinder.class);
 
+    @UiField
+    HTMLPanel htmlPanel;
+
     public SocialFooter() {
         SocialFooterResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
+        if (!Branding.getInstance().isActive()) {
+            htmlPanel.getElement().getStyle().setDisplay(NONE);
+        }
     }
 
 }
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 ac99eeb5050..b251569e121 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
@@ -6,7 +6,7 @@
     <ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
     <ui:with field="shr" type="com.sap.sailing.gwt.home.shared.resources.SharedHomeResources" />
   <ui:with field="local_res" type="com.sap.sailing.gwt.home.desktop.partials.socialfooter.SocialFooterResources" />
-  <g:HTMLPanel>
+  <g:HTMLPanel ui:field="htmlPanel">
     <!-- The search/social media page footer-->
     <div class="{local_res.css.socialfooter}">
       <div class="{res.mediaCss.grid}">
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.java
index ba417926a98..0b32e293f76 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.java
@@ -33,6 +33,7 @@ public class TabletAndDesktopStartView extends Composite implements StartView {
         mainMedia = new MainMedia(navigator);
         
         initWidget(uiBinder.createAndBindUi(this));
+
     }
     
     @Override
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.ui.xml
index f06fd2efccc..08a3a963c34 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.ui.xml
@@ -7,6 +7,6 @@
         <!-- <s:mainsponsors.MainSponsors ui:field='mainSponsors'/> -->
         <dp:mainevents.MainEvents ui:field='mainEvents'/>
         <dp:mainmedia.MainMedia ui:field='mainMedia'/>
-        <dp:socialfooter.SocialFooter/>
+        <dp:socialfooter.SocialFooter ui:field="socialFooter"/>
     </g:HTMLPanel>
 </ui:UiBinder>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java
index a7f75d1530c..800664e1cb5 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java
@@ -1,7 +1,11 @@
 package com.sap.sailing.gwt.home.mobile.partials.footer;
 
+import static com.google.gwt.dom.client.Style.Display.NONE;
+
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.AnchorElement;
+import com.google.gwt.dom.client.DivElement;
+import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -9,11 +13,15 @@ import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.EventListener;
+import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace;
 import com.sap.sailing.gwt.home.mobile.app.MobilePlacesNavigator;
 import com.sap.sailing.gwt.home.shared.SwitchingEntryPoint;
+import com.sap.sailing.gwt.ui.client.StringMessages;
+import com.sap.sse.gwt.client.controls.languageselect.LanguageSelector;
+import com.sap.sse.gwt.shared.Branding;
 
 /**
  * Mobile page footer with several links and the ability to switch the language.
@@ -23,7 +31,12 @@ public class Footer extends Composite {
 
     interface FooterPanelUiBinder extends UiBinder<Widget, Footer> {
     }
-
+    
+    @UiField Anchor whatsNewLinkUi;
+    @UiField AnchorElement sapJobsAnchor;
+    @UiField AnchorElement feedbackAnchor;
+    @UiField LanguageSelector languageSelector;
+    @UiField DivElement copyrightDiv;
     @UiField AnchorElement imprintAnchorLink;
     @UiField AnchorElement desktopUi;
 
@@ -46,6 +59,15 @@ public class Footer extends Composite {
                 }
             }
         });
+        
+        if (!Branding.getInstance().isActive()) {
+            copyrightDiv.getStyle().setDisplay(NONE);
+            languageSelector.setLabelText(StringMessages.INSTANCE.whitelabelFooterLanguage());
+            sapJobsAnchor.getStyle().setDisplay(Display.NONE);
+            feedbackAnchor.getStyle().setDisplay(Display.NONE);
+            whatsNewLinkUi.getElement().getStyle().setDisplay(Display.NONE);
+            imprintAnchorLink.getStyle().setDisplay(Display.NONE);
+        }
     }
 
     @UiHandler("whatsNewLinkUi")
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml
index 96f591a03ba..68fad31aa2f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml
@@ -9,7 +9,7 @@
         <!-- Footer mobile -->
         <footer class="{local_res.css.sitefooter}">
             <div class="{res.mediaCss.grid}">
-                <l:LanguageSelector labelText="{i18n.footerLanguage}"
+                <l:LanguageSelector  ui:field="languageSelector" labelText="{i18n.footerLanguage}"
                     addStyleNames="{local_res.css.sitefooter_language} {res.mediaCss.small12} {res.mediaCss.columns}"/>
                 <div class="{local_res.css.sitefooter_links} {res.mediaCss.small12} {res.mediaCss.columns}">
                     <a ui:field="imprintAnchorLink"> 
@@ -25,11 +25,11 @@
                         <ui:text from='{i18n.footerPrivacy}' />
                     </a>
                     |
-                    <a href="https://jobs.sap.com" target="_blank">
+                    <a ui:field="sapJobsAnchor" href="https://jobs.sap.com" target="_blank">
 	                   <ui:text from='{i18n.footerJobs}'/>
 	                </a>
                     <br></br>
-                    <a href="mailto:sailing_analytics%40sap.com?subject=[SAP Sailing] Feedback"
+                    <a ui:field="feedbackAnchor" href="mailto:sailing_analytics%40sap.com?subject=[SAP Sailing] Feedback"
                         title="{i18n.footerFeedback}">
                         <ui:text from='{i18n.footerFeedback}' />
                     </a>
@@ -42,7 +42,7 @@
                         <ui:text from='{i18n.whatsNew}' />
                     </g:Anchor>
                 </div>
-                <div class="{res.mediaCss.small12} {res.mediaCss.columns}">
+                <div ui:field="copyrightDiv" class="{res.mediaCss.small12} {res.mediaCss.columns}">
                     <ui:text from='{i18n.footerCopyright}' />
                 </div>
             </div>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java
index ee8980554dd..465669b37f4 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java
@@ -1,8 +1,10 @@
 package com.sap.sailing.gwt.home.mobile.partials.header;
 
 import com.google.gwt.core.client.GWT;
+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.ImageElement;
 import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -22,6 +24,7 @@ import com.sap.sailing.gwt.home.shared.places.solutions.SolutionsPlace.Solutions
 import com.sap.sailing.gwt.home.shared.utils.DropdownHandler;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sse.gwt.client.LinkUtil;
+import com.sap.sse.gwt.shared.Branding;
 import com.sap.sse.security.ui.authentication.AuthenticationContextEvent;
 import com.sap.sse.security.ui.authentication.AuthenticationSignOutRequestEvent;
 
@@ -39,6 +42,8 @@ public class Header extends Composite {
     @UiField FlowPanel dropdownListUi;
     @UiField FlowPanel dropdownListExtUi;
     @UiField Element searchUi;
+    @UiField AnchorElement logoAnchor;
+    @UiField ImageElement logoImage;
 
     @UiField
     DivElement locationTitleUi;
@@ -102,6 +107,11 @@ public class Header extends Composite {
                 signOutNavigationItem.setVisible(event.getCtx().isLoggedIn());
             }
         });
+        
+        if (!Branding.getInstance().isActive()) {
+            logoImage.getStyle().setDisplay(Display.NONE);
+            logoAnchor.setHref("");
+        }
     }
     
     public ResettableNavigationPathDisplay getNavigationPathDisplay() {
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 0b820bf018e..24b87474a0b 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
@@ -18,8 +18,8 @@
     <div class="{res.mediaCss.grid}">
       <header class="{local_res.css.header} {res.mediaCss.small12} {res.mediaCss.columns}">
         <div class="{local_res.css.header_logo}">
-          <a href="https://www.sap.com/sponsorships" title="SAP sponsorships">
-            <img src="images/mobile/logo-small@2x.png" alt="{i18n.headerLogo}" class="{local_res.css.header_logo_image}"></img>
+          <a ui:field="logoAnchor" href="https://www.sap.com/sponsorships" title="SAP sponsorships">
+            <img ui:field="logoImage"  src="images/mobile/logo-small@2x.png" alt="{i18n.headerLogo}" class="{local_res.css.header_logo_image}"></img>
           </a>
         </div>
         <div class="{local_res.css.header_navigation}">
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.java
index cea297bbe0c..fc7ab60b565 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.java
@@ -1,9 +1,13 @@
 package com.sap.sailing.gwt.home.mobile.partials.socialfooter;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.sap.sse.gwt.shared.Branding;
 
 public class SocialFooter extends Composite {
 
@@ -11,10 +15,16 @@ public class SocialFooter extends Composite {
     }
     
     private static SocialFooterUiBinder uiBinder = GWT.create(SocialFooterUiBinder.class);
+    
+    @UiField HTMLPanel htmlPanel;
 
     public SocialFooter() {
         SocialFooterResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
+
+        if (!Branding.getInstance().isActive()) {
+            htmlPanel.getElement().getStyle().setDisplay(Display.NONE);
+        }
     }
 
 }
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 43f11e48734..00c62b1fcf6 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
@@ -6,7 +6,7 @@
     <ui:with field="shr" type="com.sap.sailing.gwt.home.shared.resources.SharedHomeResources" />
 	<ui:with field="local_res"
 		type="com.sap.sailing.gwt.home.mobile.partials.socialfooter.SocialFooterResources" />
-  <g:HTMLPanel>
+  <g:HTMLPanel ui:field="htmlPanel">
     <!-- The search/social media page footer-->
     <div class="{local_res.css.socialfooter}">
       <div class="{res.mediaCss.grid}">
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
index 154539b3844..b0ab53f1747 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
@@ -2358,4 +2358,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
     String setDeviceIdentifier();
     String setPosition();
     String spareMarksAndTheirOptionalDefaultMarkRoles();
+
+    String whitelabelFooterLanguage();
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
index 9c45ab16ccb..276f94ff47c 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
@@ -2360,4 +2360,6 @@ defaultNumberOfLaps=Default # of laps
 invalidImageURL=Image URL is invalid
 setDeviceIdentifier=Set device identifier
 setPosition=Set position
-spareMarksAndTheirOptionalDefaultMarkRoles=Spare marks and their optional default mark roles
\ No newline at end of file
+spareMarksAndTheirOptionalDefaultMarkRoles=Spare marks and their optional default mark roles
+
+whitelabelFooterLanguage=Sailing in
\ No newline at end of file