diff --git a/themes/intotheeast/blueprints/story.yaml b/themes/intotheeast/blueprints/story.yaml index 770b86b..0d25825 100644 --- a/themes/intotheeast/blueprints/story.yaml +++ b/themes/intotheeast/blueprints/story.yaml @@ -27,7 +27,7 @@ form: header.end_date: type: datetime label: End Date - format: 'Y-m-d H:i' + format: 'Y-m-d' help: 'Optional — leave blank for a single-day story' header.hero_image: diff --git a/themes/intotheeast/templates/story.html.twig b/themes/intotheeast/templates/story.html.twig index 9ea650f..bba0b5c 100644 --- a/themes/intotheeast/templates/story.html.twig +++ b/themes/intotheeast/templates/story.html.twig @@ -13,7 +13,19 @@ {% set date_str = page.date|date('d M Y') %} {% if page.header.end_date %} - {% set date_str = page.date|date('d M Y') ~ ' – ' ~ page.header.end_date|date('d M Y') %} + {% set sd = page.date|date('d') %} + {% set sm = page.date|date('M') %} + {% set sy = page.date|date('Y') %} + {% set ed = page.header.end_date|date('d') %} + {% set em = page.header.end_date|date('M') %} + {% set ey = page.header.end_date|date('Y') %} + {% if sy == ey and sm == em %} + {% set date_str = sd ~ ' – ' ~ ed ~ ' ' ~ em ~ ' ' ~ ey %} + {% elseif sy == ey %} + {% set date_str = sd ~ ' ' ~ sm ~ ' – ' ~ ed ~ ' ' ~ em ~ ' ' ~ ey %} + {% else %} + {% set date_str = sd ~ ' ' ~ sm ~ ' ' ~ sy ~ ' – ' ~ ed ~ ' ' ~ em ~ ' ' ~ ey %} + {% endif %} {% endif %} {% set location = page.header.location_name ?? '' %}