diff --git a/docs/demo/trips/italy-2026-demo/dailies/dailies.md b/docs/demo/trips/italy-2026-demo/dailies/dailies.md index ec7fab2..8c68fe3 100644 --- a/docs/demo/trips/italy-2026-demo/dailies/dailies.md +++ b/docs/demo/trips/italy-2026-demo/dailies/dailies.md @@ -1,6 +1,8 @@ --- title: Journal -template: dailies +template: default +routable: false +visible: false content: items: '@self.children' order: diff --git a/docs/demo/trips/italy-2026-demo/map.md b/docs/demo/trips/italy-2026-demo/map.md deleted file mode 100644 index af33e43..0000000 --- a/docs/demo/trips/italy-2026-demo/map.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Map' -template: map ---- diff --git a/docs/demo/trips/italy-2026-demo/stats.md b/docs/demo/trips/italy-2026-demo/stats.md deleted file mode 100644 index 1a772e7..0000000 --- a/docs/demo/trips/italy-2026-demo/stats.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Stats' -template: stats ---- diff --git a/docs/demo/trips/italy-2026-demo/stories.md b/docs/demo/trips/italy-2026-demo/stories.md index e8bbdb1..64f8514 100644 --- a/docs/demo/trips/italy-2026-demo/stories.md +++ b/docs/demo/trips/italy-2026-demo/stories.md @@ -1,5 +1,7 @@ --- title: Stories -template: stories +template: default +routable: false +visible: false published: true --- diff --git a/pages/01.trips/central-asia-2023/01.dailies/dailies.md b/pages/01.trips/central-asia-2023/01.dailies/dailies.md index cac4b59..657178e 100644 --- a/pages/01.trips/central-asia-2023/01.dailies/dailies.md +++ b/pages/01.trips/central-asia-2023/01.dailies/dailies.md @@ -1,6 +1,8 @@ --- title: 'The Journey' -template: dailies +template: default +routable: false +visible: false content: items: '@self.children' order: diff --git a/pages/01.trips/central-asia-2023/02.map/map.md b/pages/01.trips/central-asia-2023/02.map/map.md deleted file mode 100644 index af33e43..0000000 --- a/pages/01.trips/central-asia-2023/02.map/map.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Map' -template: map ---- diff --git a/pages/01.trips/central-asia-2023/03.stats/stats.md b/pages/01.trips/central-asia-2023/03.stats/stats.md deleted file mode 100644 index 1a772e7..0000000 --- a/pages/01.trips/central-asia-2023/03.stats/stats.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Stats' -template: stats ---- diff --git a/pages/01.trips/central-asia-2023/04.stories/stories.md b/pages/01.trips/central-asia-2023/04.stories/stories.md index e8bbdb1..64f8514 100644 --- a/pages/01.trips/central-asia-2023/04.stories/stories.md +++ b/pages/01.trips/central-asia-2023/04.stories/stories.md @@ -1,5 +1,7 @@ --- title: Stories -template: stories +template: default +routable: false +visible: false published: true --- diff --git a/pages/01.trips/italy-2025/01.dailies/dailies.md b/pages/01.trips/italy-2025/01.dailies/dailies.md index cac4b59..657178e 100644 --- a/pages/01.trips/italy-2025/01.dailies/dailies.md +++ b/pages/01.trips/italy-2025/01.dailies/dailies.md @@ -1,6 +1,8 @@ --- title: 'The Journey' -template: dailies +template: default +routable: false +visible: false content: items: '@self.children' order: diff --git a/pages/01.trips/italy-2025/02.map/map.md b/pages/01.trips/italy-2025/02.map/map.md deleted file mode 100644 index af33e43..0000000 --- a/pages/01.trips/italy-2025/02.map/map.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Map' -template: map ---- diff --git a/pages/01.trips/italy-2025/03.stats/stats.md b/pages/01.trips/italy-2025/03.stats/stats.md deleted file mode 100644 index 1a772e7..0000000 --- a/pages/01.trips/italy-2025/03.stats/stats.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Stats' -template: stats ---- diff --git a/pages/01.trips/italy-2025/04.stories/stories.md b/pages/01.trips/italy-2025/04.stories/stories.md index e8bbdb1..64f8514 100644 --- a/pages/01.trips/italy-2025/04.stories/stories.md +++ b/pages/01.trips/italy-2025/04.stories/stories.md @@ -1,5 +1,7 @@ --- title: Stories -template: stories +template: default +routable: false +visible: false published: true --- diff --git a/pages/01.trips/slovenia-2024/01.dailies/dailies.md b/pages/01.trips/slovenia-2024/01.dailies/dailies.md index cac4b59..657178e 100644 --- a/pages/01.trips/slovenia-2024/01.dailies/dailies.md +++ b/pages/01.trips/slovenia-2024/01.dailies/dailies.md @@ -1,6 +1,8 @@ --- title: 'The Journey' -template: dailies +template: default +routable: false +visible: false content: items: '@self.children' order: diff --git a/pages/01.trips/slovenia-2024/02.map/map.md b/pages/01.trips/slovenia-2024/02.map/map.md deleted file mode 100644 index af33e43..0000000 --- a/pages/01.trips/slovenia-2024/02.map/map.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Map' -template: map ---- diff --git a/pages/01.trips/slovenia-2024/03.stats/stats.md b/pages/01.trips/slovenia-2024/03.stats/stats.md deleted file mode 100644 index 1a772e7..0000000 --- a/pages/01.trips/slovenia-2024/03.stats/stats.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Stats' -template: stats ---- diff --git a/pages/01.trips/slovenia-2024/04.stories/stories.md b/pages/01.trips/slovenia-2024/04.stories/stories.md index e8bbdb1..64f8514 100644 --- a/pages/01.trips/slovenia-2024/04.stories/stories.md +++ b/pages/01.trips/slovenia-2024/04.stories/stories.md @@ -1,5 +1,7 @@ --- title: Stories -template: stories +template: default +routable: false +visible: false published: true --- diff --git a/pages/01.trips/us-canada-mex-2024/01.dailies/dailies.md b/pages/01.trips/us-canada-mex-2024/01.dailies/dailies.md index cac4b59..657178e 100644 --- a/pages/01.trips/us-canada-mex-2024/01.dailies/dailies.md +++ b/pages/01.trips/us-canada-mex-2024/01.dailies/dailies.md @@ -1,6 +1,8 @@ --- title: 'The Journey' -template: dailies +template: default +routable: false +visible: false content: items: '@self.children' order: diff --git a/pages/01.trips/us-canada-mex-2024/02.map/map.md b/pages/01.trips/us-canada-mex-2024/02.map/map.md deleted file mode 100644 index af33e43..0000000 --- a/pages/01.trips/us-canada-mex-2024/02.map/map.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Map' -template: map ---- diff --git a/pages/01.trips/us-canada-mex-2024/03.stats/stats.md b/pages/01.trips/us-canada-mex-2024/03.stats/stats.md deleted file mode 100644 index 1a772e7..0000000 --- a/pages/01.trips/us-canada-mex-2024/03.stats/stats.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: 'Trip Stats' -template: stats ---- diff --git a/pages/01.trips/us-canada-mex-2024/04.stories/stories.md b/pages/01.trips/us-canada-mex-2024/04.stories/stories.md index e8bbdb1..64f8514 100644 --- a/pages/01.trips/us-canada-mex-2024/04.stories/stories.md +++ b/pages/01.trips/us-canada-mex-2024/04.stories/stories.md @@ -1,5 +1,7 @@ --- title: Stories -template: stories +template: default +routable: false +visible: false published: true --- diff --git a/themes/intotheeast/templates/dailies.html.twig b/themes/intotheeast/templates/dailies.html.twig deleted file mode 100644 index 5d3dc0b..0000000 --- a/themes/intotheeast/templates/dailies.html.twig +++ /dev/null @@ -1,70 +0,0 @@ -{% extends 'default.html.twig' %} - -{% block map_assets %} -{% do assets.addCss('theme://css-compiled/map.css') %} -{% do assets.addJs('theme://js/map.js', {group: 'bottom'}) %} -{% endblock %} - -{% block content %} -{% set journal_entries = page.collection() %} -{% set stories_page = grav.pages.find(page.parent().route ~ '/stories') %} -{% set story_entries = stories_page ? stories_page.children.published() : [] %} - -{% set all_items = [] %} -{% for e in journal_entries %} - {% set all_items = all_items|merge([{'type': 'journal', 'page': e, 'date': e.date}]) %} -{% endfor %} -{% for s in story_entries %} - {% set all_items = all_items|merge([{'type': 'story', 'page': s, 'date': s.date}]) %} -{% endfor %} - -{# page.collection() returns date-descending; reverse to match ascending default on trip page. #} -{% set all_items = all_items|reverse %} - -{# Collect GPS entries for mini-map #} -{% 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, - 'lng': item.page.header.lng, - 'title': item.page.title, - 'slug': item.page.slug, - 'url': item.page.url, - 'force_connect': item.page.header.force_connect ? true : false, - 'transport_mode': item.page.header.transport_mode ? item.page.header.transport_mode : null - }]) %} - {% endif %} -{% endfor %} - -{% set trip_page = page.parent() %} - -{% include 'partials/feed-map.html.twig' with { - 'map_entries': map_entries, - 'map_id': 'feed-map', - 'map_var': 'feedMap', - 'link_href': page.parent().url ~ '/map', - 'card_prefix': 'entry-', - 'trip_page': trip_page, - 'show_journey': true -} only %} - -
- -
-
- {% if all_items|length > 0 %} - {% for item in all_items %} - {% set entry = item.page %} - {% if item.type == 'journal' %} - {% include 'partials/entry-journal.html.twig' %} - {% else %} - {% include 'partials/entry-story.html.twig' %} - {% endif %} - {% endfor %} - {% else %} -

No entries yet. The journey is about to begin.

- {% endif %} -
- -{% endblock %} diff --git a/themes/intotheeast/templates/map.html.twig b/themes/intotheeast/templates/map.html.twig deleted file mode 100644 index 2fd8119..0000000 --- a/themes/intotheeast/templates/map.html.twig +++ /dev/null @@ -1,102 +0,0 @@ -{% extends 'partials/base.html.twig' %} - -{% block map_assets %} -{% do assets.addCss('theme://css-compiled/map.css') %} -{% do assets.addJs('theme://js/map.js', {group: 'bottom'}) %} -{% endblock %} - -{% block content %} -{% set trip_page = page.parent() %} -{% set tracker_page = grav.pages.find(page.parent().route ~ '/dailies') %} -{% set all_entries = tracker_page ? tracker_page.children.published() : [] %} - -{% set gpx_urls = [] %} -{% for name, media in trip_page.media.all %} - {% if name|split('.')|last == 'gpx' %} - {% set gpx_urls = gpx_urls|merge([trip_page.url ~ '/' ~ name]) %} - {% endif %} -{% endfor %} - -{% set map_entries = [] %} -{% for entry in all_entries %} - {% if entry.header.lat is not empty and entry.header.lng is not empty %} - {% set hero_url = null %} - {% if entry.header.hero_image and entry.media[entry.header.hero_image] is defined %} - {% set hero_url = entry.media[entry.header.hero_image].cropResize(240, 135).url %} - {% elseif entry.media.images|length > 0 %} - {% set hero_url = entry.media.images|first.cropResize(240, 135).url %} - {% endif %} - {% set map_entries = map_entries|merge([{ - 'lat': entry.header.lat|number_format(6, '.', ''), - 'lng': entry.header.lng|number_format(6, '.', ''), - 'title': entry.title, - 'date': entry.date|date('d M Y'), - 'url': entry.url, - 'hero': hero_url, - 'force_connect': entry.header.force_connect ? true : false, - 'transport_mode': entry.header.transport_mode ? entry.header.transport_mode : null - }]) %} - {% endif %} -{% endfor %} - -
- - -{% endblock %} diff --git a/themes/intotheeast/templates/partials/base.html.twig b/themes/intotheeast/templates/partials/base.html.twig index 1789947..e7c92c9 100644 --- a/themes/intotheeast/templates/partials/base.html.twig +++ b/themes/intotheeast/templates/partials/base.html.twig @@ -13,7 +13,7 @@ {{ assets.css()|raw }} {{ assets.js()|raw }} - +