From 908c8af6cd082cbca6d0f7c47571ff482f99725b Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 10 Jan 2019 12:55:45 -0500 Subject: [PATCH] Bring in changes from event plugin Updating to use times instead of dates. --- .../views/front/events/eventsFrontPage.html | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/glm-member-db-events/views/front/events/eventsFrontPage.html b/glm-member-db-events/views/front/events/eventsFrontPage.html index 4527b8b..5abab56 100644 --- a/glm-member-db-events/views/front/events/eventsFrontPage.html +++ b/glm-member-db-events/views/front/events/eventsFrontPage.html @@ -20,7 +20,23 @@
- {$event.dates} + {$eventDateTime = $event.starting_date|date_format:"%I:%M %P"} + {foreach $event.recurrences as $rec} + {$start_time = $rec.start_time.time} + {if $start_time == $eventDateTime} + {if ($rec.from_date.timestamp == $rec.to_date.timestamp && $rec.from_date.timestamp == $date) or ($date <= $rec.to_date.timestamp && $date >= $rec.from_date.timestamp )} + {if !$event.all_day} + {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"} + {$event.starting_date|date_format:"%l:%M %P"} + {else} + {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"} + {/if} + {else} + All Day + {/if} + {/if} + {/if} + {/foreach}
{$event.intro} @@ -29,4 +45,4 @@ {/foreach} {/foreach} {/foreach} -
\ No newline at end of file + -- 2.17.1