From 8eb5239906bdb6419d71a7b02dbc1524d3a861e2 Mon Sep 17 00:00:00 2001
From: Ricardo <rick@rmendes.net>
Date: Fri, 13 Feb 2026 09:04:19 +0100
Subject: [PATCH] fix: move post navigation from sidebar to main content area

Post navigation (prev/next) now renders below the syndication block
in the main content flow, matching how listing pages work. Removed
from sidebar widget system.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 _includes/components/blog-sidebar.njk    |  3 --
 _includes/components/post-navigation.njk | 64 ++++++++++++++++++++++++
 _includes/layouts/post.njk               |  3 ++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 _includes/components/post-navigation.njk

diff --git a/_includes/components/blog-sidebar.njk b/_includes/components/blog-sidebar.njk
index 45ba0bd..ebfceb0 100644
--- a/_includes/components/blog-sidebar.njk
+++ b/_includes/components/blog-sidebar.njk
@@ -8,8 +8,6 @@
       {% include "components/widgets/author-card-compact.njk" %}
     {% elif widget.type == "author-card" %}
       {% include "components/widgets/author-card.njk" %}
-    {% elif widget.type == "post-navigation" %}
-      {% include "components/widgets/post-navigation.njk" %}
     {% elif widget.type == "toc" %}
       {% include "components/widgets/toc.njk" %}
     {% elif widget.type == "post-categories" %}
@@ -63,7 +61,6 @@
 {% else %}
   {# === Fallback: default blog post sidebar (backward compatibility) === #}
   {% include "components/widgets/author-card-compact.njk" %}
-  {% include "components/widgets/post-navigation.njk" %}
   {% include "components/widgets/toc.njk" %}
   {% include "components/widgets/post-categories.njk" %}
   {% include "components/widgets/recent-posts-blog.njk" %}
diff --git a/_includes/components/post-navigation.njk b/_includes/components/post-navigation.njk
new file mode 100644
index 0000000..4cd93c4
--- /dev/null
+++ b/_includes/components/post-navigation.njk
@@ -0,0 +1,64 @@
+{# Post Navigation - Previous/Next (main content area, below post) #}
+{% set _prevPost = collections.posts | previousInCollection(page) %}
+{% set _nextPost = collections.posts | nextInCollection(page) %}
+
+{% if _prevPost or _nextPost %}
+<nav class="post-navigation mt-8 pt-6 border-t border-surface-200 dark:border-surface-700" aria-label="Post navigation">
+  <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+    {% if _prevPost %}
+    <div>
+      <span class="text-xs text-surface-500 uppercase tracking-wide block mb-1">Previous</span>
+      {% set _likedUrl = _prevPost.data.likeOf or _prevPost.data.like_of %}
+      {% set _bookmarkedUrl = _prevPost.data.bookmarkOf or _prevPost.data.bookmark_of %}
+      {% set _repostedUrl = _prevPost.data.repostOf or _prevPost.data.repost_of %}
+      {% set _replyToUrl = _prevPost.data.inReplyTo or _prevPost.data.in_reply_to %}
+      <a href="{{ _prevPost.url }}" class="text-sm text-primary-600 dark:text-primary-400 hover:underline line-clamp-2 flex items-center gap-1.5">
+        {% if _likedUrl %}
+        <svg class="w-3.5 h-3.5 text-red-500 flex-shrink-0" fill="currentColor" viewBox="0 0 24 24"><path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"/></svg>
+        Liked {{ _likedUrl | replace("https://", "") | truncate(35) }}
+        {% elif _bookmarkedUrl %}
+        <svg class="w-3.5 h-3.5 text-amber-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 5a2 2 0 012-2h10a2 2 0 012 2v16l-7-3.5L5 21V5z"/></svg>
+        {{ _prevPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }}
+        {% elif _repostedUrl %}
+        <svg class="w-3.5 h-3.5 text-green-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/></svg>
+        Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }}
+        {% elif _replyToUrl %}
+        <svg class="w-3.5 h-3.5 text-primary-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"/></svg>
+        Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }}
+        {% else %}
+        {{ _prevPost.data.title or _prevPost.data.name or (_prevPost.templateContent | striptags | truncate(50)) or "Note" }}
+        {% endif %}
+      </a>
+    </div>
+    {% else %}
+    <div></div>
+    {% endif %}
+    {% if _nextPost %}
+    <div class="{% if _prevPost %}text-right{% endif %}">
+      <span class="text-xs text-surface-500 uppercase tracking-wide block mb-1">Next</span>
+      {% set _likedUrl = _nextPost.data.likeOf or _nextPost.data.like_of %}
+      {% set _bookmarkedUrl = _nextPost.data.bookmarkOf or _nextPost.data.bookmark_of %}
+      {% set _repostedUrl = _nextPost.data.repostOf or _nextPost.data.repost_of %}
+      {% set _replyToUrl = _nextPost.data.inReplyTo or _nextPost.data.in_reply_to %}
+      <a href="{{ _nextPost.url }}" class="text-sm text-primary-600 dark:text-primary-400 hover:underline line-clamp-2 flex items-center gap-1.5 {% if _prevPost %}justify-end{% endif %}">
+        {% if _likedUrl %}
+        <svg class="w-3.5 h-3.5 text-red-500 flex-shrink-0" fill="currentColor" viewBox="0 0 24 24"><path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"/></svg>
+        Liked {{ _likedUrl | replace("https://", "") | truncate(35) }}
+        {% elif _bookmarkedUrl %}
+        <svg class="w-3.5 h-3.5 text-amber-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 5a2 2 0 012-2h10a2 2 0 012 2v16l-7-3.5L5 21V5z"/></svg>
+        {{ _nextPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }}
+        {% elif _repostedUrl %}
+        <svg class="w-3.5 h-3.5 text-green-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/></svg>
+        Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }}
+        {% elif _replyToUrl %}
+        <svg class="w-3.5 h-3.5 text-primary-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"/></svg>
+        Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }}
+        {% else %}
+        {{ _nextPost.data.title or _nextPost.data.name or (_nextPost.templateContent | striptags | truncate(50)) or "Note" }}
+        {% endif %}
+      </a>
+    </div>
+    {% endif %}
+  </div>
+</nav>
+{% endif %}
diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk
index bab037b..e67d1d1 100644
--- a/_includes/layouts/post.njk
+++ b/_includes/layouts/post.njk
@@ -163,3 +163,6 @@ withBlogSidebar: true
 
 {# Webmentions display - likes, reposts, replies #}
 {% include "components/webmentions.njk" %}
+
+{# Post Navigation - Previous/Next #}
+{% include "components/post-navigation.njk" %}