From c7d05db4e070fbb7bbe88df21c2a733d85a580a7 Mon Sep 17 00:00:00 2001 From: Vladislav Chumak Date: Mon, 26 Sep 2016 18:52:16 +0200 Subject: [PATCH] bug3870 Refactored recent changes --- .../client/place/start/DesktopStartView.java | 7 +- .../shared/header/SAPHeaderComponent.java | 6 +- .../SAPSailingHeaderWithAuthentication.java | 20 +++ .../client/RegattaOverviewEntryPoint.java | 7 +- .../adminconsole/AdminConsoleEntryPoint.java | 5 +- .../leaderboardedit/LeaderboardEditPage.java | 142 +++++++++--------- .../gwt/ui/simulator/SimulatorEntryPoint.java | 5 +- .../sse/gwt/client/sapheader/SAPHeader.gss | 18 ++- .../sse/gwt/client/sapheader/SAPHeader.java | 14 +- .../sse/gwt/client/sapheader/SAPHeader.ui.xml | 10 +- .../client/sapheader/SAPHeaderResources.java | 1 - .../SAPHeaderWithAuthentication.java | 116 +++++++------- 12 files changed, 182 insertions(+), 169 deletions(-) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/authentication/SAPSailingHeaderWithAuthentication.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java index 6df38e1b7ed..bb42e9bafcb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java @@ -28,6 +28,7 @@ import com.sap.sailing.gwt.autoplay.client.place.player.AutoPlayerConfiguration; import com.sap.sailing.gwt.autoplay.client.shared.leaderboard.LeaderboardWithHeaderPerspectiveLifecycle; import com.sap.sailing.gwt.autoplay.client.shared.leaderboard.LeaderboardWithHeaderPerspectiveSettings; import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; +import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication; import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.raceboard.RaceBoardPerspectiveLifecycle; @@ -44,7 +45,6 @@ import com.sap.sse.gwt.client.shared.perspective.PerspectiveCompositeLifecycleTa import com.sap.sse.gwt.client.shared.perspective.PerspectiveCompositeSettings; import com.sap.sse.gwt.client.shared.perspective.PerspectiveLifecycle; import com.sap.sse.gwt.client.shared.perspective.PerspectiveLifecycleWithAllSettings; -import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication; import com.sap.sse.security.ui.client.UserService; public class DesktopStartView extends Composite implements StartView { @@ -53,7 +53,7 @@ public class DesktopStartView extends Composite implements StartView { interface StartPageViewUiBinder extends UiBinder { } - @UiField(provided=true) SAPHeaderWithAuthentication sapHeader; + @UiField(provided=true) SAPSailingHeaderWithAuthentication sapHeader; @UiField(provided=true) ListBox localeSelectionBox; @UiField(provided=true) ListBox eventSelectionBox; @UiField(provided=true) ListBox leaderboardSelectionBox; @@ -82,8 +82,7 @@ public class DesktopStartView extends Composite implements StartView { this.eventBus = eventBus; this.events = new ArrayList(); - sapHeader = new SAPHeaderWithAuthentication(StringMessages.INSTANCE.sapSailingAnalytics(), - StringMessages.INSTANCE.autoplayConfiguration()); + sapHeader = new SAPSailingHeaderWithAuthentication(StringMessages.INSTANCE.autoplayConfiguration()); new FixedSailingAuthentication(userService, sapHeader.getAuthenticationMenuView()); eventSelectionBox = new ListBox(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderComponent.java index d8df0b472aa..cb71942d676 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderComponent.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderComponent.java @@ -4,23 +4,23 @@ import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.RepeatingCommand; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; +import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication; import com.sap.sailing.gwt.common.client.FullscreenUtil; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.gwt.client.shared.components.AbstractCompositeComponent; -import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication; import com.sap.sse.security.ui.client.UserService; public class SAPHeaderComponent extends AbstractCompositeComponent { private SAPHeaderComponentSettings settings; private final SAPHeaderComponentLifecycle componentLifecycle; - private final SAPHeaderWithAuthentication sapHeader; + private final SAPSailingHeaderWithAuthentication sapHeader; public SAPHeaderComponent(SAPHeaderComponentLifecycle componentLifecycle, UserService userService, SAPHeaderComponentSettings settings, StringMessages stringMessages, boolean startInAutoScreenMode) { this.componentLifecycle = componentLifecycle; this.settings = settings; - this.sapHeader = new SAPHeaderWithAuthentication(stringMessages.sapSailingAnalytics(), settings.getTitle()); + this.sapHeader = new SAPSailingHeaderWithAuthentication(settings.getTitle()); new FixedSailingAuthentication(userService, sapHeader.getAuthenticationMenuView()); initWidget(sapHeader); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/authentication/SAPSailingHeaderWithAuthentication.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/authentication/SAPSailingHeaderWithAuthentication.java new file mode 100644 index 00000000000..20101cccdec --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/authentication/SAPSailingHeaderWithAuthentication.java @@ -0,0 +1,20 @@ +package com.sap.sailing.gwt.common.authentication; + +import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication; + +public class SAPSailingHeaderWithAuthentication extends SAPHeaderWithAuthentication { + + private static final String SAP_SAILING_URL = "http://www.sapsailing.com"; + private static final String SAP_SAILING_APP_NAME = StringMessages.INSTANCE.sapSailingAnalytics(); + + + public SAPSailingHeaderWithAuthentication() { + super(SAP_SAILING_APP_NAME, SAP_SAILING_URL); + } + + public SAPSailingHeaderWithAuthentication(String headerText) { + super(SAP_SAILING_APP_NAME, SAP_SAILING_URL, headerText); + } + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewEntryPoint.java index f5653f8e579..00827fb9fa8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewEntryPoint.java @@ -14,6 +14,7 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.gwt.user.client.ui.ScrollPanel; import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; +import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication; import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.regattaoverview.client.RegattaRaceStatesComponent.EntryHandler; import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewBaseSettings; @@ -21,7 +22,6 @@ import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaRaceStatesSett import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint; import com.sap.sailing.gwt.ui.shared.RegattaOverviewEntryDTO; import com.sap.sse.gwt.settings.SettingsToUrlSerializer; -import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication; public class RegattaOverviewEntryPoint extends AbstractSailingEntryPoint { @@ -33,7 +33,7 @@ public class RegattaOverviewEntryPoint extends AbstractSailingEntryPoint { private final Label clockLabel = new Label(); private final RegattaOverviewResources.LocalCss style = RegattaOverviewResources.INSTANCE.css(); - private SAPHeaderWithAuthentication siteHeader; + private SAPSailingHeaderWithAuthentication siteHeader; @Override public void doOnModuleLoad() { @@ -50,8 +50,7 @@ public class RegattaOverviewEntryPoint extends AbstractSailingEntryPoint { clockLabel.addStyleName(style.clockLabel()); - siteHeader = new SAPHeaderWithAuthentication(getStringMessages() - .sapSailingAnalytics()); + siteHeader = new SAPSailingHeaderWithAuthentication(); new FixedSailingAuthentication(getUserService(), siteHeader.getAuthenticationMenuView()); siteHeader.addWidgetToRightSide(clockLabel); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java index 00d781e3259..226aaa74264 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java @@ -16,6 +16,7 @@ import com.sap.sailing.domain.common.security.Permission; import com.sap.sailing.domain.common.security.Roles; import com.sap.sailing.domain.common.security.SailingPermissionsForRoleProvider; import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; +import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication; import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint; import com.sap.sailing.gwt.ui.client.LeaderboardGroupsDisplayer; import com.sap.sailing.gwt.ui.client.LeaderboardGroupsRefresher; @@ -45,7 +46,6 @@ import com.sap.sse.security.ui.authentication.decorator.AuthorizedContentDecorat import com.sap.sse.security.ui.authentication.decorator.WidgetFactory; import com.sap.sse.security.ui.authentication.generic.GenericAuthentication; import com.sap.sse.security.ui.authentication.generic.GenericAuthorizedContentDecorator; -import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication; import com.sap.sse.security.ui.client.component.UserManagementPanel; import com.sap.sse.security.ui.client.i18n.StringMessages; @@ -66,8 +66,7 @@ public class AdminConsoleEntryPoint extends AbstractSailingEntryPoint implements private void createUI() { HeaderPanel headerPanel = new HeaderPanel(); - SAPHeaderWithAuthentication header = new SAPHeaderWithAuthentication(getStringMessages().sapSailingAnalytics(), - getStringMessages().administration()); + SAPSailingHeaderWithAuthentication header = new SAPSailingHeaderWithAuthentication(getStringMessages().administration()); GenericAuthentication genericSailingAuthentication = new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView()); AuthorizedContentDecorator authorizedContentDecorator = new GenericAuthorizedContentDecorator(genericSailingAuthentication); authorizedContentDecorator.setContentWidgetFactory(new WidgetFactory() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/LeaderboardEditPage.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/LeaderboardEditPage.java index 47ceeda55ed..fdc69aa2711 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/LeaderboardEditPage.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/LeaderboardEditPage.java @@ -1,71 +1,71 @@ -package com.sap.sailing.gwt.ui.leaderboardedit; - -import java.util.List; - -import com.google.gwt.dom.client.Style.Position; -import com.google.gwt.dom.client.Style.Unit; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.RootPanel; -import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.domain.common.security.Permission; -import com.sap.sailing.domain.common.security.SailingPermissionsForRoleProvider; -import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; -import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint; -import com.sap.sse.gwt.client.async.AsyncActionsExecutor; -import com.sap.sse.gwt.client.async.MarkedAsyncCallback; -import com.sap.sse.security.ui.authentication.decorator.AuthorizedContentDecorator; -import com.sap.sse.security.ui.authentication.decorator.WidgetFactory; -import com.sap.sse.security.ui.authentication.generic.GenericAuthentication; -import com.sap.sse.security.ui.authentication.generic.GenericAuthorizedContentDecorator; -import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication; - -public class LeaderboardEditPage extends AbstractSailingEntryPoint { - @Override - protected void doOnModuleLoad() { - super.doOnModuleLoad(); - - sailingService.getLeaderboardNames(new MarkedAsyncCallback>( - new AsyncCallback>() { - @Override - public void onSuccess(List leaderboardNames) { - final String leaderboardName = Window.Location.getParameter("name"); - if (leaderboardNames.contains(leaderboardName)) { - - SAPHeaderWithAuthentication header = initHeader(); - GenericAuthentication genericSailingAuthentication = new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView()); - AuthorizedContentDecorator authorizedContentDecorator = new GenericAuthorizedContentDecorator(genericSailingAuthentication); - authorizedContentDecorator.setPermissionToCheck(Permission.MANAGE_LEADERBOARD_RESULTS, SailingPermissionsForRoleProvider.INSTANCE); - authorizedContentDecorator.setContentWidgetFactory(new WidgetFactory() { - @Override - public Widget get() { - EditableLeaderboardPanel leaderboardPanel = new EditableLeaderboardPanel(sailingService, new AsyncActionsExecutor(), leaderboardName, null, - LeaderboardEditPage.this, getStringMessages(), userAgent); - leaderboardPanel.ensureDebugId("EditableLeaderboardPanel"); - return leaderboardPanel; - } - }); - - RootPanel.get().add(authorizedContentDecorator); - RootPanel.get().add(header); - } else { - RootPanel.get().add(new Label(getStringMessages().noSuchLeaderboard())); - } - } - @Override - public void onFailure(Throwable t) { - reportError("Error trying to obtain list of leaderboard names: "+t.getMessage()); - } - })); - } - - private SAPHeaderWithAuthentication initHeader() { - SAPHeaderWithAuthentication header = new SAPHeaderWithAuthentication(getStringMessages().sapSailingAnalytics(), - getStringMessages().editScores()); - header.getElement().getStyle().setPosition(Position.FIXED); - header.getElement().getStyle().setTop(0, Unit.PX); - header.getElement().getStyle().setWidth(100, Unit.PCT); - return header; - } -} +package com.sap.sailing.gwt.ui.leaderboardedit; + +import java.util.List; + +import com.google.gwt.dom.client.Style.Position; +import com.google.gwt.dom.client.Style.Unit; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.domain.common.security.Permission; +import com.sap.sailing.domain.common.security.SailingPermissionsForRoleProvider; +import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; +import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication; +import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint; +import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.async.MarkedAsyncCallback; +import com.sap.sse.security.ui.authentication.decorator.AuthorizedContentDecorator; +import com.sap.sse.security.ui.authentication.decorator.WidgetFactory; +import com.sap.sse.security.ui.authentication.generic.GenericAuthentication; +import com.sap.sse.security.ui.authentication.generic.GenericAuthorizedContentDecorator; +import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication; + +public class LeaderboardEditPage extends AbstractSailingEntryPoint { + @Override + protected void doOnModuleLoad() { + super.doOnModuleLoad(); + + sailingService.getLeaderboardNames(new MarkedAsyncCallback>( + new AsyncCallback>() { + @Override + public void onSuccess(List leaderboardNames) { + final String leaderboardName = Window.Location.getParameter("name"); + if (leaderboardNames.contains(leaderboardName)) { + + SAPHeaderWithAuthentication header = initHeader(); + GenericAuthentication genericSailingAuthentication = new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView()); + AuthorizedContentDecorator authorizedContentDecorator = new GenericAuthorizedContentDecorator(genericSailingAuthentication); + authorizedContentDecorator.setPermissionToCheck(Permission.MANAGE_LEADERBOARD_RESULTS, SailingPermissionsForRoleProvider.INSTANCE); + authorizedContentDecorator.setContentWidgetFactory(new WidgetFactory() { + @Override + public Widget get() { + EditableLeaderboardPanel leaderboardPanel = new EditableLeaderboardPanel(sailingService, new AsyncActionsExecutor(), leaderboardName, null, + LeaderboardEditPage.this, getStringMessages(), userAgent); + leaderboardPanel.ensureDebugId("EditableLeaderboardPanel"); + return leaderboardPanel; + } + }); + + RootPanel.get().add(authorizedContentDecorator); + RootPanel.get().add(header); + } else { + RootPanel.get().add(new Label(getStringMessages().noSuchLeaderboard())); + } + } + @Override + public void onFailure(Throwable t) { + reportError("Error trying to obtain list of leaderboard names: "+t.getMessage()); + } + })); + } + + private SAPHeaderWithAuthentication initHeader() { + SAPSailingHeaderWithAuthentication header = new SAPSailingHeaderWithAuthentication(getStringMessages().editScores()); + header.getElement().getStyle().setPosition(Position.FIXED); + header.getElement().getStyle().setTop(0, Unit.PX); + header.getElement().getStyle().setWidth(100, Unit.PCT); + return header; + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorEntryPoint.java index 4029f742f53..5f5561271f9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorEntryPoint.java @@ -10,6 +10,7 @@ import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; +import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication; import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint; import com.sap.sailing.gwt.ui.client.RemoteServiceMappingConstants; import com.sap.sailing.gwt.ui.client.SimulatorService; @@ -21,7 +22,6 @@ import com.sap.sse.security.ui.authentication.decorator.AuthorizedContentDecorat import com.sap.sse.security.ui.authentication.decorator.WidgetFactory; import com.sap.sse.security.ui.authentication.generic.GenericAuthentication; import com.sap.sse.security.ui.authentication.generic.GenericAuthorizedContentDecorator; -import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication; public class SimulatorEntryPoint extends AbstractSailingEntryPoint { @@ -187,8 +187,7 @@ public class SimulatorEntryPoint extends AbstractSailingEntryPoint { } private void createSimulatorPanel() { - SAPHeaderWithAuthentication header = new SAPHeaderWithAuthentication(getStringMessages() - .sapSailingAnalytics(), getStringMessages().strategySimulatorTitle()); + SAPSailingHeaderWithAuthentication header = new SAPSailingHeaderWithAuthentication(getStringMessages().strategySimulatorTitle()); GenericAuthentication genericSailingAuthentication = new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView()); AuthorizedContentDecorator authorizedContentDecorator = new GenericAuthorizedContentDecorator(genericSailingAuthentication); diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.gss b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.gss index 7d16fa16dbe..5a6c09be762 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.gss +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.gss @@ -47,31 +47,35 @@ vertical-align: top; } -.logo { +.logo, .logo:hover, .logo:visited { margin: 0px; display: inline-block; + gwt-sprite: "logo"; + background-size: cover; + width: 80px; + height: 40px; + border: none; + text-decoration: none; } -.logotitle { +.logotitle, .logotitle:hover, .logotitle:visited { font-size: 1rem; display: inline-block; - color: #f6f9fc; + color: #fff; width: 150px; height: 100%; padding: 17px 15px 0 0; vertical-align: top; text-align: right; + border: none; border-right: 1px solid rgb(180,180,180); margin: 0px; margin-left: -25px; box-sizing: border-box; + text-decoration: none; } .pagetitle { color: #ffffff; font-size: 1.1rem; font-weight: bold; } -a.logolink, a.logolink:hover, a.logolink:visited { - border: none; - text-decoration: none; -} diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.java index 9b4db99f389..e5252e13443 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.java @@ -26,7 +26,7 @@ import com.google.gwt.user.client.ui.Widget; public class SAPHeader extends Composite { private static final String LOGO_URL = "https://sapsponsorships.com/"; - private static final String TITLE_URL = "http://www.sapsailing.com"; +// private static final String TITLE_URL = "http://www.sapsailing.com"; private static SAPHeaderUiBinder uiBinder = GWT.create(SAPHeaderUiBinder.class); @@ -34,7 +34,7 @@ public class SAPHeader extends Composite { } @UiField - DivElement applicationNameUi; + AnchorElement applicationNameAnchor; @UiField DivElement pageTitleUi; @UiField @@ -45,16 +45,14 @@ public class SAPHeader extends Composite { SimplePanel rightSideUi; @UiField AnchorElement logoAnchor; - @UiField - AnchorElement titleUiAnchor; - public SAPHeader(String applicationName) { + public SAPHeader(String applicationName, String applicationBaseUrl) { SAPHeaderResources.INSTANCE.css().ensureInjected(); initWidget(uiBinder.createAndBindUi(this)); - applicationNameUi.setInnerText(applicationName != null ? applicationName : " "); + applicationNameAnchor.setInnerText(applicationName != null ? applicationName : " "); logoAnchor.setHref(LOGO_URL); - String sapSailingUrl = TITLE_URL + "?locale=" + LocaleInfo.getCurrentLocale().getLocaleName(); - titleUiAnchor.setHref(sapSailingUrl); + String sapSailingUrl = applicationBaseUrl + "?locale=" + LocaleInfo.getCurrentLocale().getLocaleName(); + applicationNameAnchor.setHref(sapSailingUrl); } public void setHeaderTitle(String title) { diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.ui.xml b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.ui.xml index dc5668927f3..ed63ca19f8c 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.ui.xml +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeader.ui.xml @@ -7,15 +7,11 @@
- - - - -
- + +
-
+
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeaderResources.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeaderResources.java index 0a8242e0734..004708ef3e0 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeaderResources.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/sapheader/SAPHeaderResources.java @@ -21,7 +21,6 @@ public interface SAPHeaderResources extends ClientBundle { String logo(); String logotitle(); String pagetitle(); - String logolink(); } @Source("logo-small@2x.png") diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/generic/sapheader/SAPHeaderWithAuthentication.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/generic/sapheader/SAPHeaderWithAuthentication.java index 24a614b4adf..e4b46cb4071 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/generic/sapheader/SAPHeaderWithAuthentication.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/generic/sapheader/SAPHeaderWithAuthentication.java @@ -1,58 +1,58 @@ -package com.sap.sse.security.ui.authentication.generic.sapheader; - -import com.google.gwt.user.client.ui.Anchor; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.SimplePanel; -import com.google.gwt.user.client.ui.Widget; -import com.sap.sse.gwt.client.sapheader.SAPHeader; -import com.sap.sse.security.ui.authentication.generic.GenericAuthentication; -import com.sap.sse.security.ui.authentication.view.AuthenticationMenuView; -import com.sap.sse.security.ui.authentication.view.AuthenticationMenuViewImpl; - -/** - * {@link SAPHeader} which is decorated by a authentication control on the right side. This is typically used to - * integrate with {@link GenericAuthentication}. - */ -public class SAPHeaderWithAuthentication extends SAPHeader { - private static final SAPHeaderWithAuthenticationResources res = SAPHeaderWithAuthenticationResources.INSTANCE; - - private final SimplePanel rightWrapper; - - private AuthenticationMenuView authenticationMenuView; - - public SAPHeaderWithAuthentication(String applicationName, String headerTitle) { - this(applicationName); - setHeaderTitle(headerTitle); - } - - public SAPHeaderWithAuthentication(String applicationName) { - super(applicationName); - res.css().ensureInjected(); - - FlowPanel rightWithAuthentication = new FlowPanel(); - rightWithAuthentication.addStyleName(res.css().header_right_wrapper()); - - Anchor authenticationMenu = new Anchor(); - authenticationMenu.addStyleName(res.css().usermanagement_icon()); - rightWithAuthentication.add(authenticationMenu); - authenticationMenuView = new AuthenticationMenuViewImpl(authenticationMenu, res.css().usermanagement_loggedin(), res.css().usermanagement_open()); - - rightWrapper = new SimplePanel(); - rightWrapper.addStyleName(res.css().header_right_extension()); - rightWithAuthentication.add(rightWrapper); - - super.addWidgetToRightSide(rightWithAuthentication); - } - - @Override - public void addWidgetToRightSide(Widget widget) { - rightWrapper.add(widget); - } - - /** - * @return the {@link AuthenticationMenuView} associated with the authentication control on the right side of the header. - */ - public AuthenticationMenuView getAuthenticationMenuView() { - return authenticationMenuView; - } -} +package com.sap.sse.security.ui.authentication.generic.sapheader; + +import com.google.gwt.user.client.ui.Anchor; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.user.client.ui.Widget; +import com.sap.sse.gwt.client.sapheader.SAPHeader; +import com.sap.sse.security.ui.authentication.generic.GenericAuthentication; +import com.sap.sse.security.ui.authentication.view.AuthenticationMenuView; +import com.sap.sse.security.ui.authentication.view.AuthenticationMenuViewImpl; + +/** + * {@link SAPHeader} which is decorated by a authentication control on the right side. This is typically used to + * integrate with {@link GenericAuthentication}. + */ +public class SAPHeaderWithAuthentication extends SAPHeader { + private static final SAPHeaderWithAuthenticationResources res = SAPHeaderWithAuthenticationResources.INSTANCE; + + private final SimplePanel rightWrapper; + + private AuthenticationMenuView authenticationMenuView; + + public SAPHeaderWithAuthentication(String applicationName, String applicationBaseUrl, String headerTitle) { + this(applicationName, applicationBaseUrl); + setHeaderTitle(headerTitle); + } + + public SAPHeaderWithAuthentication(String applicationName, String applicationBaseUrl) { + super(applicationName, applicationBaseUrl); + res.css().ensureInjected(); + + FlowPanel rightWithAuthentication = new FlowPanel(); + rightWithAuthentication.addStyleName(res.css().header_right_wrapper()); + + Anchor authenticationMenu = new Anchor(); + authenticationMenu.addStyleName(res.css().usermanagement_icon()); + rightWithAuthentication.add(authenticationMenu); + authenticationMenuView = new AuthenticationMenuViewImpl(authenticationMenu, res.css().usermanagement_loggedin(), res.css().usermanagement_open()); + + rightWrapper = new SimplePanel(); + rightWrapper.addStyleName(res.css().header_right_extension()); + rightWithAuthentication.add(rightWrapper); + + super.addWidgetToRightSide(rightWithAuthentication); + } + + @Override + public void addWidgetToRightSide(Widget widget) { + rightWrapper.add(widget); + } + + /** + * @return the {@link AuthenticationMenuView} associated with the authentication control on the right side of the header. + */ + public AuthenticationMenuView getAuthenticationMenuView() { + return authenticationMenuView; + } +}