From 19539b9a2b4b9b3e6f85a69b8d958705889a06fd Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Fri, 12 May 2017 13:05:49 -0400 Subject: [PATCH] removing occurring text from agenda list and detail view if there is only one date if an event isn't recurring then removing the occuring text from the list view and the detail view --- views/front/events/agenda.html | 3 ++- views/front/events/detail.html | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html index 759ade9..4e14d15 100644 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -41,7 +41,8 @@ {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } {$rec.name} {/if} - ( Occurring {$rec.from_date.date} + ( {if $event.times|@count > 1} Occurring {/if} + {$rec.from_date.date} {if $rec.from_date.date != $rec.to_date.date} - {$rec.to_date.date} {else if $rec.specific_dates} diff --git a/views/front/events/detail.html b/views/front/events/detail.html index 5af2606..71067bb 100644 --- a/views/front/events/detail.html +++ b/views/front/events/detail.html @@ -76,7 +76,10 @@ {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } {$rec.name} {/if} - ( Occurring + + ( {if $event.recurrences.0.recurring.value == 1} Occurring {/if} + + {$rec.from_date.timestamp|date_format:"%m/%d/%Y"} {if $rec.from_date.date != $rec.to_date.date} - {$rec.to_date.timestamp|date_format:"%m/%d/%Y"} -- 2.17.1