From 50a5f2d1780a90d48e78ce4d9a122ac42389acd7 Mon Sep 17 00:00:00 2001 From: Mischa Date: Fri, 19 Jun 2026 01:27:39 +0200 Subject: [PATCH] feat: add trip/trips/stories templates, update nav and map/stats to use trip-relative paths - Rename tracker.html.twig to dailies.html.twig; update dailies.md template key - Fix map.html.twig and stats.html.twig: find dailies via page.parent().route - Update base.html.twig nav to use config.site.active_trip for all hrefs - Fix dailies.html.twig mini-map link to use page.parent().url/map - Create trip.html.twig, trips.html.twig, stories.html.twig Co-Authored-By: Claude Sonnet 4.6 --- .../japan-korea-2026/01.dailies/dailies.md | 2 +- .../{tracker.html.twig => dailies.html.twig} | 2 +- themes/intotheeast/templates/map.html.twig | 2 +- .../templates/partials/base.html.twig | 8 +++-- themes/intotheeast/templates/stats.html.twig | 2 +- .../intotheeast/templates/stories.html.twig | 6 ++++ themes/intotheeast/templates/trip.html.twig | 36 +++++++++++++++++++ themes/intotheeast/templates/trips.html.twig | 22 ++++++++++++ 8 files changed, 73 insertions(+), 7 deletions(-) rename themes/intotheeast/templates/{tracker.html.twig => dailies.html.twig} (98%) create mode 100644 themes/intotheeast/templates/stories.html.twig create mode 100644 themes/intotheeast/templates/trip.html.twig create mode 100644 themes/intotheeast/templates/trips.html.twig diff --git a/pages/01.trips/japan-korea-2026/01.dailies/dailies.md b/pages/01.trips/japan-korea-2026/01.dailies/dailies.md index d355b35..cac4b59 100644 --- a/pages/01.trips/japan-korea-2026/01.dailies/dailies.md +++ b/pages/01.trips/japan-korea-2026/01.dailies/dailies.md @@ -1,6 +1,6 @@ --- title: 'The Journey' -template: tracker +template: dailies content: items: '@self.children' order: diff --git a/themes/intotheeast/templates/tracker.html.twig b/themes/intotheeast/templates/dailies.html.twig similarity index 98% rename from themes/intotheeast/templates/tracker.html.twig rename to themes/intotheeast/templates/dailies.html.twig index 17269f0..8af0070 100644 --- a/themes/intotheeast/templates/tracker.html.twig +++ b/themes/intotheeast/templates/dailies.html.twig @@ -19,7 +19,7 @@ {% if map_entries|length > 0 %}
- View full map โ†’ + View full map โ†’
diff --git a/themes/intotheeast/templates/map.html.twig b/themes/intotheeast/templates/map.html.twig index 3342bf8..0c13960 100644 --- a/themes/intotheeast/templates/map.html.twig +++ b/themes/intotheeast/templates/map.html.twig @@ -1,7 +1,7 @@ {% extends 'partials/base.html.twig' %} {% block content %} -{% set tracker_page = grav.pages.find('/tracker') %} +{% set tracker_page = grav.pages.find(page.parent().route ~ '/dailies') %} {% set all_entries = tracker_page ? tracker_page.children.published() : [] %} {% set map_entries = [] %} diff --git a/themes/intotheeast/templates/partials/base.html.twig b/themes/intotheeast/templates/partials/base.html.twig index 12650b1..67c9cf2 100644 --- a/themes/intotheeast/templates/partials/base.html.twig +++ b/themes/intotheeast/templates/partials/base.html.twig @@ -15,10 +15,12 @@
into the east + {% set active_trip = config.site.active_trip %} + {% set trip_base = '/trips/' ~ active_trip %}
diff --git a/themes/intotheeast/templates/stats.html.twig b/themes/intotheeast/templates/stats.html.twig index 5a4eb34..9a83c33 100644 --- a/themes/intotheeast/templates/stats.html.twig +++ b/themes/intotheeast/templates/stats.html.twig @@ -1,7 +1,7 @@ {% extends 'partials/base.html.twig' %} {% block content %} -{% set tracker_page = grav.pages.find('/tracker') %} +{% set tracker_page = grav.pages.find(page.parent().route ~ '/dailies') %} {% set all_entries = tracker_page ? tracker_page.children.published() : [] %} {# Basic counts #} diff --git a/themes/intotheeast/templates/stories.html.twig b/themes/intotheeast/templates/stories.html.twig new file mode 100644 index 0000000..08fd1dc --- /dev/null +++ b/themes/intotheeast/templates/stories.html.twig @@ -0,0 +1,6 @@ +{% extends 'partials/base.html.twig' %} + +{% block content %} +

{{ page.title }}

+

Stories coming soon.

+{% endblock %} diff --git a/themes/intotheeast/templates/trip.html.twig b/themes/intotheeast/templates/trip.html.twig new file mode 100644 index 0000000..c61c60c --- /dev/null +++ b/themes/intotheeast/templates/trip.html.twig @@ -0,0 +1,36 @@ +{% extends 'partials/base.html.twig' %} + +{% block content %} +{% set tracker_page = grav.pages.find(page.route ~ '/dailies') %} +{% set entries = tracker_page ? tracker_page.children.published() : [] %} + +
+

{{ page.title }}

+ {% if page.header.date_start %} +

+ {{ page.header.date_start|date('d M Y') }} + {% if page.header.date_end %} โ€” {{ page.header.date_end|date('d M Y') }}{% endif %} +

+ {% endif %} +
+ + + +{% if entries|length > 0 %} +
+

Recent entries

+ {% for entry in entries|slice(0, 3) %} + + {{ entry.date|date('d M Y') }} + {{ entry.title }} + {% if entry.header.location_city %} ยท {{ entry.header.location_city }}{% endif %} + + {% endfor %} +
+{% endif %} +{% endblock %} diff --git a/themes/intotheeast/templates/trips.html.twig b/themes/intotheeast/templates/trips.html.twig new file mode 100644 index 0000000..386cefb --- /dev/null +++ b/themes/intotheeast/templates/trips.html.twig @@ -0,0 +1,22 @@ +{% extends 'partials/base.html.twig' %} + +{% block content %} +

{{ page.title }}

+{% set trips = page.children.published() %} +{% if trips|length == 0 %} +

No trips yet.

+{% else %} + +{% endif %} +{% endblock %}