Author: solomax
Date: Tue Oct 11 03:30:14 2016
New Revision: 1764192
URL: http://svn.apache.org/viewvc?rev=1764192&view=rev
Log:
[OPENMEETINGS-1489] french calendar is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1764192&r1=1764191&r2=1764192&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Tue Oct 11 03:30:14 2016
@@ -39,6 +39,7 @@ import org.apache.wicket.ajax.AbstractAj
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.json.JSONArray;
import org.apache.wicket.ajax.json.JSONException;
+import org.apache.wicket.ajax.json.JSONObject;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -87,7 +88,7 @@ public class CalendarPanel extends UserP
Calendar getCalendar() {
return calendar;
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -103,14 +104,14 @@ public class CalendarPanel extends UserP
public CalendarPanel(String id) {
super(id);
-
+
final Form<Date> form = new Form<Date>("form");
add(form);
-
+
final AppointmentDialog dialog = new
AppointmentDialog("appointment", Application.getString(815)
, this, new
CompoundPropertyModel<Appointment>(getDefault()));
add(dialog);
-
+
boolean isRtl = isRtl();
javaScriptAddDatepicker = String.format("addCalButton(%s,
'datepicker');", isRtl);
Options options = new Options();
@@ -122,11 +123,11 @@ public class CalendarPanel extends UserP
options.set("defaultEventMinutes", 60);
options.set("timeFormat", Options.asString("H(:mm)"));
- options.set("buttonText", "{month: '" +
Application.getString(801) +
- "', week: '" +
Application.getString(800) +
- "', day: '" +
Application.getString(799) +
- "', today: '"
+ Application.getString(1555) +
- "'}");
+ options.set("buttonText", new JSONObject()
+ .put("month", Application.getString(801))
+ .put("week", Application.getString(800))
+ .put("day", Application.getString(799))
+ .put("today",
Application.getString(1555)).toString());
JSONArray monthes = new JSONArray();
JSONArray shortMonthes = new JSONArray();
@@ -152,43 +153,42 @@ public class CalendarPanel extends UserP
options.set("dayNames", days.toString());
options.set("dayNamesShort", shortDays.toString());
options.set("firstDay",
getBean(ConfigurationDao.class).getConfValue(CONFIG_CALENDAR_FIRST_DAY,
String.class, "0"));
-
+
calendar = new Calendar("calendar", new AppointmentModel(),
options) {
private static final long serialVersionUID = 1L;
-
+
@Override
protected void onInitialize() {
super.onInitialize();
add(new
CalendarFunctionsBehavior(getMarkupId()));
}
-
+
@Override
public boolean isSelectable() {
return true;
}
-
+
@Override
public boolean isDayClickEnabled() {
return true;
}
-
+
@Override
public boolean isEventClickEnabled() {
return true;
}
-
+
@Override
public boolean isEventDropEnabled() {
return true;
}
-
+
@Override
public boolean isEventResizeEnabled() {
return true;
}
-
+
//no need to override onDayClick
-
@Override
public void onSelect(AjaxRequestTarget target,
CalendarView view, LocalDateTime start, LocalDateTime end, boolean allDay) {
Appointment a = getDefault();
@@ -201,18 +201,18 @@ public class CalendarPanel extends UserP
a.setStart(getDate(s));
a.setEnd(getDate(e));
dialog.setModelObjectWithAjaxTarget(a, target);
-
+
dialog.open(target);
}
-
+
@Override
public void onEventClick(AjaxRequestTarget target,
CalendarView view, int eventId) {
Appointment a = getDao().get((long)eventId);
dialog.setModelObjectWithAjaxTarget(a, target);
-
+
dialog.open(target);
}
-
+
@Override
public void onEventDrop(AjaxRequestTarget target, int
eventId, long delta, boolean allDay) {
AppointmentDao dao = getDao();
@@ -225,11 +225,11 @@ public class CalendarPanel extends UserP
cal.setTime(a.getStart());
cal.add(java.util.Calendar.MILLISECOND,
(int)delta); //FIXME?
a.setStart(cal.getTime());
-
+
cal.setTime(a.getEnd());
cal.add(java.util.Calendar.MILLISECOND,
(int)delta); //FIXME?
a.setEnd(cal.getTime());
-
+
dao.update(a, getUserId());
//FIXME add feedback info
}
@@ -245,16 +245,16 @@ public class CalendarPanel extends UserP
cal.setTime(a.getEnd());
cal.add(java.util.Calendar.MILLISECOND,
(int)delta); //FIXME?
a.setEnd(cal.getTime());
-
+
dao.update(a, getUserId());
//FIXME add feedback info
}
};
-
+
form.add(calendar);
add(refreshTimer);
}
-
+
private static Appointment getDefault() {
Appointment a = new Appointment();
a.setReminder(Reminder.ical); //TODO: Make configurable
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1764192&r1=1764191&r2=1764192&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Tue Oct 11 03:30:14 2016
@@ -45,6 +45,7 @@ import org.apache.wicket.ajax.AjaxEventB
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.json.JSONArray;
import org.apache.wicket.ajax.json.JSONException;
+import org.apache.wicket.ajax.json.JSONObject;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -158,11 +159,11 @@ public class CalendarPanel extends UserP
options.set("defaultEventMinutes", 60);
options.set("timeFormat", Options.asString("H(:mm)"));
- options.set("buttonText", "{month: '" +
Application.getString(801) +
- "', week: '" +
Application.getString(800) +
- "', day: '" +
Application.getString(799) +
- "', today: '"
+ Application.getString(1555) +
- "'}");
+ options.set("buttonText", new JSONObject()
+ .put("month", Application.getString(801))
+ .put("week", Application.getString(800))
+ .put("day", Application.getString(799))
+ .put("today",
Application.getString(1555)).toString());
JSONArray monthes = new JSONArray();
JSONArray shortMonthes = new JSONArray();
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1764192&r1=1764191&r2=1764192&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Tue Oct 11 03:30:14 2016
@@ -45,6 +45,7 @@ import org.apache.wicket.ajax.AjaxEventB
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.json.JSONArray;
import org.apache.wicket.ajax.json.JSONException;
+import org.apache.wicket.ajax.json.JSONObject;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -158,11 +159,11 @@ public class CalendarPanel extends UserP
options.set("defaultEventMinutes", 60);
options.set("timeFormat", Options.asString("H(:mm)"));
- options.set("buttonText", "{month: '" +
Application.getString(801) +
- "', week: '" +
Application.getString(800) +
- "', day: '" +
Application.getString(799) +
- "', today: '"
+ Application.getString(1555) +
- "'}");
+ options.set("buttonText", new JSONObject()
+ .put("month", Application.getString(801))
+ .put("week", Application.getString(800))
+ .put("day", Application.getString(799))
+ .put("today",
Application.getString(1555)).toString());
JSONArray monthes = new JSONArray();
JSONArray shortMonthes = new JSONArray();
