added sponsoring and solutions page... updated header and footer

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/AbstractApplicationClientFactory.java

@@ -12,9 +12,11 @@ import com.sap.sse.gwt.client.mvp.ClientFactoryImpl;
 
 public abstract class AbstractApplicationClientFactory extends ClientFactoryImpl implements ApplicationClientFactory {
     private final SailingServiceAsync sailingService;
+    private final PlaceNavigator navigator;
 
     public AbstractApplicationClientFactory(ApplicationTopLevelView root, EventBus eventBus, PlaceController placeController) {
         super(root, eventBus, placeController);
+        navigator = new PlaceNavigatorImpl(placeController);
         sailingService = GWT.create(SailingService.class);
     }
     
@@ -27,4 +29,9 @@ public abstract class AbstractApplicationClientFactory extends ClientFactoryImpl
     public SailingServiceAsync getSailingService() {
         return sailingService;
     }
+
+    @Override
+    public PlaceNavigator getPlaceNavigator() {
+        return navigator;
+    }
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/ApplicationActivityMapper.java

@@ -11,6 +11,10 @@ import com.sap.sailing.gwt.home.client.place.event.EventActivityProxy;
 import com.sap.sailing.gwt.home.client.place.event.EventPlace;
 import com.sap.sailing.gwt.home.client.place.events.EventsActivityProxy;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
+import com.sap.sailing.gwt.home.client.place.solutions.SolutionsActivityProxy;
+import com.sap.sailing.gwt.home.client.place.solutions.SolutionsPlace;
+import com.sap.sailing.gwt.home.client.place.sponsoring.SponsoringActivityProxy;
+import com.sap.sailing.gwt.home.client.place.sponsoring.SponsoringPlace;
 import com.sap.sailing.gwt.home.client.place.start.StartActivityProxy;
 import com.sap.sailing.gwt.home.client.place.start.StartPlace;
 
@@ -34,6 +38,10 @@ public class ApplicationActivityMapper implements ActivityMapper {
             return new EventsActivityProxy((EventsPlace) place, clientFactory);
         } else if (place instanceof StartPlace) {
             return new StartActivityProxy((StartPlace) place, clientFactory);
+        } else if (place instanceof SponsoringPlace) {
+            return new SponsoringActivityProxy((SponsoringPlace) place, clientFactory);
+        } else if (place instanceof SolutionsPlace) {
+            return new SolutionsActivityProxy((SolutionsPlace) place, clientFactory);
         } else {
             return null;
         }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/ApplicationClientFactory.java

@@ -4,7 +4,11 @@ import com.sap.sailing.gwt.home.client.place.aboutus.AboutUsClientFactory;
 import com.sap.sailing.gwt.home.client.place.contact.ContactClientFactory;
 import com.sap.sailing.gwt.home.client.place.event.EventClientFactory;
 import com.sap.sailing.gwt.home.client.place.events.EventsClientFactory;
+import com.sap.sailing.gwt.home.client.place.solutions.SolutionsClientFactory;
+import com.sap.sailing.gwt.home.client.place.sponsoring.SponsoringClientFactory;
 import com.sap.sailing.gwt.home.client.place.start.StartClientFactory;
 
-public interface ApplicationClientFactory extends AboutUsClientFactory, ContactClientFactory, EventClientFactory, EventsClientFactory, StartClientFactory {
+public interface ApplicationClientFactory extends AboutUsClientFactory, ContactClientFactory, EventClientFactory,
+    EventsClientFactory, StartClientFactory, SponsoringClientFactory, SolutionsClientFactory {
+    PlaceNavigator getPlaceNavigator();
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/PlaceNavigator.java

@@ -1,9 +1,11 @@
-package com.sap.sailing.gwt.home.client.shared.header;
+package com.sap.sailing.gwt.home.client.app;
 
-public interface MainMenuNavigator {
+public interface PlaceNavigator {
     void goToHome();
     void goToEvent(String eventUuidAsString);
     void goToEvents();
     void goToAboutUs();
     void goToContact();
+    void goToSolutions();
+    void goToSponsoring();
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/PlaceNavigatorImpl.java

@@ -5,13 +5,14 @@ import com.sap.sailing.gwt.home.client.place.aboutus.AboutUsPlace;
 import com.sap.sailing.gwt.home.client.place.contact.ContactPlace;
 import com.sap.sailing.gwt.home.client.place.event.EventPlace;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
+import com.sap.sailing.gwt.home.client.place.solutions.SolutionsPlace;
+import com.sap.sailing.gwt.home.client.place.sponsoring.SponsoringPlace;
 import com.sap.sailing.gwt.home.client.place.start.StartPlace;
-import com.sap.sailing.gwt.home.client.shared.header.MainMenuNavigator;
 
-public class MainMenuNavigatorImpl implements MainMenuNavigator {
+public class PlaceNavigatorImpl implements PlaceNavigator {
     private final PlaceController placeController;
     
-    protected MainMenuNavigatorImpl(PlaceController placeController) {
+    protected PlaceNavigatorImpl(PlaceController placeController) {
         super();
         this.placeController = placeController;
     }
@@ -41,4 +42,14 @@ public class MainMenuNavigatorImpl implements MainMenuNavigator {
         placeController.goTo(new ContactPlace());
     }
 
+    @Override
+    public void goToSolutions() {
+        placeController.goTo(new SolutionsPlace());
+    }
+
+    @Override
+    public void goToSponsoring() {
+        placeController.goTo(new SponsoringPlace());
+    }
+
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/SmartphoneApplicationClientFactory.java

@@ -6,6 +6,10 @@ import com.google.web.bindery.event.shared.EventBus;
 import com.sap.sailing.gwt.home.client.place.event.EventView;
 import com.sap.sailing.gwt.home.client.place.events.EventsActivity;
 import com.sap.sailing.gwt.home.client.place.events.EventsView;
+import com.sap.sailing.gwt.home.client.place.solutions.SolutionsActivity;
+import com.sap.sailing.gwt.home.client.place.solutions.TabletAndDesktopSolutionsView;
+import com.sap.sailing.gwt.home.client.place.sponsoring.SponsoringActivity;
+import com.sap.sailing.gwt.home.client.place.sponsoring.TabletAndDesktopSponsoringView;
 import com.sap.sailing.gwt.home.client.place.start.SmartphoneStartView;
 import com.sap.sailing.gwt.home.client.place.start.StartView;
 import com.sap.sailing.gwt.ui.shared.EventDTO;
@@ -21,7 +25,7 @@ public class SmartphoneApplicationClientFactory extends AbstractApplicationClien
     }
 
     private SmartphoneApplicationClientFactory(EventBus eventBus, PlaceController placeController) {
-        super(new SmartphoneApplicationView(new MainMenuNavigatorImpl(placeController)), eventBus, placeController);
+        super(new SmartphoneApplicationView(new PlaceNavigatorImpl(placeController)), eventBus, placeController);
     }
 
     @Override
@@ -38,6 +42,18 @@ public class SmartphoneApplicationClientFactory extends AbstractApplicationClien
 
     @Override
     public StartView createStartView() {
-        return new SmartphoneStartView();
+        return new SmartphoneStartView(getPlaceNavigator());
+    }
+
+    @Override
+    public TabletAndDesktopSponsoringView createSponsoringView(SponsoringActivity activity) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TabletAndDesktopSolutionsView createSolutionsView(SolutionsActivity activity) {
+        // TODO Auto-generated method stub
+        return null;
     }
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/SmartphoneApplicationView.java

@@ -11,7 +11,6 @@ import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.home.client.shared.footer.Footer;
 import com.sap.sailing.gwt.home.client.shared.header.Header;
-import com.sap.sailing.gwt.home.client.shared.header.MainMenuNavigator;
 
 /**
  * This is the top-level view of the application. Every time another presenter wants to reveal itself,
@@ -35,7 +34,7 @@ public class SmartphoneApplicationView extends Composite implements ApplicationT
     @UiField
     Element loadingMessage;
 
-    public SmartphoneApplicationView(MainMenuNavigator navigator) {
+    public SmartphoneApplicationView(PlaceNavigator navigator) {
         initWidget(uiBinder.createAndBindUi(this));
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/TabletAndDesktopApplicationClientFactory.java

@@ -8,6 +8,10 @@ import com.sap.sailing.gwt.home.client.place.event.TabletAndDesktopEventView;
 import com.sap.sailing.gwt.home.client.place.events.EventsActivity;
 import com.sap.sailing.gwt.home.client.place.events.EventsView;
 import com.sap.sailing.gwt.home.client.place.events.TabletAndDesktopEventsView;
+import com.sap.sailing.gwt.home.client.place.solutions.SolutionsActivity;
+import com.sap.sailing.gwt.home.client.place.solutions.TabletAndDesktopSolutionsView;
+import com.sap.sailing.gwt.home.client.place.sponsoring.SponsoringActivity;
+import com.sap.sailing.gwt.home.client.place.sponsoring.TabletAndDesktopSponsoringView;
 import com.sap.sailing.gwt.home.client.place.start.StartView;
 import com.sap.sailing.gwt.home.client.place.start.TabletAndDesktopStartView;
 import com.sap.sailing.gwt.ui.shared.EventDTO;
@@ -23,7 +27,7 @@ public class TabletAndDesktopApplicationClientFactory extends AbstractApplicatio
     }
 
     private TabletAndDesktopApplicationClientFactory(EventBus eventBus, PlaceController placeController) {
-        super(new TabletAndDesktopApplicationView(new MainMenuNavigatorImpl(placeController)), eventBus, placeController);
+        super(new TabletAndDesktopApplicationView(new PlaceNavigatorImpl(placeController)), eventBus, placeController);
     }
 
     @Override
@@ -38,6 +42,17 @@ public class TabletAndDesktopApplicationClientFactory extends AbstractApplicatio
 
     @Override
     public StartView createStartView() {
-        return new TabletAndDesktopStartView(getPlaceController());
+        return new TabletAndDesktopStartView(getPlaceNavigator());
+    }
+
+    @Override
+    public TabletAndDesktopSponsoringView createSponsoringView(SponsoringActivity activity) {
+        return new TabletAndDesktopSponsoringView();
+    }
+
+    @Override
+    public TabletAndDesktopSolutionsView createSolutionsView(SolutionsActivity activity) {
+        // TODO Auto-generated method stub
+        return null;
     }
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/TabletAndDesktopApplicationView.java

@@ -11,7 +11,6 @@ import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.home.client.shared.footer.Footer;
 import com.sap.sailing.gwt.home.client.shared.header.Header;
-import com.sap.sailing.gwt.home.client.shared.header.MainMenuNavigator;
 
 /**
  * This is the top-level view of the application. Every time another presenter wants to reveal itself,
@@ -35,7 +34,7 @@ public class TabletAndDesktopApplicationView extends Composite implements Applic
     @UiField
     Element loadingMessage;
 
-    public TabletAndDesktopApplicationView(MainMenuNavigator navigator) {
+    public TabletAndDesktopApplicationView(PlaceNavigator navigator) {
         headerPanel = new Header(navigator);
         initWidget(uiBinder.createAndBindUi(this));
     }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/i18n/TextMessages.java

@@ -12,7 +12,11 @@ public interface TextMessages extends Messages {
     String aboutUs();
 
     String contact();
-    
+
+    String sponsoring();
+
+    String solutions();
+
     String search();
 
     String german();

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/i18n/TextMessages.properties

@@ -3,6 +3,8 @@ events=Events
 home=Home
 aboutUs=About us
 contact=Contact
+sponsoring=Sponsoring
+solutions=Solutions
 search=Search
 german=Deutsch
 english=English

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/i18n/TextMessages_de.properties

@@ -3,6 +3,8 @@ events=Veranstaltungen
 home=Startseite
 aboutUs=Über uns
 contact=Kontakt
+sponsoring=Sponsoring
+solutions=Lösungen
 search=Suche
 german=Deutsch
 english=English

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/solutions/SolutionsActivity.java

@@ -0,0 +1,17 @@
+package com.sap.sailing.gwt.home.client.place.solutions;
+
+import com.google.gwt.activity.shared.AbstractActivity;
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+
+public class SolutionsActivity extends AbstractActivity {
+
+    public SolutionsActivity(SolutionsPlace place, SolutionsClientFactory clientFactory) {
+    }
+
+    @Override
+    public void start(AcceptsOneWidget panel, EventBus eventBus) {
+        panel.setWidget(new TabletAndDesktopSolutionsView());
+    }
+
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/solutions/SolutionsActivityProxy.java

@@ -0,0 +1,25 @@
+package com.sap.sailing.gwt.home.client.place.solutions;
+
+import com.google.gwt.core.client.GWT;
+import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
+
+public class SolutionsActivityProxy extends AbstractActivityProxy {
+
+    private final SolutionsClientFactory clientFactory;
+    private final SolutionsPlace place;
+
+    public SolutionsActivityProxy(SolutionsPlace place, SolutionsClientFactory clientFactory) {
+        this.place = place;
+        this.clientFactory = clientFactory;
+    }
+
+    @Override
+    protected void startAsync() {
+        GWT.runAsync(new AbstractRunAsyncCallback() {
+            @Override
+            public void onSuccess() {
+                super.onSuccess(new SolutionsActivity(place, clientFactory));
+            }
+        });
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/solutions/SolutionsClientFactory.java

@@ -0,0 +1,7 @@
+package com.sap.sailing.gwt.home.client.place.solutions;
+
+import com.sap.sailing.gwt.ui.client.SailingClientFactory;
+
+public interface SolutionsClientFactory extends SailingClientFactory {
+    TabletAndDesktopSolutionsView createSolutionsView(SolutionsActivity activity);
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/solutions/SolutionsPlace.java

@@ -0,0 +1,18 @@
+package com.sap.sailing.gwt.home.client.place.solutions;
+
+import com.google.gwt.place.shared.Place;
+import com.google.gwt.place.shared.PlaceTokenizer;
+
+public class SolutionsPlace extends Place {
+    public static class Tokenizer implements PlaceTokenizer<SolutionsPlace> {
+        @Override
+        public String getToken(SolutionsPlace place) {
+            return null;
+        }
+
+        @Override
+        public SolutionsPlace getPlace(String token) {
+            return new SolutionsPlace();
+        }
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/solutions/SolutionsView.java

@@ -0,0 +1,7 @@
+package com.sap.sailing.gwt.home.client.place.solutions;
+
+import com.google.gwt.user.client.ui.Widget;
+
+public interface SolutionsView {
+    Widget asWidget();
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/solutions/TabletAndDesktopSolutionsView.java

@@ -0,0 +1,18 @@
+package com.sap.sailing.gwt.home.client.place.solutions;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Widget;
+
+public class TabletAndDesktopSolutionsView extends Composite implements SolutionsView {
+    private static SolutionsPageViewUiBinder uiBinder = GWT.create(SolutionsPageViewUiBinder.class);
+
+    interface SolutionsPageViewUiBinder extends UiBinder<Widget, TabletAndDesktopSolutionsView> {
+    }
+
+    public TabletAndDesktopSolutionsView() {
+        super();
+        initWidget(uiBinder.createAndBindUi(this));
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/solutions/TabletAndDesktopSolutionsView.ui.xml

@@ -0,0 +1,17 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" 
+	xmlns:g="urn:import:com.google.gwt.user.client.ui">
+    <ui:style>
+		.panel {
+			width: 100%;
+			background-color: rgb(255,255,255);
+			border: solid 1px black;
+		}
+    </ui:style>
+ 
+	<g:VerticalPanel styleName="{style.panel}">
+    	<g:HTML>
+    		solutions content
+    	</g:HTML>
+    </g:VerticalPanel> 
+</ui:UiBinder>    

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/sponsoring/SponsoringActivity.java

@@ -0,0 +1,17 @@
+package com.sap.sailing.gwt.home.client.place.sponsoring;
+
+import com.google.gwt.activity.shared.AbstractActivity;
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+
+public class SponsoringActivity extends AbstractActivity {
+
+    public SponsoringActivity(SponsoringPlace place, SponsoringClientFactory clientFactory) {
+    }
+
+    @Override
+    public void start(AcceptsOneWidget panel, EventBus eventBus) {
+        panel.setWidget(new TabletAndDesktopSponsoringView());
+    }
+
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/sponsoring/SponsoringActivityProxy.java

@@ -0,0 +1,25 @@
+package com.sap.sailing.gwt.home.client.place.sponsoring;
+
+import com.google.gwt.core.client.GWT;
+import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;
+
+public class SponsoringActivityProxy extends AbstractActivityProxy {
+
+    private final SponsoringClientFactory clientFactory;
+    private final SponsoringPlace place;
+
+    public SponsoringActivityProxy(SponsoringPlace place, SponsoringClientFactory clientFactory) {
+        this.place = place;
+        this.clientFactory = clientFactory;
+    }
+
+    @Override
+    protected void startAsync() {
+        GWT.runAsync(new AbstractRunAsyncCallback() {
+            @Override
+            public void onSuccess() {
+                super.onSuccess(new SponsoringActivity(place, clientFactory));
+            }
+        });
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/sponsoring/SponsoringClientFactory.java

@@ -0,0 +1,7 @@
+package com.sap.sailing.gwt.home.client.place.sponsoring;
+
+import com.sap.sailing.gwt.ui.client.SailingClientFactory;
+
+public interface SponsoringClientFactory extends SailingClientFactory {
+    TabletAndDesktopSponsoringView createSponsoringView(SponsoringActivity activity);
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/sponsoring/SponsoringPlace.java

@@ -0,0 +1,18 @@
+package com.sap.sailing.gwt.home.client.place.sponsoring;
+
+import com.google.gwt.place.shared.Place;
+import com.google.gwt.place.shared.PlaceTokenizer;
+
+public class SponsoringPlace extends Place {
+    public static class Tokenizer implements PlaceTokenizer<SponsoringPlace> {
+        @Override
+        public String getToken(SponsoringPlace place) {
+            return null;
+        }
+
+        @Override
+        public SponsoringPlace getPlace(String token) {
+            return new SponsoringPlace();
+        }
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/sponsoring/SponsoringView.java

@@ -0,0 +1,7 @@
+package com.sap.sailing.gwt.home.client.place.sponsoring;
+
+import com.google.gwt.user.client.ui.Widget;
+
+public interface SponsoringView {
+    Widget asWidget();
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/sponsoring/TabletAndDesktopSponsoringView.java

@@ -0,0 +1,18 @@
+package com.sap.sailing.gwt.home.client.place.sponsoring;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Widget;
+
+public class TabletAndDesktopSponsoringView extends Composite implements SponsoringView {
+    private static SponsoringPageViewUiBinder uiBinder = GWT.create(SponsoringPageViewUiBinder.class);
+
+    interface SponsoringPageViewUiBinder extends UiBinder<Widget, TabletAndDesktopSponsoringView> {
+    }
+
+    public TabletAndDesktopSponsoringView() {
+        super();
+        initWidget(uiBinder.createAndBindUi(this));
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/sponsoring/TabletAndDesktopSponsoringView.ui.xml

@@ -0,0 +1,17 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" 
+	xmlns:g="urn:import:com.google.gwt.user.client.ui">
+    <ui:style>
+		.panel {
+			width: 100%;
+			background-color: rgb(255,255,255);
+			border: solid 1px black;
+		}
+    </ui:style>
+ 
+	<g:VerticalPanel styleName="{style.panel}">
+    	<g:HTML>
+    		Sponsoring content
+    	</g:HTML>
+    </g:VerticalPanel> 
+</ui:UiBinder>    

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/start/SmartphoneStartView.java

@@ -7,6 +7,7 @@ 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.Widget;
+import com.sap.sailing.gwt.home.client.app.PlaceNavigator;
 import com.sap.sailing.gwt.home.client.shared.mainevents.MainEvents;
 import com.sap.sailing.gwt.home.client.shared.mainmedia.MainMedia;
 import com.sap.sailing.gwt.home.client.shared.mainsponsors.MainSponsors;
@@ -21,14 +22,14 @@ public class SmartphoneStartView extends Composite implements StartView {
     }
 
     @UiField Stage stage;
-    @UiField MainSponsors mainSponsors;
-    @UiField MainEvents mainEvents;
+    @UiField(provided=true) MainSponsors mainSponsors;
+    @UiField(provided=true)  MainEvents mainEvents;
     @UiField MainMedia mainMedia;
     @UiField SocialFooter socialFooter;
 
-    public SmartphoneStartView() {
-        super();
-
+    public SmartphoneStartView(PlaceNavigator navigator) {
+        mainSponsors = new MainSponsors(navigator);
+        mainEvents = new MainEvents(navigator);
         initWidget(uiBinder.createAndBindUi(this));
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/start/TabletAndDesktopStartView.java

@@ -3,11 +3,11 @@ package com.sap.sailing.gwt.home.client.place.start;
 import java.util.List;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.place.shared.PlaceController;
 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.Widget;
+import com.sap.sailing.gwt.home.client.app.PlaceNavigator;
 import com.sap.sailing.gwt.home.client.shared.mainevents.MainEvents;
 import com.sap.sailing.gwt.home.client.shared.mainmedia.MainMedia;
 import com.sap.sailing.gwt.home.client.shared.mainsponsors.MainSponsors;
@@ -22,14 +22,14 @@ public class TabletAndDesktopStartView extends Composite implements StartView {
     }
 
     @UiField Stage stage;
-    @UiField MainSponsors mainSponsors;
-    
+    @UiField(provided=true) MainSponsors mainSponsors;
     @UiField(provided=true) MainEvents mainEvents;
     @UiField MainMedia mainMedia;
     @UiField SocialFooter socialFooter;
 
-    public TabletAndDesktopStartView(PlaceController placeController) {
-        mainEvents = new MainEvents(placeController);
+    public TabletAndDesktopStartView(PlaceNavigator navigator) {
+        mainSponsors = new MainSponsors(navigator);
+        mainEvents = new MainEvents(navigator);
         initWidget(uiBinder.createAndBindUi(this));
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.css

@@ -13,9 +13,11 @@
 }
 .sitefooter_copyright {
   font-weight: 600;
+  float: left;
+  margin-right: 1.875em;
 }
 .sitefooter_links {
-  text-align: right;
+  text-align: left;
   font-size: 0.9375em;
   font-weight: 600;
   text-transform: uppercase;
@@ -24,8 +26,17 @@
   display: inline-block;
   color: #fff;
   text-decoration: none;
-  margin-right: 3.75em;
+  margin-right: 1.875em;
 }
 .sitefooter_links_link:last-child {
   margin-right: 0;
 }
+.sitefooter_language {
+  text-align: right;
+}
+.sitefooter_language_link {
+  color: #f0ab00;
+  display: inline-block;
+  cursor: pointer;
+  margin-left: 0.625em;
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.ui.xml

@@ -9,9 +9,11 @@
 <!-- Website footer-->
 <footer class="{local_res.css.sitefooter}">
   <div class="{res.mainCss.grid}">
-    <div class="{res.mediaCss.small6} {res.mediaCss.columns} {local_res.css.sitefooter_copyright}">© 2014&nbsp;&nbsp;&nbsp;SAP Sailing Analytics</div>
-    <div class="{res.mediaCss.small6} {res.mediaCss.columns} {local_res.css.sitefooter_links}"><a href="" class="{local_res.css.sitefooter_links_link}">Legal Disclosure</a><a href="" class="{local_res.css.sitefooter_links_link}">Privacy</a></div>
+    <div class="{res.mediaCss.small8} {res.mediaCss.columns}">
+      <div class="{local_res.css.sitefooter_copyright}">© 2014&nbsp;&nbsp;&nbsp;SAP Sailing Analytics</div>
+      <div class="{local_res.css.sitefooter_links}"><a href="" class="{local_res.css.sitefooter_links_link}">Legal Disclosure</a><a href="" class="{local_res.css.sitefooter_links_link}">Privacy</a></div>
+    </div>
+    <div class="{res.mediaCss.small4} {res.mediaCss.columns} {local_res.css.sitefooter_language}">SAP Sailing offered in:<a class="{local_res.css.sitefooter_language_link}">Deutsch</a></div>
   </div>
-</footer>
-    </g:HTMLPanel>
+</footer>    </g:HTMLPanel>
 </ui:UiBinder>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/FooterResources.java

@@ -15,5 +15,7 @@ public interface FooterResources extends ClientBundle {
         String sitefooter_copyright();
         String sitefooter_links();
         String sitefooter_links_link();
+        String sitefooter_language();
+        String sitefooter_language_link();
     }
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.css

@@ -13,6 +13,8 @@
 .logo {
   margin: 0.625em 0;
   float: left;
+  width: 210px;
+  height: 40px;
 }
 .sitenavigation {
   float: right;
@@ -25,16 +27,24 @@
   text-transform: uppercase;
   padding: 0 2.1875em;
 }
-.sitenavigation_link:hover {
-  background-color: rgba(246,249,252,0.1);
+.sitenavigation_link:hover,
+.sitenavigation_link:focus {
   text-decoration: none;
 }
-.sitenavigation_linksearch img {
-  vertical-align: middle;
+.sitenavigation_linkactive,
+.sitenavigation_link:hover,
+.sitenavigation_link:focus {
+  color: #f0ab00;
 }
-.sitenavigation_active {
-  background: #f0ab00;
+.search_textfield {
+  background: #222;
+  border: 1px solid #666;
+  padding: 0.9375em 2.8125em 0.9375em 0.9375em;
+  color: #fff;
+  width: 14.375em;
 }
-.sitenavigation_active:hover {
-  background-color: rgba(240,171,0,0.9);
+.search_button {
+  position: absolute;
+  margin-left: -2em;
+  margin-top: 1.1875em;
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.java

@@ -11,34 +11,28 @@ import com.google.gwt.uibinder.client.UiHandler;
 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.client.app.PlaceNavigator;
 
 public class Header extends Composite {
-    @UiField
-    Anchor startPageLink;
-
-    @UiField
-    Anchor eventsPageLink;
-
-    @UiField
-    Anchor aboutUsPageLink;
-
-    @UiField
-    Anchor contactPageLink;
+    @UiField Anchor startPageLink;
+    @UiField Anchor eventsPageLink;
+    @UiField Anchor solutionsPageLink;
+    @UiField Anchor sponsoringPageLink;
 
     private final List<Anchor> links;
 
-    private final MainMenuNavigator navigator;
+    private final PlaceNavigator navigator;
 
     interface HeaderUiBinder extends UiBinder<Widget, Header> {
     }
     
     private static HeaderUiBinder uiBinder = GWT.create(HeaderUiBinder.class);
 
-    public Header(MainMenuNavigator navigator) {
+    public Header(PlaceNavigator navigator) {
         this.navigator = navigator;
         HeaderResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
-        links = Arrays.asList(new Anchor[] { startPageLink, eventsPageLink, aboutUsPageLink, contactPageLink });
+        links = Arrays.asList(new Anchor[] { startPageLink, eventsPageLink, solutionsPageLink, sponsoringPageLink });
     }
 
     @UiHandler("startPageLink")
@@ -52,18 +46,18 @@ public class Header extends Composite {
         navigator.goToEvents();
     }
 
-    @UiHandler("aboutUsPageLink")
-    public void goToAboutUs(ClickEvent e) {
-        navigator.goToAboutUs();
+    @UiHandler("solutionsPageLink")
+    public void goToSolutions(ClickEvent e) {
+        navigator.goToSolutions();
     }
 
-    @UiHandler("contactPageLink")
-    public void goToContact(ClickEvent e) {
-        navigator.goToContact();
+    @UiHandler("sponsoringPageLink")
+    public void goToSponsoring(ClickEvent e) {
+        navigator.goToSponsoring();
     }
 
     private void setActiveLink(Anchor link) {
-        final String activeStyle = HeaderResources.INSTANCE.css().sitenavigation_active();
+        final String activeStyle = HeaderResources.INSTANCE.css().sitenavigation_linkactive();
         for (Anchor l : links) {
             if (l == link) {
                 l.addStyleName(activeStyle);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.ui.xml

@@ -5,9 +5,8 @@
     <ui:with field="i18n" type="com.sap.sailing.gwt.home.client.i18n.TextMessages"/>
     <ui:with field="res" type="com.sap.sailing.gwt.home.client.HomeResources" />
     <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.shared.header.HeaderResources" />
-<!-- Website header-->
 	<g:HTMLPanel>
-		<header class="{local_res.css.siteheader}">
+   		<header class="{local_res.css.siteheader}">
 			<div class="{res.mainCss.grid}">
 				<div class="{res.mediaCss.small4} {res.mediaCss.columns}">
 					<g:Image resource="{local_res.logo}" altText="SAP Sailing Analytics" styleName="{local_res.css.logo}"/>
@@ -18,12 +17,12 @@
 							styleName="{local_res.css.sitenavigation_link}" text="{i18n.home}" href="javascript:;"/>
 						<g:Anchor ui:field="eventsPageLink"
 							styleName="{local_res.css.sitenavigation_link}" text="{i18n.events}" href="javascript:;"/>
-						<g:Anchor ui:field="aboutUsPageLink"
-							styleName="{local_res.css.sitenavigation_link}" text="{i18n.aboutUs}" href="javascript:;"/>
-						<g:Anchor ui:field="contactPageLink"
-							styleName="{local_res.css.sitenavigation_link} {local_res.css.sitenavigation_linksearch}" text="{i18n.search}" href="javascript:;">
-							<img src="images/search-icon.png" alt="Search" />
+						<g:Anchor ui:field="solutionsPageLink"
+							styleName="{local_res.css.sitenavigation_link}" text="{i18n.solutions}" href="javascript:;"/>
+						<g:Anchor ui:field="sponsoringPageLink"
+							styleName="{local_res.css.sitenavigation_link}" text="{i18n.sponsoring}" href="javascript:;">
 						</g:Anchor>
+						<img src="images/search-icon.png" alt="Search" />
 					</nav>
 				</div>
 			</div>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/HeaderResources.java

@@ -15,12 +15,13 @@ public interface HeaderResources extends ClientBundle {
         String siteheader();
         String logo();
         String sitenavigation();
-        String sitenavigation_active();
         String sitenavigation_link();
-        String sitenavigation_linksearch();
+        String sitenavigation_linkactive();
+        String search_textfield();
+        String search_button();
     }
     
-    @Source("com/sap/sailing/gwt/home/images/logo.png")
+    @Source("com/sap/sailing/gwt/home/images/logo@2x.png")
     ImageResource logo();
 
     @Source("com/sap/sailing/gwt/home/images/search-icon.png")

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/mainevents/MainEvents.java

@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.place.shared.PlaceController;
 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.Widget;
+import com.sap.sailing.gwt.home.client.app.PlaceNavigator;
 import com.sap.sailing.gwt.ui.shared.EventDTO;
 
 public class MainEvents extends Composite {
@@ -24,10 +24,10 @@ public class MainEvents extends Composite {
     
     private static MainEventsUiBinder uiBinder = GWT.create(MainEventsUiBinder.class);
 
-    public MainEvents(PlaceController placeController) {
-        event1 = new RecentEvent(placeController);
-        event2 = new RecentEvent(placeController);
-        event3 = new RecentEvent(placeController);
+    public MainEvents(PlaceNavigator navigator) {
+        event1 = new RecentEvent(navigator);
+        event2 = new RecentEvent(navigator);
+        event3 = new RecentEvent(navigator);
         MainEventsResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
         

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/mainevents/RecentEvent.java

@@ -4,7 +4,6 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.ImageElement;
 import com.google.gwt.dom.client.SpanElement;
 import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.place.shared.PlaceController;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
@@ -12,6 +11,7 @@ import com.google.gwt.user.client.Window;
 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.client.app.PlaceNavigator;
 import com.sap.sailing.gwt.home.client.place.event.EventPlace;
 import com.sap.sailing.gwt.home.client.place.event.EventPlace.Tokenizer;
 import com.sap.sailing.gwt.home.client.shared.EventDatesFormatterUtil;
@@ -34,10 +34,10 @@ public class RecentEvent extends Composite {
     
     private static RecentEventUiBinder uiBinder = GWT.create(RecentEventUiBinder.class);
 
-    private final PlaceController placeController;
+    private final PlaceNavigator navigator;
     
-    public RecentEvent(PlaceController placeController) {
-        this.placeController = placeController;
+    public RecentEvent(PlaceNavigator navigator) {
+        this.navigator = navigator;
         RecentEventResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
     }
@@ -49,10 +49,10 @@ public class RecentEvent extends Composite {
 
     @UiHandler("eventOverviewLink")
     public void goToHome(ClickEvent e) {
-        EventPlace eventPlace = new EventPlace(event.id.toString());
         if(event.getBaseURL().contains("localhost") || event.getBaseURL().contains("127.0.0.1")) {
-            placeController.goTo(eventPlace);
+            navigator.goToEvent(event.id.toString());
         } else {
+            EventPlace eventPlace = new EventPlace(event.id.toString());
             EventPlace.Tokenizer t = new Tokenizer();
             String remoteEventUrl = event.getBaseURL() + "/gwt/Home.html#" + EventPlace.class.getSimpleName() + ":" + t.getToken(eventPlace);
             Window.Location.replace(remoteEventUrl);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/mainsponsors/MainSponsors.java

@@ -1,9 +1,14 @@
 package com.sap.sailing.gwt.home.client.shared.mainsponsors;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
 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.ui.Anchor;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.gwt.home.client.app.PlaceNavigator;
 
 public class MainSponsors extends Composite {
 
@@ -12,9 +17,26 @@ public class MainSponsors extends Composite {
     
     private static MainSponsorsUiBinder uiBinder = GWT.create(MainSponsorsUiBinder.class);
 
-    public MainSponsors() {
+    @UiField Anchor solutionsPageLink;
+    @UiField Anchor sponsoringPageLink;
+    
+    private final PlaceNavigator navigator;
+    
+    public MainSponsors(PlaceNavigator navigator) {
+        this.navigator = navigator;
+        
         MainSponsorsResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
     }
 
+    @UiHandler("solutionsPageLink")
+    public void goToSolutions(ClickEvent e) {
+        navigator.goToSolutions();
+    }
+
+    @UiHandler("sponsoringPageLink")
+    public void goToSponsoring(ClickEvent e) {
+        navigator.goToSponsoring();
+    }
+
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/mainsponsors/MainSponsors.ui.xml

@@ -11,14 +11,14 @@
   <div class="{res.mainCss.grid}">
     <div class="{res.mediaCss.small6} {res.mediaCss.columns}">
       <h3>Solutions</h3>
-      <figure><g:Image resource="{local_res.solutionTeaserImage}" altText="Solution" />
-        <figcaption>Here goes the solution description short text <a href="#">Read more</a></figcaption>
+      <figure><g:Image resource="{local_res.solutionTeaserImage}" altText="Solutions" />
+        <figcaption>Here goes the solution description short text <g:Anchor ui:field="solutionsPageLink" text="Read more..." href="javascript:;" /></figcaption>
       </figure>
     </div>
     <div class="{res.mediaCss.small6} {res.mediaCss.columns}">
       <h3>Sponsored Teams</h3>
-      <figure><g:Image resource="{local_res.sponsorTeaserImage}" altText="Sponsor" />
-        <figcaption>Here goes the solution description short text <a href="#">Read more</a></figcaption>
+      <figure><g:Image resource="{local_res.sponsorTeaserImage}" altText="Sponsoring" />
+        <figcaption>Here goes the solution description short text <g:Anchor ui:field="sponsoringPageLink" text="Read more..." href="javascript:;" /></figcaption>
       </figure>
     </div>
   </div>