Updating the times and dates in agenda view

Showing each recurrence

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index dbafa78..cc9b86c 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -23,16 +23,15 @@
                                 <div class="small-12 columns">
                                         <h2 class="agenda-event-name">{$event.name}</h2>
                                         {foreach $event.recurrences as $rec}
-                                            {if $rec.start_time.time == $event.starting_date|date_format:"%I:%M %P"}
                                                 {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 )}
                                                     <div class='date-range-container'>
                                                         {if !$event.all_day}
                                                             {$showTime = false}
-                                                            {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"}
+                                                            {if $rec.start_time.time == $rec.end_time.time}
+                                                                {$rec.start_time.time}
                                                             {else}
-                                                                {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}                                                                                   {/if}
+                                                                {$rec.start_time.time} - {$rec.end_time.time}                                                                                                                                 {/if}
                                                         {/if}
                                                         {if $rec.name && $rec.name != 'Imported'}
                                                             {$rec.name}
@@ -49,11 +48,11 @@
                                                     <span class="agenda-days-of-week">
                                                         on
                                                         {foreach $rec.day_of_week.names as $day}
-                                                        {if $day == "Thursday"}
-                                                            <span class="agenda-event-weekday"> {$day|substr:0:4} </span>
-                                                         {else}
-                                                            <span class="agenda-event-weekday"> {$day|substr:0:3} </span>
-                                                         {/if}
+                                                            {if $day == "Thursday"}
+                                                                <span class="agenda-event-weekday"> {$day|substr:0:4} </span>
+                                                             {else}
+                                                                <span class="agenda-event-weekday"> {$day|substr:0:3} </span>
+                                                             {/if}
                                                          {/foreach}
 
                                                     </span>
@@ -61,7 +60,6 @@
                                                      )
                                                     </div>
                                                 {/if}
-                                            {/if}
                                         {/foreach}
                                     <div class="day-times-wrapper">
                                         {if !$event.all_day && $showTime}