From 71198c1d2498c5a262432a3b80a9fc8dd21bffbc Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 10 Jan 2019 12:40:07 -0500 Subject: [PATCH] Update view file From main plugin --- .../views/front/events/eventsFrontPage.html | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/glm-member-db-events/views/front/events/eventsFrontPage.html b/glm-member-db-events/views/front/events/eventsFrontPage.html index 46ba348..c1f266a 100644 --- a/glm-member-db-events/views/front/events/eventsFrontPage.html +++ b/glm-member-db-events/views/front/events/eventsFrontPage.html @@ -20,17 +20,23 @@
- {if $event.recurrences.0.from_date.timestamp|date_format:"%Y" != $event.recurrences.0.to_date.timestamp|date_format:"%Y"} - {$event.recurrences.0.from_date.timestamp|date_format:"%b %e, %Y"} - {elseif $event.recurrences.0.to_date.timestamp == $event.recurrences.0.from_date.timestamp} - {$event.recurrences.0.from_date.timestamp|date_format:"%b %e, %Y"} - {else} - {$event.recurrences.0.from_date.timestamp|date_format:"%b %e"} - {/if} - - {if $event.recurrences.0.to_date.timestamp != $event.recurrences.0.from_date.timestamp} - - {$event.recurrences.0.to_date.timestamp|date_format:"%b %e, %Y"} - {/if} + {$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.categories.0.name}
@@ -40,4 +46,4 @@ {/foreach} {/foreach} {/foreach} -
\ No newline at end of file + -- 2.17.1