From 722a8c645bbc7a141d053536861a78b0c52ce842 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Mon, 27 Dec 2021 20:16:21 -0500 Subject: [PATCH] add pagination to section, fix graph linking --- layouts/_default/section.html | 3 ++- layouts/partials/graph.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 3b9741e6..abdf0b05 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -14,7 +14,8 @@

All {{.Title}}

- {{partial "page-list.html" .Pages.ByLastmod.Reverse }} + {{partial "page-list.html" .Paginator.Pages.ByLastmod.Reverse }} + {{ template "_internal/pagination.html" .}}
{{partial "contact.html" .}} diff --git a/layouts/partials/graph.html b/layouts/partials/graph.html index cd5577f4..f0893569 100644 --- a/layouts/partials/graph.html +++ b/layouts/partials/graph.html @@ -146,7 +146,7 @@ .attr("fill", color) .style("cursor", "pointer") .on("click", (_, d) => { - window.location.href = {{.Site.BaseURL}} + d.id.replace(" ", "-").replace("%20", "-"); + window.location.href = {{.Site.BaseURL}} + decodeURI(d.id).replace(/[\s_]+/g, '-') }) .on("mouseover", function (_, d) { d3.selectAll(".node") @@ -204,7 +204,7 @@ const labels = graphNode.append("text") .attr("dx", 12) .attr("dy", ".35em") - .text((d) => content[d.id.replace("%20", "-")]?.title || "Untitled") + .text((d) => content[decodeURI(d.id).replace(/[\s_]+/g, '-')]?.title || "Untitled") .style("opacity", 0) .style("pointer-events", "none") .call(drag(simulation));