Bring in changes from event plugin

Updating to use times instead of dates.

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 (file)
--- a/glm-member-db-events/views/front/events/eventsFrontPage.html
+++ b/glm-member-db-events/views/front/events/eventsFrontPage.html
@@ -20,7 +20,23 @@
                     </div>
                 </a>
                 <div class="{if !$event.image}sidebar-full-width{/if} glm-events-frontpage-event-dates">
-                    {$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}
                 </div>
                 <div class="{if !$event.image}sidebar-full-width{/if} glm-events-frontpage-event-content">
                     {$event.intro}
@@ -29,4 +45,4 @@
             {/foreach}
         {/foreach}
     {/foreach}
-</div>
\ No newline at end of file
+</div>