Merge branch 'master' into leaderboard-refactoring

java/com.sap.sailing.gwt.ui/CommonControls.css

@@ -234,26 +234,50 @@
 }
 
 .timePanel-controls {
-	margin: 15px 0 0 0;
+	margin: 15px 0 8px 0;
 }
 
 .timePanel-controls-play {
+    float:left;
+    padding: 0 10px 0 0;
 }
 
 .timePanel-controls-playSpeed {
 	vertical-align: middle;
-	padding: 5px;
 	line-height: 25px;
+	float:left;
+	padding: 3px 0 0 0;
 }
 
 .timePanel-label {
+        float:left;
 }
 
 .timePanel-controls-time {
+    float:left;
+    padding: 5px 0 0 0;    
+}
+
+.timePanel-controls-time .dateLabel,
+.timePanel-controls-time .timeLabel {
+    padding: 0 20px 0 0;    	
 }
 
 .timePanel-controls-timeDelay {
+        float:left;
+}
 
+.timePanel-controls-playmode{
+    float:left;
+    padding: 5px 0 0 0;
+}
+
+.timePanel-controls-playmode .playModeLabel{
+    padding: 0 20px 0 0;   	
+}
+
+.timePanelSettings{
+	float: right;
 }
 
 .LogoAndTitlePanel {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java

@@ -16,8 +16,6 @@ import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.FormPanel;
-import com.google.gwt.user.client.ui.HasVerticalAlignment;
-import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.IntegerBox;
 import com.google.gwt.user.client.ui.Label;
@@ -135,8 +133,8 @@ public class TimePanel<T extends TimePanelSettings> extends FormPanel implements
         vp.add(s);
         s.add(sliderBar);
 
-        HorizontalPanel controlsPanel = new HorizontalPanel();
-        controlsPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
+        FlowPanel controlsPanel = new FlowPanel();
+        
         controlsPanel.setStyleName("timePanel-controls");
         controlsPanel.setSize("100%", "25px");
         vp.add(controlsPanel);
@@ -189,14 +187,11 @@ public class TimePanel<T extends TimePanelSettings> extends FormPanel implements
         timeControlPanel.add(timeLabel);
         controlsPanel.add(timeControlPanel);
         dateLabel.getElement().getStyle().setFloat(Style.Float.LEFT);
-        dateLabel.getElement().getStyle().setPadding(3, Style.Unit.PX);
+        dateLabel.getElement().setClassName("dateLabel");
         timeLabel.getElement().getStyle().setFloat(Style.Float.LEFT);
-        timeLabel.getElement().getStyle().setPaddingBottom(3, Style.Unit.PX);
-        timeLabel.getElement().getStyle().setPaddingTop(3, Style.Unit.PX);
-        timeLabel.getElement().getStyle().setPaddingLeft(100, Style.Unit.PX);
-        timeLabel.getElement().getStyle().setPaddingRight(3, Style.Unit.PX);
         timeLabel.getElement().getStyle().setFontWeight(Style.FontWeight.BOLD);
-
+        timeLabel.getElement().setClassName("timeLabel");
+        
         FlowPanel playModeControlPanel = new FlowPanel();
         playModeControlPanel.setStyleName("timePanel-controls-playmode");
         playModeControlPanel.add(playModeImage);
@@ -206,7 +201,7 @@ public class TimePanel<T extends TimePanelSettings> extends FormPanel implements
         playModeControlPanel .add(playModeLabel);
         controlsPanel.add(playModeControlPanel );
         playModeLabel.getElement().getStyle().setFloat(Style.Float.LEFT);
-        playModeLabel.getElement().getStyle().setPadding(5, Style.Unit.PX);
+        playModeLabel.getElement().setClassName("playModeLabel");
         
         // play speed controls
         FlowPanel playSpeedControlPanel = new FlowPanel();
@@ -216,6 +211,7 @@ public class TimePanel<T extends TimePanelSettings> extends FormPanel implements
         playSpeedBox = new IntegerBox();
         playSpeedBox.setVisibleLength(3);
         playSpeedBox.setWidth("25px");
+        playSpeedBox.setHeight("11px");
         playSpeedBox.setValue(1);
         playSpeedBox.setTitle(stringMessages.playSpeedHelp());
         Image playSpeedImage = new Image(playSpeedImg);
@@ -268,6 +264,7 @@ public class TimePanel<T extends TimePanelSettings> extends FormPanel implements
         ImageResource settingsIcon = resources.settingsIcon();
         Anchor settingsAnchor = new Anchor(AbstractImagePrototype.create(settingsIcon).getSafeHtml());
         settingsAnchor.setTitle(stringMessages.settings());
+        settingsAnchor.setStyleName("timePanelSettings");
         settingsAnchor.addClickHandler(new SettingsClickHandler(stringMessages));
         controlsPanel.add(settingsAnchor);
         setWidget(vp);