From 69c9f4f9399a3e69f736d46ed232fc4fc6ee033b Mon Sep 17 00:00:00 2001 From: Mischa Date: Fri, 19 Jun 2026 20:42:41 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20trip=20page=20matches=20home=20layout?= =?UTF-8?q?=20=E2=80=94=20sticky=20map=20+=20feed,=20GPX=20route,=20no=20s?= =?UTF-8?q?idebar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Same home-layout (45% sticky map / 55% scrollable feed) on every trip page - GPX route overlay loaded from trip page media - Marker click scrolls to entry card (same as home page) - Map sub-nav link removed (map is now embedded) - Separate /map page remains accessible by URL but has no nav link Co-Authored-By: Claude Sonnet 4.6 Claude-Session: https://claude.ai/code/session_01RB86BaJBG3eGiMdfhmHRrQ --- .../templates/partials/base.html.twig | 2 +- themes/intotheeast/templates/trip.html.twig | 140 ++++++++++++------ 2 files changed, 93 insertions(+), 49 deletions(-) diff --git a/themes/intotheeast/templates/partials/base.html.twig b/themes/intotheeast/templates/partials/base.html.twig index 7cc3a30..ba860f4 100644 --- a/themes/intotheeast/templates/partials/base.html.twig +++ b/themes/intotheeast/templates/partials/base.html.twig @@ -12,7 +12,7 @@ {{ assets.css()|raw }} {{ assets.js()|raw }} - +
into the east {% block nav %} diff --git a/themes/intotheeast/templates/trip.html.twig b/themes/intotheeast/templates/trip.html.twig index ea95525..22d033d 100644 --- a/themes/intotheeast/templates/trip.html.twig +++ b/themes/intotheeast/templates/trip.html.twig @@ -18,29 +18,50 @@ {% set journal_count = journal_entries|length %} {% set story_count = story_entries|length %} -
-

{{ 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 %} -

+{% set gpx_urls = [] %} +{% for name, media in page.media.all %} + {% if name|split('.')|last == 'gpx' %} + {% set gpx_urls = gpx_urls|merge([page.url ~ '/' ~ name]) %} {% endif %} -

- {{ journal_count }} journal {{ journal_count == 1 ? 'entry' : 'entries' }} - {% if story_count > 0 %} · {{ story_count }} {{ story_count == 1 ? 'story' : 'stories' }}{% endif %} -

-
+{% endfor %} - +{% set map_entries = [] %} +{% for item in all_items %} + {% if item.type == 'journal' and item.page.header.lat is not empty and item.page.header.lng is not empty %} + {% set map_entries = map_entries|merge([{ + 'lat': item.page.header.lat|number_format(6, '.', ''), + 'lng': item.page.header.lng|number_format(6, '.', ''), + 'slug': item.page.slug, + 'title': item.page.title + }]) %} + {% endif %} +{% endfor %} + +
+
+
+
+ +
+
+

{{ 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') }}{% else %} — Ongoing{% endif %} +

+ {% endif %} + + {{ journal_count }} journal {{ journal_count == 1 ? 'entry' : 'entries' }} + {% if story_count > 0 %} · {{ story_count }} {{ story_count == 1 ? 'story' : 'stories' }}{% endif %} + + +
-
-
{% if all_items|length > 0 %} {% for item in all_items %} @@ -53,7 +74,7 @@ {% endif %} {% if item.type == 'journal' %} -
- -
+ + + + + {% endblock %}