fix for bug 2170 and added a link from the main sap logo to the startpage

This commit is contained in:
fmittag committed 2014-08-11 16:33:54 +02:00
1 parent 69dadce7a6
commit 621d4fd6e3
5 files changed
+29 -9

No files matched your search

@@ -13,7 +13,6 @@ public interface TextMessages extends Messages {
String contact();
String sponsoring();
String solutions();
String search();
String german();
String english();
String fullEventSchedule();
@@ -23,6 +22,7 @@ public interface TextMessages extends Messages {
String moreInfo();
String viewAnalysis();
String overallLeaderboard();
String pleaseEnterASearchTerm();
String countdownDays();
String countdownHours();
@@ -5,7 +5,6 @@ aboutUs=About us
contact=Contact
sponsoring=Sponsoring
solutions=Solutions
search=Search
german=Deutsch
english=English
fullEventSchedule=Full event schedule
@@ -15,6 +14,7 @@ races=Races
moreInfo=More info
viewAnalysis=View analysis
overallLeaderboard=Overall leaderboard
pleaseEnterASearchTerm=Bitte gebe einen Suchbegriff ein.
countdownDays=Days
countdownHours=Hrs
@@ -101,7 +101,7 @@ headerEvents=Events
headerHome=Home
headerLogo=SAP Sailing Analytics
headerSearch=Search
headerSearchPlaceholder=Search
headerSearchPlaceholder=Search SAPSailing.com
headerSolutions=Solutions
headerSponsoring=Sponsoring
latestRaceResultsHeadline=Latest Official Race Results
@@ -5,7 +5,6 @@ aboutUs=Über uns
contact=Kontakt
sponsoring=Sponsoring
solutions=Lösungen
search=Suche
german=Deutsch
english=English
fullEventSchedule=Gesamter Veranstaltungsplan
@@ -15,6 +14,7 @@ races=Rennen
moreInfo=Weitere Informationen
viewAnalysis=Analyzen ansehen
overallLeaderboard=Gesamtergebnis
pleaseEnterASearchTerm=Please enter a search term.
countdownDays=Tage
countdownHours=Std.
@@ -100,7 +100,7 @@ footerFeedback=Feedback
headerEvents=Veranstaltungen
headerHome=Startseite
headerLogo=SAP Sailing Analytics
headerSearch=Suche
headerSearch=Suche in SAPSailing.com
headerSearchPlaceholder=Suche
headerSolutions=Lösungen
headerSponsoring=Sponsoren
@@ -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.StyleInjector;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.KeyCodes;
@@ -12,6 +13,9 @@ import com.google.gwt.event.dom.client.KeyPressHandler;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
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.Window;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Button;
@@ -19,11 +23,13 @@ import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.gwt.home.client.app.PlaceNavigator;
import com.sap.sailing.gwt.home.client.i18n.TextMessages;
public class Header extends Composite {
@UiField Anchor startPageLink;
@UiField Anchor eventsPageLink;
@UiField Anchor solutionsPageLink;
@UiField AnchorElement homeLink;
// @UiField Anchor sponsoringPageLink;
@UiField TextBox searchText;
@@ -37,7 +43,7 @@ public class Header extends Composite {
private static HeaderUiBinder uiBinder = GWT.create(HeaderUiBinder.class);
public Header(PlaceNavigator navigator) {
public Header(final PlaceNavigator navigator) {
this.navigator = navigator;
HeaderResources.INSTANCE.css().ensureInjected();
@@ -46,7 +52,7 @@ public class Header extends Composite {
initWidget(uiBinder.createAndBindUi(this));
links = Arrays.asList(new Anchor[] { startPageLink, eventsPageLink, solutionsPageLink });
searchText.getElement().setAttribute("placeholder", "Search SAPSailing.com");
searchText.getElement().setAttribute("placeholder", TextMessages.INSTANCE.headerSearchPlaceholder());
searchText.addKeyPressHandler(new KeyPressHandler() {
@Override
public void onKeyPress(KeyPressEvent event) {
@@ -55,6 +61,18 @@ public class Header extends Composite {
}
}
});
Event.sinkEvents(homeLink, Event.ONCLICK);
Event.setEventListener(homeLink, new EventListener() {
@Override
public void onBrowserEvent(Event event) {
switch (DOM.eventGetType(event)) {
case Event.ONCLICK:
navigator.goToHome();
break;
}
}
});
}
@UiHandler("startPageLink")
@@ -83,7 +101,7 @@ public class Header extends Composite {
@UiHandler("searchButton")
void searchButtonClick(ClickEvent event) {
if(searchText.getText().isEmpty()) {
Window.alert("Please enter a search term.");
Window.alert(TextMessages.INSTANCE.pleaseEnterASearchTerm());
} else {
navigator.goToSearchResult(searchText.getText());
}
@@ -9,7 +9,9 @@
<header class="{local_res.css.siteheader}">
<div class="{res.mainCss.grid}">
<div class="{res.mediaCss.small2} {res.mediaCss.large3} {res.mediaCss.columns}">
<g:Image resource="{local_res.logo}" pixelSize="80, 40" altText="SAP Sailing Analytics" styleName="{local_res.css.logo}"/>
<a ui:field="homeLink" href="javascript:;">
<g:Image resource="{local_res.logo}" pixelSize="80, 40" altText="SAP Sailing Analytics" styleName="{local_res.css.logo}"/>
</a>
<p class="{local_res.css.logotitle}">Sailing Analytics</p>
</div>
<div class="{res.mediaCss.small9} {res.mediaCss.medium7} {res.mediaCss.large6} {res.mediaCss.columns}">