refactor: rearrange nav and homenav

Former-commit-id: 527f8517d1a0dbe8693a0872f7d3a98be78f96a6

10 files changed, 25 insertions, 33 deletions

diff --git a/config/_default/params.zh.yaml b/config/_default/params.zh.yaml
index 535839d8..460eb08a 100644
--- a/config/_default/params.zh.yaml
+++ b/config/_default/params.zh.yaml
@@ -1,23 +1,26 @@
 description: 欢迎来访，这里只有真情流露和赤裸的思考。
 nav:
+  - name: 精选
+    link: /featured/
+  - name: 搜寻
+    link: /categories/
+  - name: 林卷
+    link: /linkroll/
+  - name: 自述
+    link: /about/
+homenav:
+  - name: 所有
+    link: /
   - name: 结构
     link: /essays/
-    target: _self
   - name: 倾泻
     link: /posts/
-    target: _self
   - name: 书目
     link: /library/
-    target: _self
   - name: 假想
     link: /fictions/
-    target: _self
-  - name: 自述
-    link: /about/
-    target: _self
 footerInternalLinks:
-  - name: 林卷
-    link: /linkroll/
+
   - name: 标记
     link: /highlights/
   - name: 赞助
diff --git a/layouts/_partials/header/navigation.html b/layouts/_partials/header/navigation.html
index ec05f2a3..168d614f 100644
--- a/layouts/_partials/header/navigation.html
+++ b/layouts/_partials/header/navigation.html
@@ -2,13 +2,12 @@
   {{ range .Site.Params.nav }}
   <a class="inline-block py-1 px-[0.35rem] md:px-2 first:pl-3 last:pr-3
       block hover:no-underline text-nowrap
-      {{ if strings.Contains $.Page.RelPermalink .link }}
+      {{ if eq $.Page.RelPermalink .link }}
       text-[var(--text-color)] bg-[var(--block-background-color)]
       {{ else }}
       text-[var(--background-color)] bg-[var(--text-color)]
       {{ end }}"
       href="{{ .link }}"
-      target="{{ .target }}"
   >{{ .name }}</a>
   {{ end }}
 </nav>
diff --git a/layouts/_partials/home/home-nav-item.html b/layouts/_partials/home/home-nav-item.html
index eaebf744..b9b70c0f 100644
--- a/layouts/_partials/home/home-nav-item.html
+++ b/layouts/_partials/home/home-nav-item.html
@@ -2,7 +2,7 @@
 {{ $link := .link }}
 {{ $text := .text }}
 
-<a href="{{ .Site.LanguagePrefix }}/{{ $link }}"
+<a href="{{ .Site.LanguagePrefix }}{{ $link }}"
     class="texl-base md:text-lg relative
     hover:no-underline relative
     {{ if $active }}font-extrabold{{ end }}"
diff --git a/layouts/_partials/home/home-nav.html b/layouts/_partials/home/home-nav.html
index 6285848d..628fc828 100644
--- a/layouts/_partials/home/home-nav.html
+++ b/layouts/_partials/home/home-nav.html
@@ -1,24 +1,12 @@
 {{ if eq .Site.Language.Lang "zh" }}
 <nav id="home-nav" class="relative w-full ps-0 flex list-none gap-4
     text-size-sm md:text-size-base">
-    {{ partial "home/home-nav-item" (dict
-        "text" (T "postNav.latest")
-        "link" ""
-        "active" (eq "/" $.Page.RelPermalink)
-    ) }}
-
-    {{ partial "home/home-nav-item" (dict
-        "text" (T "postNav.featured")
-        "link" "featured"
-        "active" (eq "/featured/" $.Page.RelPermalink)
-    ) }}
-
-    {{ partial "home/home-nav-item" (dict
-        "text" (T "postNav.categories")
-        "link" "categories"
-        "active" (or
-            (strings.HasPrefix $.Page.RelPermalink "/categories/")
-            (strings.HasPrefix $.Page.RelPermalink "/tags/"))
-    ) }}
+    {{ range .Site.Params.homenav }}
+        {{ partial "home/home-nav-item" (dict
+            "text" .name
+            "link" .link
+            "active" (eq .link $.Page.RelPermalink)
+        ) }}
+    {{ end }}
 </nav>
 {{ end }}
diff --git a/layouts/essays/section.html b/layouts/essays/section.html
index 36331fbf..f5a08ace 100644
--- a/layouts/essays/section.html
+++ b/layouts/essays/section.html
@@ -1,6 +1,7 @@
 {{ define "main" }}
     <article>
       {{ partial "header.html" . }}
+      {{ partial "home/home-nav" . }}
       <div class="posts-list pagefind-exclude">
         <div class="markdown-body">{{ .Content }}</div>
         {{ $pages := .Pages }}
diff --git a/layouts/featured.html b/layouts/featured.html
index e93ecf76..28426907 100644
--- a/layouts/featured.html
+++ b/layouts/featured.html
@@ -1,7 +1,6 @@
 {{ define "main" }}
     <article>
       {{ partial "header" . }}
-      {{ partial "home/home-nav" . }}
 
       <div class="markdown-content" style="line-height: 2">
           {{ .Content }}
diff --git a/layouts/fictions/section.html b/layouts/fictions/section.html
index e3f97ef9..7e094826 100644
--- a/layouts/fictions/section.html
+++ b/layouts/fictions/section.html
@@ -1,6 +1,7 @@
 {{ define "main" }}
     <article>
         {{ partial "header.html" . }}
+        {{ partial "home/home-nav" . }}
         <div class="pagefind-exclude my-8">
             <div class="flex flex-wrap justify-around gap-8">
                 {{- range .Pages }}
diff --git a/layouts/library/section.html b/layouts/library/section.html
index 50dac407..cd5cb555 100644
--- a/layouts/library/section.html
+++ b/layouts/library/section.html
@@ -14,6 +14,7 @@
 {{ end }}
   <article class="pagefind-exclude">
     {{ partial "header.html" . }}
+    {{ partial "home/home-nav" . }}
     <div>
 
         {{ if $isLibraryHome }}
diff --git a/layouts/section.html b/layouts/section.html
index 3ddc6bb7..444e52d3 100644
--- a/layouts/section.html
+++ b/layouts/section.html
@@ -5,6 +5,7 @@
 
     <article>
       {{ partial "header.html" . }}
+      {{ partial "home/home-nav" . }}
       <div class="posts-list pagefind-exclude">
         <div class="markdown-body">{{ .Content }}</div>
 
diff --git a/layouts/taxonomy.html b/layouts/taxonomy.html
index 02624d59..453bb430 100644
--- a/layouts/taxonomy.html
+++ b/layouts/taxonomy.html
@@ -1,7 +1,6 @@
 {{ define "main" }}
 <article>
     {{ partial "header" . }}
-    {{ partial "home/home-nav" . }}
 
     <div id="pagefind" class="py-3"></div>