From 2399e9bc4d32c3c0a14d7c81326d6e2e14fd81eb Mon Sep 17 00:00:00 2001 From: Alexander Tatarinovich Date: Wed, 12 Oct 2016 13:53:25 +0300 Subject: [PATCH 1/6] Bug 3868 - Enable User Management/SAPHeader in Spectator.html Change-Id: Ie47adc066460a9728ab15d6e3556dae0fc5afdd1 --- java/com.sap.sailing.gwt.ui/Spectator.css | 3 +++ .../gwt/ui/spectator/SpectatorEntryPoint.java | 22 ++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/Spectator.css b/java/com.sap.sailing.gwt.ui/Spectator.css index dc81d3c43ff..b3ed005ae22 100644 --- a/java/com.sap.sailing.gwt.ui/Spectator.css +++ b/java/com.sap.sailing.gwt.ui/Spectator.css @@ -23,6 +23,9 @@ top: -1000px; } +html { + font-size: 15px; +} body { background: url(images/spectatorview-bg.png) no-repeat left top #ebebeb; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java index 99188283aae..f0b15fb356e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java @@ -1,5 +1,6 @@ package com.sap.sailing.gwt.ui.spectator; +import com.google.gwt.dom.client.Style.Position; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.user.client.Window; @@ -8,9 +9,9 @@ import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.SimplePanel; +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.GlobalNavigationPanel; -import com.sap.sailing.gwt.ui.client.LogoAndTitlePanel; import com.sap.sailing.gwt.ui.client.RegattaRefresher; import com.sap.sailing.gwt.ui.client.shared.panels.SimpleWelcomeWidget; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapSettings; @@ -66,12 +67,8 @@ public class SpectatorEntryPoint extends AbstractSailingEntryPoint implements Re && Window.Location.getParameter("embedded").equalsIgnoreCase("true"); if (!embedded) { String title = groupName != null ? groupName : getStringMessages().overview(); - LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(title, getStringMessages(), this, getUserService()); - logoAndTitlePanel.addStyleName("LogoAndTitlePanel"); - FlowPanel globalNavigationPanel = new GlobalNavigationPanel(getStringMessages(), true, null, null, /* event */ null, null); - logoAndTitlePanel.add(globalNavigationPanel); - - rootPanel.add(logoAndTitlePanel); + SAPSailingHeaderWithAuthentication header = getHeader(title); + rootPanel.add(header); } else { RootPanel.getBodyElement().getStyle().setPadding(0, Unit.PX); RootPanel.getBodyElement().getStyle().setPaddingTop(20, Unit.PX); @@ -108,6 +105,15 @@ public class SpectatorEntryPoint extends AbstractSailingEntryPoint implements Re fillRegattas(); } + private SAPSailingHeaderWithAuthentication getHeader(String title){ + SAPSailingHeaderWithAuthentication header = new SAPSailingHeaderWithAuthentication(title); + new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView()); + header.getElement().getStyle().setPosition(Position.FIXED); + header.getElement().getStyle().setTop(0, Unit.PX); + header.getElement().getStyle().setWidth(100, Unit.PCT); + return header; + } + @Override public void fillRegattas() { From 85e36c720fd70dfa563be8d6998a225d5fca3366 Mon Sep 17 00:00:00 2001 From: Alexander Tatarinovich Date: Wed, 19 Oct 2016 15:29:57 +0300 Subject: [PATCH 2/6] bug3868: fix padding and overiding hider Change-Id: I41960781ba41ff478d220624f83f348e2c02f69f --- java/com.sap.sailing.gwt.ui/Spectator.css | 2 +- .../com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/Spectator.css b/java/com.sap.sailing.gwt.ui/Spectator.css index b3ed005ae22..cb03382bfaf 100644 --- a/java/com.sap.sailing.gwt.ui/Spectator.css +++ b/java/com.sap.sailing.gwt.ui/Spectator.css @@ -51,7 +51,7 @@ table td,select,button { .contentOuterPanel { background: #dddcdc; - margin: 0 12px 0 12px; + margin: 0 12px 120px; padding: 12px; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java index f0b15fb356e..bd9a41092ee 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java @@ -111,6 +111,7 @@ public class SpectatorEntryPoint extends AbstractSailingEntryPoint implements Re header.getElement().getStyle().setPosition(Position.FIXED); header.getElement().getStyle().setTop(0, Unit.PX); header.getElement().getStyle().setWidth(100, Unit.PCT); + header.getElement().getStyle().setZIndex(100); return header; } From 4f8bded03bb8dbc02f59530f4fd75bf2503d9f8a Mon Sep 17 00:00:00 2001 From: Alexander Tatarinovich Date: Tue, 1 Nov 2016 12:07:31 +0300 Subject: [PATCH 3/6] bug3868: fix size fleet markers and padding Change-Id: Ia8aa130c0162663823944ba3e8bc5714ea058310 --- java/com.sap.sailing.gwt.ui/Spectator.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/Spectator.css b/java/com.sap.sailing.gwt.ui/Spectator.css index cb03382bfaf..3e27b7f6304 100644 --- a/java/com.sap.sailing.gwt.ui/Spectator.css +++ b/java/com.sap.sailing.gwt.ui/Spectator.css @@ -162,6 +162,7 @@ input.magnifier { .mainPanel { width: 100%; margin-left: 13px; + margin-bottom: 120px; } .leaderboardGroupPanel-GroupName { @@ -209,8 +210,8 @@ input.magnifier { padding: 5px; display: block; float: left; - width: 8px; - height: 8px; + width: 18px; + height: 18px; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; From 62b64455061032a738bd0264c42e3f77dd261cf4 Mon Sep 17 00:00:00 2001 From: Kai Boernert Date: Thu, 3 Nov 2016 09:16:52 +0100 Subject: [PATCH 4/6] fix for inconsistent layouting of wind and competitorchart, disabled automatic reflow, as it is handled manually, fixed spacing top, to account correctly for the existing buttons --- .../sap/sailing/gwt/ui/client/shared/charts/WindChart.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java index 839ead23c27..2ab315d1fd4 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java @@ -103,6 +103,7 @@ public class WindChart extends AbstractRaceChart implements R colorMap = new ColorMapImpl(); chart = new Chart() .setPersistent(true) + .setReflow(false) .setZoomType(BaseChart.ZoomType.X) .setMarginLeft(65) .setMarginRight(65) @@ -115,7 +116,7 @@ public class WindChart extends AbstractRaceChart implements R .setPlotBackgroundColor("#f8f8f8") .setPlotBorderWidth(0) .setCredits(new Credits().setEnabled(false)) - .setChartTitle(new ChartTitle().setText(stringMessages.wind())) + .setChartTitle(new ChartTitle().setText(stringMessages.wind()).setOption("floating",true)) .setChartSubtitle(new ChartSubtitle().setText(stringMessages.clickAndDragToZoomIn())) .setLinePlotOptions(new LinePlotOptions().setLineWidth(LINE_WIDTH).setMarker( new Marker().setEnabled(false).setHoverState( @@ -182,7 +183,7 @@ public class WindChart extends AbstractRaceChart implements R chart.getYAxis(1).setOpposite(true).setAxisTitleText(stringMessages.speed()+" ("+stringMessages.knotsUnit()+")").setMin(0) .setMaxPadding(0.05).setStartOnTick(false).setGridLineWidth(0).setMinorGridLineWidth(0); if (compactChart) { - chart.setSpacingBottom(10).setSpacingLeft(10).setSpacingRight(10).setSpacingTop(2) + chart.setSpacingBottom(10).setSpacingLeft(10).setSpacingRight(10).setSpacingTop(20) .setOption("legend/margin", 2) .setOption("title/margin", 5) .setChartSubtitle(null) From 8092206a9aa22ee411be7c738336bae50b82d43f Mon Sep 17 00:00:00 2001 From: Kai Boernert Date: Fri, 4 Nov 2016 09:07:48 +0100 Subject: [PATCH 5/6] fix for competitor chart sometimes empty upon initial useage --- .../ui/client/shared/charts/AbstractCompetitorRaceChart.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java index 71a165375af..75efb151e86 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java @@ -384,6 +384,8 @@ public abstract class AbstractCompetitorRaceChart Date: Mon, 7 Nov 2016 12:03:01 +0100 Subject: [PATCH 6/6] Fixed alignment of raced in fleets in Spectator.html --- java/com.sap.sailing.gwt.ui/Spectator.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/Spectator.css b/java/com.sap.sailing.gwt.ui/Spectator.css index 3e27b7f6304..6f55fe4310c 100644 --- a/java/com.sap.sailing.gwt.ui/Spectator.css +++ b/java/com.sap.sailing.gwt.ui/Spectator.css @@ -191,7 +191,8 @@ input.magnifier { margin: 5px 5px 5px 0; text-decoration: none; font-family: 'Open Sans', Arial, Verdana, sans-serif; - font-weight: 600 + font-weight: 600; + box-sizing: content-box; } .leaderboardGroupPanel-BoatClass {