From c425ea2a6c04a0da624615f65cbdb30f7c7dad50 Mon Sep 17 00:00:00 2001 From: Nedislav Kamburov Date: Fri, 15 Jan 2021 10:53:04 +0200 Subject: [PATCH 1/3] fix datetime() fro ProcessWire 3.x --- Calendar/Calendar.module | 4 ++-- ProcessCalendarAdmin/ProcessCalendarAdmin.module | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Calendar/Calendar.module b/Calendar/Calendar.module index 8866929..1930176 100644 --- a/Calendar/Calendar.module +++ b/Calendar/Calendar.module @@ -82,10 +82,10 @@ class Calendar extends WireData implements Module { $event_end_timestamp = (int)$e->getUnformatted(self::EVENT_END_FIELD); // start/end DateTime objects - $start_datetime = new DateTime(); + $start_datetime = new \DateTime(); $start_datetime->setTimestamp($event_start_timestamp); - $end_datetime = new DateTime(); + $end_datetime = new \DateTime(); $end_datetime->setTimestamp($event_end_timestamp); // generate recurrences by the RRULE diff --git a/ProcessCalendarAdmin/ProcessCalendarAdmin.module b/ProcessCalendarAdmin/ProcessCalendarAdmin.module index 296ccd9..f9e9bee 100644 --- a/ProcessCalendarAdmin/ProcessCalendarAdmin.module +++ b/ProcessCalendarAdmin/ProcessCalendarAdmin.module @@ -121,9 +121,9 @@ class ProcessCalendarAdmin extends Process { - + - + @@ -159,8 +159,8 @@ HTML; $end_input = $input->get('end'); // start / end dates - $start = new DateTime($start_input); - $end = new DateTime($end_input); + $start = new \DateTime($start_input); + $end = new \DateTime($end_input); // generate a list of json events for fullcalendar return $this->outputJsonEvents($start, $end); From 24297db503868239b134bb55eaa4d54e02405e44 Mon Sep 17 00:00:00 2001 From: Nedislav Kamburov Date: Fri, 15 Jan 2021 11:01:07 +0200 Subject: [PATCH 2/3] centered content in event edit box --- ProcessCalendarAdmin/ProcessCalendarAdmin.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ProcessCalendarAdmin/ProcessCalendarAdmin.css b/ProcessCalendarAdmin/ProcessCalendarAdmin.css index e18b762..8f40932 100644 --- a/ProcessCalendarAdmin/ProcessCalendarAdmin.css +++ b/ProcessCalendarAdmin/ProcessCalendarAdmin.css @@ -26,7 +26,7 @@ } .CalendarAdmin-loading { - background: #ffffff 10px 10px no-repeat url('images/ajax-loader.gif'); + background: #ffffff 10px 10px no-repeat url("images/ajax-loader.gif"); margin-left: 42px; line-height: 52px; } @@ -60,6 +60,11 @@ #CalendarAdmin-edit-event-dialog { display: none; padding: 15px; + text-align: center; +} + +.ui-dialog-buttonpane.ui-widget-content .ui-dialog-buttonset { + text-align: center; } /* notifications */ @@ -71,6 +76,6 @@ #CalendarAdmin-notification.success { background: #ddffdd; } -#CalendarAdmin-notification.error{ +#CalendarAdmin-notification.error { background: #ffdddd; } From 5d4770c9b9771fef907c6e50b855e8b29a8f8852 Mon Sep 17 00:00:00 2001 From: Nedislav Kamburov Date: Fri, 15 Jan 2021 21:08:04 +0200 Subject: [PATCH 3/3] updated DateTime to work with ProcessWire 3.x --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 067ddec..f2da3bb 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,9 @@ array(start, end, page) // get module $calendar = wire('modules')->getModule('Calendar'); // get upcoming events - 6 months ahead -$start = new DateTime(); -$until = new DateTime(); -$until->add(new DateInterval('P6M')); +$start = new \DateTime(); +$until = new \DateTime(); +$until->add(new \DateInterval('P6M')); $events = $calendar->expandEvents($start, $until); // render event echo '';