Author: vdegtyarev
Date: Wed Aug 7 10:06:49 2013
New Revision: 1511234
URL: http://svn.apache.org/r1511234
Log:
OPENMEETINGS-742 is fixed. Datepicker is added to calendar.
Added:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/images/calendar.gif
(with props)
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1511234&r1=1511233&r2=1511234&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Wed
Aug 7 10:06:49 2013
@@ -895,3 +895,6 @@ tr.unread {
.fht-tbody {
background-color: white;
}
+#ui-datepicker-div{
+ z-index: 100 !important;
+}
Added:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/images/calendar.gif
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/images/calendar.gif?rev=1511234&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/images/calendar.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1511234&r1=1511233&r2=1511234&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Wed Aug 7 10:06:49 2013
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
@@ -48,6 +49,7 @@ public class CalendarPanel extends UserP
private static final Logger log =
Red5LoggerFactory.getLogger(CalendarPanel.class, webAppRootKey);
private static final long serialVersionUID = 1L;
private static final String javaScriptMarkup = "setCalendarHeight();";
+ private static final String javaScriptAddDatepicker =
"addCalButton('left', 'Datepicker', 'datepicker');";
private Calendar calendar;
@Override
@@ -73,6 +75,7 @@ public class CalendarPanel extends UserP
AjaxRequestTarget target =
getRequestCycle().find(AjaxRequestTarget.class);
if (target != null) {
target.appendJavaScript(javaScriptMarkup);
+ target.appendJavaScript(javaScriptAddDatepicker);
} else {
response.render(JavaScriptHeaderItem.forScript(javaScriptMarkup, this.getId()));
}
@@ -158,6 +161,9 @@ public class CalendarPanel extends UserP
@Override
public void onSelect(AjaxRequestTarget target,
CalendarView view, Date start, Date end, boolean allDay) {
+ SimpleDateFormat formatDateJava = new
SimpleDateFormat("MM/dd/yy");
+ String date = formatDateJava.format(start);
+
target.appendJavaScript("setDatepickerDate('datepicker','" + date + "');");
Appointment a = getDefault();
if (CalendarView.month == view &&
start.equals(end)) {
java.util.Calendar now =
WebSession.getCalendar();
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1511234&r1=1511233&r2=1511234&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
Wed Aug 7 10:06:49 2013
@@ -34,3 +34,40 @@ $(function() {
$(window).load(function() { setCalendarHeight(); } );
$(window).resize(function() { setCalendarHeight(); } );
});
+
+function addCalButton(where, text, id) {
+ var my_button = '<span class="fc-header-space"></span>' +
+ '<span class="fc-button fc-button-nextYear fc-state-default
fc-corner-right" unselectable="on">' +
+ '<input type="text" id="' + id + '" value="' + text +'"
/></span>';
+ $("td.fc-header-" + where).append(my_button);
+
+ var dp = $("#"+id);
+ dp.datepicker({
+ showOn: "button",
+ buttonImage: "images/calendar.gif",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true,
+ changeDay: true,
+ onChangeMonthYear: function(year, month, inst) {
+ var date = new Date();
+ $('#${markupId}').fullCalendar('gotoDate', year, month-1,
date.getDate());
+ },
+ onSelect: function(dateText, inst) {
+ var date = new Date(dateText);
+ $('#${markupId}').fullCalendar('gotoDate',
date.getFullYear(), date.getMonth(), date.getDate());
+ }
+ });
+
+ dp.datepicker("option", "dayNames",
$('#${markupId}').fullCalendar("option","dayNames"));
+ dp.datepicker("option", "dayNamesShort",
$('#${markupId}').fullCalendar("option","dayNamesShort"));
+ dp.datepicker("option", "dayNamesMin",
$('#${markupId}').fullCalendar("option","dayNamesShort"));
+ dp.datepicker("option", "monthNames",
$('#${markupId}').fullCalendar("option","monthNames"));
+ dp.datepicker("option", "monthNamesShort",
$('#${markupId}').fullCalendar("option","monthNamesShort"));
+
+ dp.hide();
+}
+
+function setDatepickerDate(id, date) {
+ $("#"+id).datepicker('setDate', date);
+}
