diff options
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/index.php | 2 | ||||
| -rw-r--r-- | apps/calendar/js/calendar.js | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/apps/calendar/index.php b/apps/calendar/index.php index e8e214c0b75..12b51f564b4 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -32,6 +32,8 @@ if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'mont OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar'); OC_Util::addStyle('3rdparty/fullcalendar', 'fullcalendar'); +OC_Util::addScript('3rdparty/timepicker', 'jquery.ui.timepicker'); +OC_Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker'); if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone") == null || OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezonedetection') == 'true'){ OC_UTIL::addScript('calendar', 'geo'); } diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 33a78b3e322..8fb628a205c 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -26,6 +26,12 @@ Calendar={ $( "#to" ).datepicker({ dateFormat : 'dd-mm-yy' }); + $('#fromtime').timepicker({ + showPeriodLabels: false + }); + $('#totime').timepicker({ + showPeriodLabels: false + }); $('#category').multiselect({ header: false, noneSelectedText: $('#category').attr('title'), |