From 75d9f91d349697965f6566242da438f1d6311a76 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 14 Mar 2017 09:36:01 -0400 Subject: [PATCH] Fix time formats in detail view. Fixing the time format for detail time schedules. --- views/front/events/agenda.html | 4 +++- views/front/events/detail.html | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html index ecdf673..fd56b09 100644 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -34,7 +34,9 @@ {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} + {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"} + {/if} + {/if} {if $rec.name && $rec.name != 'Imported'} {$rec.name} diff --git a/views/front/events/detail.html b/views/front/events/detail.html index 3a34e02..367d9d0 100644 --- a/views/front/events/detail.html +++ b/views/front/events/detail.html @@ -64,11 +64,11 @@ {if !$event.all_day} - {if $rec.start_time.time == $rec.end_time.time} - {$rec.start_time.time} - {else} - {$rec.start_time.time} - {$rec.end_time.time} - {/if} + {if $rec.start_time.time == $rec.end_time.time} + {$rec.start_time.time|strtotime|date_format:"%l:%M %P"} + {else} + {$rec.start_time.time|strtotime|date_format:"%l:%M %P"} - {$rec.end_time.time|strtotime|date_format:"%l:%M %P"} + {/if} {/if} -- 2.17.1