From 39e2578f78adf80f0449087ea1fa9eca80b4a504 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Thu, 1 Oct 2015 15:28:48 +0200 Subject: [PATCH] Competition Format - Adjusted representation of different race states in mobile version --- .../regattacompetition/RegattaCompetition.gss | 11 ++++++++--- .../RegattaCompetitionFleetRace.java | 9 ++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss index 1d7860b3ea0..9c59c4c2d67 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetition.gss @@ -45,6 +45,9 @@ .regattacompetition_phase_fleet:last-child { padding-right: 0.666666666666667em; } +.regattacompetition_phase_fleetfullwidth .regattacompetition_phase_fleet_race { + height: 3.466666666666666666em; +} .regattacompetition_phase_fleetfullwidth .regattacompetition_phase_fleet_race_title { position: absolute; top: 50%; @@ -75,9 +78,11 @@ background: #008fcc; margin-bottom: 0.666666666666667em; text-align: center; - padding: 1.066666666666667em 0; + padding: .8em 0; border-radius: 0.333333333333333em; - color: #f6f9fc; + color: #fff; + /* color: #f6f9fc; alternative white*/ + height: 5em; } .regattacompetition_phase_fleet_racetracked { background: #008fcc; @@ -86,7 +91,7 @@ color: #008fcc; background-color: #fff; border: 0.133333333333333em solid #008fcc; - padding: .933333333333333em 0; + padding: .666666666666667em 0; cursor: default; } .regattacompetition_phase_fleet_raceuntracked .regattacompetition_phase_fleet_race_title:after { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionFleetRace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionFleetRace.java index 612207709d9..22e163e303b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionFleetRace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattacompetition/RegattaCompetitionFleetRace.java @@ -38,7 +38,9 @@ public class RegattaCompetitionFleetRace extends UIObject { } private void setupRaceState(RaceTrackingState trackingState, RaceViewState viewState) { - boolean isUntrackedRace = trackingState != RaceTrackingState.TRACKED_VALID_DATA; + // TODO: As long as there is no mobile race viewer, show all races as untracked + boolean isUntrackedRace = true; + // boolean isUntrackedRace = trackingState != RaceTrackingState.TRACKED_VALID_DATA; if (viewState == RaceViewState.RUNNING) { anchor.addClassName(local_res.css().regattacompetition_phase_fleet_racelive()); raceStateUi.setInnerText(isUntrackedRace ? i18n.live() : i18n.actionWatch()); @@ -46,12 +48,9 @@ public class RegattaCompetitionFleetRace extends UIObject { anchor.addClassName(local_res.css().regattacompetition_phase_fleet_raceplanned()); raceStateUi.setInnerText(i18n.raceIsPlanned()); } else { - // TODO: As long as there is no mobile race viewer, show all races as untracked - // raceStateUi.setInnerText(isUntrackedRace ? i18n.finished() : i18n.actionAnalyze()); - raceStateUi.setInnerText(i18n.finished()); + raceStateUi.setInnerText(isUntrackedRace ? i18n.finished() : i18n.actionAnalyze()); } setStyleName(anchor, local_res.css().regattacompetition_phase_fleet_raceuntracked(), true); - // setStyleName(anchor, local_res.css().regattacompetition_phase_fleet_raceuntracked(), isUntrackedRace); } }