Commit cdb8ca9c authored by Marijan Milicevic's avatar Marijan Milicevic Committed by Jeroen Hoffman

CMS-11068 [back port to 11.2] Error in calendardate field in hippo

- fix labels and tooltips (for date only field)

(cherry picked from commit 0390ed23)
parent 06fadf6f
......@@ -34,9 +34,9 @@
<div class="hippo-global-clearer"/>
<a wicket:id="today" class=" hippo-datepicker-reset btn btn-default btn-sm" wicket:message="title:set-to-current-date-tooltip">
<a wicket:id="today" class=" hippo-datepicker-reset btn btn-default btn-sm">
<span wicket:id="current-date-icon"/>
<span class="button-label"><wicket:message key="set-to-current-date"></wicket:message></span>
<span class="button-label" wicket:id="current-date-label"></span>
<div class="hippo-global-clearer"/>
......@@ -24,6 +24,7 @@ import org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.yui.calendar.DatePicker;
import org.apache.wicket.extensions.yui.calendar.DateTimeField;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
......@@ -54,7 +55,10 @@ public class YuiDateTimeField extends DateTimeField {
public static final String DATE_LABEL = "date-label";
public static final String HOURS_LABEL = "hours-label";
public static final String MINUTES_LABEL = "minutes-label";
public static final String CURRENT_DATE_TIME_TOOLTIP = "set-to-current-date-tooltip";
public static final String CURRENT_DATE_TIME_LABEL = "set-to-current-date";
public static final String CURRENT_DATE_TOOLTIP = "set-to-current-date-only-tooltip";
public static final String CURRENT_DATE_LABEL = "set-to-current-date-only";
private final YuiDatePickerSettings settings;
private boolean todayLinkVisible = true;
private final boolean hideTime;
......@@ -70,7 +74,7 @@ public class YuiDateTimeField extends DateTimeField {
public YuiDateTimeField(final String id, final IModel<Date> model, final YuiDatePickerSettings settings, final boolean hideTime) {
super(id, model);
this.hideTime = hideTime;
if (settings != null) {
this.settings = settings;
......@@ -122,6 +126,12 @@ public class YuiDateTimeField extends DateTimeField {
today.add(HippoIcon.fromSprite("current-date-icon", Icon.RESTORE));
// add tooltip:
final Model<String> dateTooltip = hideTime ? Model.of(getString(CURRENT_DATE_TOOLTIP)) : Model.of(getString(CURRENT_DATE_TIME_TOOLTIP));
today.add(new AttributeModifier("title", dateTooltip));
// add text:
final Model<String> dateLabel = hideTime ? Model.of(getString(CURRENT_DATE_LABEL)): Model.of(getString(CURRENT_DATE_TIME_LABEL));
today.add(new Label("current-date-label", dateLabel));
//Add change behavior to super fields
for (final String name : new String[]{"date", "hours", "minutes", "amOrPmChoice"}) {
......@@ -147,7 +157,7 @@ public class YuiDateTimeField extends DateTimeField {
// hide the minutes field to prevent wicket.ajax javascript errors
this.hideTime = hideTime;
private int calculateDateLength() {
set-to-current-date=Set to now
set-to-current-date-tooltip=Click to set current date and time
set-to-current-date-only=Set to today
set-to-current-date-only-tooltip=Click to set current date
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment