From 0972a2c1b269d51e76b81e63b6cb01fb2a65e44e Mon Sep 17 00:00:00 2001 From: fmittag Date: Tue, 22 Nov 2011 17:03:43 +0100 Subject: [PATCH] some css adjustments --- .../SwissTimingEventManagementPanel.java | 47 +++++++++++-------- .../gwt/ui/client/TrackedEventsComposite.java | 15 ++++-- .../war/AdminConsole.css | 1 + 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SwissTimingEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SwissTimingEventManagementPanel.java index ab50f5ecf12..06102709ce7 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SwissTimingEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SwissTimingEventManagementPanel.java @@ -21,6 +21,7 @@ import com.google.gwt.user.client.ui.CaptionPanel; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.FormPanel; import com.google.gwt.user.client.ui.Grid; +import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.IntegerBox; import com.google.gwt.user.client.ui.Label; @@ -72,7 +73,7 @@ public class SwissTimingEventManagementPanel extends FormPanel implements EventD VerticalPanel mainPanel = new VerticalPanel(); this.setWidget(mainPanel); - mainPanel.setSize("100%", "100%"); + mainPanel.setWidth("100%"); CaptionPanel captionPanelConnections = new CaptionPanel("Connections"); mainPanel.add(captionPanelConnections); @@ -222,23 +223,14 @@ public class SwissTimingEventManagementPanel extends FormPanel implements EventD trackedEventsComposite = new TrackedEventsComposite(stringConstants, /* multiselection */ true); trackedRacesPanel.add(trackedEventsComposite); + + HorizontalPanel trackedRacesButtonPanel = new HorizontalPanel(); + + trackedRacesButtonPanel.setSpacing(10); + trackedRacesPanel.add(trackedRacesButtonPanel); - HorizontalPanel buttonPanel = new HorizontalPanel(); - racesPanel.add(buttonPanel); - - Button btnTrack = new Button("Start tracking"); -// Button btnTrack = new Button(stringConstants.btnTrack()); - buttonPanel.add(btnTrack); - buttonPanel.setSpacing(10); - btnTrack.addClickHandler(new ClickHandler() { - @Override - public void onClick(ClickEvent event) { - trackSelectedRaces(trackWindCheckbox.getValue(), declinationCheckbox.getValue()); - } - }); - Button btnRemove = new Button("Stop tracking"); -// Button btnRemove = new Button(stringConstants.remove()); +// Button btnRemove = new Button(stringConstants.remove()); btnRemove.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent click) { @@ -249,9 +241,8 @@ public class SwissTimingEventManagementPanel extends FormPanel implements EventD } } }); - btnRemove.setWidth("100%"); - buttonPanel.add(btnRemove); - + trackedRacesButtonPanel.add(btnRemove); + Button btnRefresh = new Button(stringConstants.refresh()); btnRefresh.addClickHandler(new ClickHandler() { @Override @@ -259,7 +250,23 @@ public class SwissTimingEventManagementPanel extends FormPanel implements EventD SwissTimingEventManagementPanel.this.eventRefresher.fillEvents(); } }); - buttonPanel.add(btnRefresh); + trackedRacesButtonPanel.add(btnRefresh); + + + HorizontalPanel racesButtonPanel = new HorizontalPanel(); + racesPanel.add(racesButtonPanel); + + Button btnTrack = new Button("Start tracking"); + +// Button btnTrack = new Button(stringConstants.btnTrack()); + racesButtonPanel.add(btnTrack); + racesButtonPanel.setSpacing(10); + btnTrack.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + trackSelectedRaces(trackWindCheckbox.getValue(), declinationCheckbox.getValue()); + } + }); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TrackedEventsComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TrackedEventsComposite.java index dca04100eba..c38bcb464cf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TrackedEventsComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TrackedEventsComposite.java @@ -1,12 +1,12 @@ package com.sap.sailing.gwt.ui.client; -import java.text.DateFormat; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import com.google.gwt.core.client.GWT; +import com.google.gwt.text.client.DateTimeFormatRenderer; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.TextColumn; import com.google.gwt.user.client.ui.FormPanel; @@ -44,8 +44,8 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer, private VerticalPanel panel; - private final DateFormat df = DateFormat.getDateTimeInstance(); - + private DateTimeFormatRenderer dateFormatter = new DateTimeFormatRenderer(); + public TrackedEventsComposite(StringConstants stringConstants, boolean multiSelection) { this.multiSelection = multiSelection; this.raceSelectionChangeListeners = new HashSet(); @@ -161,7 +161,7 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer, @Override public String getValue(Triple object) { if(object.getC().startOfRace != null) { - return df.format(object.getC().startOfRace); + return dateFormatter.render(object.getC().startOfRace); } return ""; @@ -199,6 +199,13 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer, }); setWidget(panel); } + + + if(events.size() == 0) + raceTable.setVisible(false); + else + raceTable.setVisible(true); + raceList.getList().clear(); // Handler columnSortHandler = getRaceTableColumnSortHandler(raceList.getList(), raceNameColumn, raceStartTrackingColumn); diff --git a/java/com.sap.sailing.gwt.ui/war/AdminConsole.css b/java/com.sap.sailing.gwt.ui/war/AdminConsole.css index c34f6cffdc8..cef1fde1d6e 100644 --- a/java/com.sap.sailing.gwt.ui/war/AdminConsole.css +++ b/java/com.sap.sailing.gwt.ui/war/AdminConsole.css @@ -118,6 +118,7 @@ h1 { .gwt-Button { background-color: #e2e2e2; border-color: #a3a3a3 !important; + white-space: nowrap; } .gwt-TextBox {