From f816d166399368a01b8ec573852ef90c37f7ec64 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Mon, 20 Nov 2017 16:58:51 +0100 Subject: [PATCH] bug4210 Added styling to date and time inputs --- .../common/client/datetime/AbstractInput.java | 1 + .../client/datetime/DateAndTimeInput.java | 2 ++ .../gwt/common/client/datetime/DateInput.java | 4 ++-- .../datetime/DateTimeInputResources.java | 18 ++++++++++++++++++ .../client/datetime/NativeDateTimeInput.java | 1 + .../gwt/common/client/datetime/TimeInput.java | 1 + .../common/client/datetime/dateTimeInput.gss | 7 +++++++ 7 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateTimeInputResources.java create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/dateTimeInput.gss diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/AbstractInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/AbstractInput.java index b592e0a978a..f33adf5f144 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/AbstractInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/AbstractInput.java @@ -13,6 +13,7 @@ abstract class AbstractInput extends Composite implements DateTimeInput { private HasValue delegate; protected & IsWidget> AbstractInput(T delegate) { + DateTimeInputResources.INSTANCE.css().ensureInjected(); this.delegate = delegate; initWidget(delegate.asWidget()); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateAndTimeInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateAndTimeInput.java index a30f6a39be4..3715bea9ec6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateAndTimeInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateAndTimeInput.java @@ -26,6 +26,8 @@ public class DateAndTimeInput extends AbstractInput { public DateAndTimePanel(Accuracy accuracy) { add(this.dateInput = new DateInput()); add(this.timeInput = new TimeInput(accuracy)); + dateInput.addStyleName(DateTimeInputResources.INSTANCE.css().dateTimeInput()); + timeInput.addStyleName(DateTimeInputResources.INSTANCE.css().dateTimeInput()); this.dateFormat = DateTimeFormat.getFormat("yyyy-MM-dd"); this.timeFormat = accuracy.getTimeFormat(); this.datetimeFormat = accuracy.getDatetimeFormat(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateInput.java index f236ef767f2..7feb4b051cc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateInput.java @@ -3,7 +3,6 @@ package com.sap.sailing.gwt.common.client.datetime; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat; import com.google.gwt.user.datepicker.client.DateBox; -import com.google.gwt.user.datepicker.client.DatePicker; public class DateInput extends AbstractInput { @@ -14,7 +13,8 @@ public class DateInput extends AbstractInput { private static class CustomDateBox extends DateBox { private CustomDateBox() { - super(new DatePicker(), null, new DefaultFormat(DateTimeFormat.getFormat(PredefinedFormat.DATE_MEDIUM))); + setFormat(new DefaultFormat(DateTimeFormat.getFormat(PredefinedFormat.DATE_MEDIUM))); + addStyleName(DateTimeInputResources.INSTANCE.css().dateTimeInput()); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateTimeInputResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateTimeInputResources.java new file mode 100644 index 00000000000..ea714536219 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateTimeInputResources.java @@ -0,0 +1,18 @@ +package com.sap.sailing.gwt.common.client.datetime; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; + +interface DateTimeInputResources extends ClientBundle { + + static final DateTimeInputResources INSTANCE = GWT.create(DateTimeInputResources.class); + + @Source("dateTimeInput.gss") + Style css(); + + interface Style extends CssResource { + String dateTimeInput(); + } + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeDateTimeInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeDateTimeInput.java index a7f2664a07c..1004cee42b8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeDateTimeInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeDateTimeInput.java @@ -36,6 +36,7 @@ class NativeDateTimeInput extends Widget implements DateTimeInput { this.input = Document.get().createElement(InputElement.TAG).cast(); this.input.setAttribute(ATTR_TYPE, inputType.getType()); this.input.setAttribute(ATTR_STEP, step); + this.input.addClassName(DateTimeInputResources.INSTANCE.css().dateTimeInput()); this.format = format; setElement(input); sinkEvents(Event.ONCHANGE | Event.ONBLUR | Event.ONKEYUP); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/TimeInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/TimeInput.java index 54a0df88356..5d675ca01b2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/TimeInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/TimeInput.java @@ -21,6 +21,7 @@ public class TimeInput extends AbstractInput { private TimeBox(TimeConverter converter) { super(Document.get().createElement(InputElement.TAG), converter, converter); + addStyleName(DateTimeInputResources.INSTANCE.css().dateTimeInput()); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/dateTimeInput.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/dateTimeInput.gss new file mode 100644 index 00000000000..46b55e777bb --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/dateTimeInput.gss @@ -0,0 +1,7 @@ +.dateTimeInput { + font-family: 'Open Sans', 'Arial Unicode MS', Arial, sans-serif; + font-size: small; + border: 1px solid #ccc; + border-top: 1px solid #999; + padding: 2.75px 3px; +} \ No newline at end of file