Merge branch 'master' into bug3246

This commit is contained in:
Axel Uhl committed 2016-12-15 14:35:55 +01:00
commit 813ae43c84
5 files changed
+5 -7

No files matched your search

@@ -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="http://sapsponsorships.com">
<a href="https://www.sap.com/sponsorships">
<img 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}' />
@@ -18,7 +18,7 @@
<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="http://sapsponsorships.com" title="SAP sponsorships">
<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>
</div>
@@ -545,9 +545,7 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel
listBoxRegattas.clear();
listBoxRegattas.addItem(stringMessages.all(), "");
for (String regatta : regattaNames) {
listBoxRegattas.addItem(regatta, regatta);
}
regattaNames.stream().sorted().forEach(regatta->listBoxRegattas.addItem(regatta, regatta));
allRaces = newAllRaces;
filterablePanelRaces.updateAll(allRaces);
}
@@ -38,7 +38,7 @@ public class LogoAndTitlePanel extends FlowPanel implements RequiresResize {
lastIsSmallWidth = windowSizeDetector.isSmallWidth();
sapLogo = new Anchor(new SafeHtmlBuilder().appendHtmlConstant(
"<img class=\"linkNoBorder\" src=\"/gwt/images/sap_66_transparent.png\"/>").toSafeHtml());
sapLogo.setHref("http://www.sap.com");
sapLogo.setHref("https://www.sap.com/sponsorships");
sapLogo.addStyleName("sapLogo");
this.add(sapLogo);
renderUI();
@@ -2766,7 +2766,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
sapLogo.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
Window.open("http://www.sap.com", "_blank", null);
Window.open("https://www.sap.com/sponsorships", "_blank", null);
}
});
sapLogo.setStyleName("raceBoard-Logo");