eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-12 05:35:31 +00:00
Code Activity

bug 5153

Browse Source 
debranding logic for ui elements
This commit is contained in:
Georg Herdt committed 2020-02-14 16:13:16 +01:00
1 parent ee50849428
commit 2209ceb0f2
19 files changed
+116 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/Home.html
+1 -1
View File
@@ -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 {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java
+22 -1
View File
@@ -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);
}
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml
+5 -5
View File
@@ -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>
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java
+4
View File
@@ -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("");
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml
+1 -1
View File
@@ -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}' />
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.java
+12
View File
@@ -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());
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtons.ui.xml
+1 -1
View File
@@ -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"
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.java
+12 -1
View File
@@ -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);
}
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/socialfooter/SocialFooter.ui.xml
+1 -1
View File
@@ -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}">
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.java
+1
View File
@@ -33,6 +33,7 @@ public class TabletAndDesktopStartView extends Composite implements StartView {
mainMedia = new MainMedia(navigator);
initWidget(uiBinder.createAndBindUi(this));
}
@Override
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/TabletAndDesktopStartView.ui.xml
+1 -1
View File
@@ -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>
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java
+23 -1
View File
@@ -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")
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml
+4 -4
View File
@@ -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>
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java
+10
View File
@@ -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() {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml
+2 -2
View File
@@ -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}">
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.java
+10
View File
@@ -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);
}
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/socialfooter/SocialFooter.ui.xml
+1 -1
View File
@@ -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}">
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
+2
View File
@@ -2358,4 +2358,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
String setDeviceIdentifier();
String setPosition();
String spareMarksAndTheirOptionalDefaultMarkRoles();
String whitelabelFooterLanguage();
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
+3 -1
View File
@@ -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
spareMarksAndTheirOptionalDefaultMarkRoles=Spare marks and their optional default mark roles
whitelabelFooterLanguage=Sailing in