You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/04/02 14:31:10 UTC
svn commit: r1789886 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/
trunk/openmeetings-web/src/m...
Author: solomax
Date: Sun Apr 2 14:31:10 2017
New Revision: 1789886
URL: http://svn.apache.org/viewvc?rev=1789886&view=rev
Log:
[OPENMEETINGS-1610] time picker should be fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java?rev=1789886&r1=1789885&r2=1789886&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java Sun Apr 2 14:31:10 2017
@@ -28,7 +28,6 @@ import org.apache.wicket.markup.head.IHe
import org.apache.wicket.model.IModel;
import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.kendo.ui.KendoCultureHeaderItem;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DateTimePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.TimePicker;
@@ -37,22 +36,27 @@ public class OmDateTimePicker extends Da
private static final long serialVersionUID = 1L;
public OmDateTimePicker(String id, IModel<LocalDateTime> model) {
- super(id, model);
+ super(id, model, WebSession.get().getLocale());
}
@Override
protected DatePicker newDatePicker(String id, IModel<LocalDate> model, Locale locale, String datePattern, Options options) {
- return new DatePicker(id, model, WebSession.get().getLocale());
+ DatePicker dp = super.newDatePicker(id, model, locale, datePattern, options);
+ dp.setLabel(getLabel());
+ return dp;
}
@Override
protected TimePicker newTimePicker(String id, IModel<LocalTime> model, Locale locale, String timePattern, Options options) {
- return new TimePicker(id, model, WebSession.get().getLocale());
+ TimePicker tp = super.newTimePicker(id, model, locale, timePattern, options);
+ tp.setLabel(getLabel());
+ return tp;
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale()));
+ //FIXME TODO this is remain here until localized AM/PM will be correctly handled
+ //response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale()));
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1789886&r1=1789885&r2=1789886&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Sun Apr 2 14:31:10 2017
@@ -375,7 +375,6 @@ public class AppointmentDialog extends A
add(feedback.setOutputMarkupId(true));
//General
add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572))));
- add(start.setRequired(true), end.setRequired(true));
add(ownerPanel.add(owner));
boolean showGroups = AuthLevelUtil.hasAdminLevel(getRights());
add(rdi.add(new AjaxFormChoiceComponentUpdatingBehavior() {
@@ -476,6 +475,13 @@ public class AppointmentDialog extends A
add(cals.setNullValid(true).setLabel(Model.of("calendar")).setOutputMarkupId(true));
}
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(start.setLabel(Model.of(getString("570"))).setRequired(true)
+ , end.setLabel(Model.of(getString("571"))).setRequired(true));
+ }
+
private List<Room> getRoomList() {
//FIXME need to be reviewed
List<Room> result = new ArrayList<>();
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java?rev=1789886&r1=1789885&r2=1789886&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java Sun Apr 2 14:31:10 2017
@@ -28,7 +28,6 @@ import org.apache.wicket.markup.head.IHe
import org.apache.wicket.model.IModel;
import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.kendo.ui.KendoCultureHeaderItem;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DateTimePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.TimePicker;
@@ -37,22 +36,27 @@ public class OmDateTimePicker extends Da
private static final long serialVersionUID = 1L;
public OmDateTimePicker(String id, IModel<LocalDateTime> model) {
- super(id, model);
+ super(id, model, WebSession.get().getLocale());
}
@Override
protected DatePicker newDatePicker(String id, IModel<LocalDate> model, Locale locale, String datePattern, Options options) {
- return new DatePicker(id, model, WebSession.get().getLocale());
+ DatePicker dp = super.newDatePicker(id, model, locale, datePattern, options);
+ dp.setLabel(getLabel());
+ return dp;
}
@Override
protected TimePicker newTimePicker(String id, IModel<LocalTime> model, Locale locale, String timePattern, Options options) {
- return new TimePicker(id, model, WebSession.get().getLocale());
+ TimePicker tp = super.newTimePicker(id, model, locale, timePattern, options);
+ tp.setLabel(getLabel());
+ return tp;
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale()));
+ //FIXME TODO this is remain here until localized AM/PM will be correctly handled
+ //response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale()));
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1789886&r1=1789885&r2=1789886&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Sun Apr 2 14:31:10 2017
@@ -375,7 +375,6 @@ public class AppointmentDialog extends A
add(feedback.setOutputMarkupId(true));
//General
add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572))));
- add(start.setRequired(true), end.setRequired(true));
add(ownerPanel.add(owner));
boolean showGroups = AuthLevelUtil.hasAdminLevel(getRights());
add(rdi.add(new AjaxFormChoiceComponentUpdatingBehavior() {
@@ -476,6 +475,13 @@ public class AppointmentDialog extends A
add(cals.setNullValid(true).setLabel(Model.of("calendar")).setOutputMarkupId(true));
}
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(start.setLabel(Model.of(getString("570"))).setRequired(true)
+ , end.setLabel(Model.of(getString("571"))).setRequired(true));
+ }
+
private List<Room> getRoomList() {
//FIXME need to be reviewed
List<Room> result = new ArrayList<>();