From 5569aceeed2e502d082adafc40f70d190cc5710e Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 4 Dec 2012 22:05:54 +0100 Subject: [PATCH 1/3] Change stylename of overallStandingsLink to STYLE_ACTIVE_LEADERBOARD Because the Overall Leaderboard Button has to be Orange, not Blue --- .../com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java index e02cc4346c9..de749fdd518 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java @@ -196,7 +196,7 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget + "&leaderboardGroupName=" + leaderboardGroup.name + "&root=" + root + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); Anchor overallStandingsLink = new Anchor(stringMessages.overallStandings(), true, link); - overallStandingsLink.setStyleName(STYLE_ACTIVE_BUTTON); + overallStandingsLink.setStyleName(STYLE_ACTIVE_LEADERBOARD); overallStandingsLink.addStyleName("overallStandings"); mainPanel.add(overallStandingsLink); } From adb73cc2463600bcb258e8f8a9882b5c25daea52 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 4 Dec 2012 22:09:21 +0100 Subject: [PATCH 2/3] Change style names of Legend Buttons Set new style names to the Legend Buttons, because they don't need a hover state like the other Buttons --- .../sailing/gwt/ui/spectator/LeaderboardGroupPanel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java index de749fdd518..7e35c37e0b1 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java @@ -79,12 +79,14 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget private static final String STYLE_INACTIVE_RACE = STYLE_NAME_PREFIX + "InactiveRace"; private static final String STYLE_ACTIVE_RACE = STYLE_NAME_PREFIX + "ActiveRace"; private static final String STYLE_LIVE_RACE = STYLE_NAME_PREFIX + "LiveRace"; - private static final String STYLE_ACTIVE_BUTTON = STYLE_NAME_PREFIX + "ActiveButton"; + //private static final String STYLE_ACTIVE_BUTTON = STYLE_NAME_PREFIX + "ActiveButton"; private static final String STYLE_ACTIVE_LEADERBOARD = STYLE_NAME_PREFIX + "ActiveLeaderboard"; private static final String STYLE_LEGEND = STYLE_NAME_PREFIX + "Legend"; private static final String STYLE_TABLE_TEXT = STYLE_NAME_PREFIX + "TableText"; private static final String STYLE_COLORBOX = STYLE_NAME_PREFIX + "ColorBox"; private static final String STYLE_BOATCLASS = STYLE_NAME_PREFIX + "BoatClass"; + private static final String STYLE_LEGEND_LIVE = STYLE_NAME_PREFIX + "LegendLive"; + private static final String STYLE_LEGEND_TRACKED = STYLE_NAME_PREFIX + "LegendTracked"; private final SailingServiceAsync sailingService; private final StringMessages stringMessages; @@ -274,11 +276,11 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget legendPanel.add(inactiveRace); Label activeRace = new Label(stringMessages.tracked()); - activeRace.setStyleName(STYLE_ACTIVE_RACE); + activeRace.setStyleName(STYLE_LEGEND_TRACKED); legendPanel.add(activeRace); Label liveRace = new Label(stringMessages.live()); - liveRace.setStyleName(STYLE_LIVE_RACE); + liveRace.setStyleName(STYLE_LEGEND_LIVE); legendPanel.add(liveRace); return legendPanel; } From 025efadf22ebe152b9ed543a93b299595eb3e969 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 4 Dec 2012 22:15:37 +0100 Subject: [PATCH 3/3] Add styles for LegendLive && LegendTracked classes --- java/com.sap.sailing.gwt.ui/Spectator.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/Spectator.css b/java/com.sap.sailing.gwt.ui/Spectator.css index a6b0df50670..8f3ab77dd74 100644 --- a/java/com.sap.sailing.gwt.ui/Spectator.css +++ b/java/com.sap.sailing.gwt.ui/Spectator.css @@ -213,7 +213,7 @@ input.magnifier { -webkit-border-radius: 4px; } -.leaderboardGroupPanel-ActiveRace, .leaderboardGroupPanel-InactiveRace { +.leaderboardGroupPanel-ActiveRace, .leaderboardGroupPanel-InactiveRace, .leaderboardGroupPanel-LegendTracked { padding: 5px 8px; display: block; float: left; @@ -228,7 +228,7 @@ input.magnifier { font-family: 'UbuntuBold', Arial, Verdana, sans-serif; } -.leaderboardGroupPanel-LiveRace { +.leaderboardGroupPanel-LiveRace, .leaderboardGroupPanel-LegendLive { padding: 5px 8px; display: block; float: left;