Spezial-Menü für Blog-Unterseiten auch für das Template -- ALIGN

* Partial `menu` in `menu/default` umbenannt.
* Inline-Partial aus Template `blog/year` als Partial `menu/blog` extrahiert.
* Partial `menu/blog` wird in `blog/year` und `blog/page` verwendet.

diff --git a/layouts/_partials/menu/blog.html b/layouts/_partials/menu/blog.html
index 185a7e8ab7bda74fee93698ee44704bd93713217..6aa433f0da559e944b6c26988987fb94c3786aa9 100644 (file)
--- a/layouts/_partials/menu/blog.html
+++ b/layouts/_partials/menu/blog.html
@@ -1,53 +1,4 @@
-{{- define "title" }}
-  <h1>
-    {{ .Title }}
-    {{- if (.Param "ShowRssButtonInSectionTermList") }}
-    {{- $rss := (.OutputFormats.Get "rss") }}
-    {{- if (eq .Kind `page`) }}
-    {{- $rss = (.Parent.OutputFormats.Get "rss") }}
-    {{- end }}
-    {{- with $rss }}
-    <a href="{{ .RelPermalink }}" title="RSS" aria-label="RSS">
-      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
-        stroke-linecap="round" stroke-linejoin="round" height="23">
-        <path d="M4 11a9 9 0 0 1 9 9" />
-        <path d="M4 4a16 16 0 0 1 16 16" />
-        <circle cx="5" cy="19" r="1" />
-      </svg>
-    </a>
-    {{- end }}
-    {{- end }}
-  </h1>
-  {{- if .Description }}
-  <div class="post-description">
-    {{ .Description }}
-  </div>
-  {{- end }}
-{{- end }}{{/* end title */}}
-
-{{- define "main" }}
-{{- range .Pages }}
-<div class="archive-entry">
-  <h3 class="archive-entry-title entry-hint-parent">
-    <a class="entry-link" aria-label="post link to {{ .Title | plainify }}" href="{{ .Permalink }}">{{- .Title | markdownify }}</a>
-    {{- if .Draft }}
-    <span class="entry-hint" title="Draft">
-      <svg xmlns="http://www.w3.org/2000/svg" height="15" viewBox="0 -960 960 960" fill="currentColor">
-        <path
-          d="M160-410v-60h300v60H160Zm0-165v-60h470v60H160Zm0-165v-60h470v60H160Zm360 580v-123l221-220q9-9 20-13t22-4q12 0 23 4.5t20 13.5l37 37q9 9 13 20t4 22q0 11-4.5 22.5T862.09-380L643-160H520Zm300-263-37-37 37 37ZM580-220h38l121-122-18-19-19-18-122 121v38Zm141-141-19-18 37 37-18-19Z" />
-      </svg>
-    </span>
-    {{- end }}
-  </h3>
-  <div class="archive-meta">
-    {{- partial "post_meta.html" . -}}
-  </div>
-</div>
-{{- end }}
-{{- end }}{{/* end main */}}
-
-{{- define "menu" }}
-{{- $page := . }}
+{{- $page := .page }}
 <nav id="nav">
   <hr class="n"/>
   <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>
@@ -73,7 +24,8 @@
       <ul class="s">
         {{- range .Pages -}}
         <li class="s">
-          <a href="{{ .RelPermalink }}" class="s{{ if eq . $page }} selected{{ end }}">{{ .LinkTitle }}</a>
+          <a href="{{ .RelPermalink }}" class="s{{ if or (eq . $page) (eq .LinkTitle ($page.Date | time.Format "2006")) }}
+) }} selected{{ end }}">{{ .LinkTitle }}</a>
         </li>
         {{ end }}
       </ul>
@@ -91,4 +43,3 @@
   </ul>
   <hr class="n"/>
 </nav>
-{{- end }}{{/* end menu */}}

diff --git a/layouts/_partials/menu/default.html b/layouts/_partials/menu/default.html
index a82d351997e15effec7701704553da0da9fd23b9..cbe98f810fce085ac31cd579f0eb11f552d9a91b 100644 (file)
--- a/layouts/_partials/menu/default.html
+++ b/layouts/_partials/menu/default.html
@@ -1,6 +1,4 @@
 {{- $page := .page }}
-{{- $menuID := .menuID }}
-
 <nav id="nav">
   <hr class="n"/>
   <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>

diff --git a/layouts/baseof.html b/layouts/baseof.html
index 41e9b0125da20e1c20cc0ffa8fb6fb70aed3a56b..3c9086c328a6434ec5198327cdc3de55a5733449 100644 (file)
--- a/layouts/baseof.html
+++ b/layouts/baseof.html
@@ -17,7 +17,7 @@
           {{- block "main" . }}{{ end }}
         </article>
         <div class="marginal">
-          {{- block "menu" . }}{{- partial "menu.html" (dict "menuID" "main" "page" .) }}{{ end }}
+          {{- block "menu" . }}{{- partial "menu/default.html" (dict "page" .) }}{{ end }}
           {{- block "marginalcontent" . }}{{ end }}
         </div>
     </main>

diff --git a/layouts/blog/page.html b/layouts/blog/page.html
index 0b967136555dddfc85036a3848dcf40b18476da2..ef149656f62be9fb38654b18e5a7c6281fc7136c 100644 (file)
--- a/layouts/blog/page.html
+++ b/layouts/blog/page.html
@@ -14,6 +14,7 @@
   </div>
   {{ end }}
 {{ end }}
+{{ define "menu" }}{{ partial "menu/blog.html" (dict "page" .) }}{{ end }}
 {{ define "marginalcontent" }}
   {{ partial "terms.html" . }}
 {{ end }}

diff --git a/layouts/blog/year.html b/layouts/blog/year.html
index 185a7e8ab7bda74fee93698ee44704bd93713217..2d261e4ef7791f608b0a1068b9f41a1f91dc3fe3 100644 (file)
--- a/layouts/blog/year.html
+++ b/layouts/blog/year.html
@@ -47,48 +47,5 @@
 {{- end }}{{/* end main */}}
 
 {{- define "menu" }}
-{{- $page := . }}
-<nav id="nav">
-  <hr class="n"/>
-  <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>
-  <h1 class="nav">Navigation</h1>
-  <h2 class="nav menu">Section-Menu</h2>
-  <ul id="menu" class="cf">
-    {{- range $page.Site.MainSections }}
-    {{- $section := site.GetPage "section" . }}
-    <li class="m {{ . }}">
-      <a href="{{ $section.RelPermalink }}" class="{{ cond (eq $page.Section .) "m selected" "m" }}">{{ $section.LinkTitle }}</a>
-    </li>
-    {{- end }}
-  </ul>
-  <h2 class="nav submenu">
-    <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
-  </h2>
-  <ul id="submenu" class="submenu selected">
-    {{- range $page.Site.MainSections }}
-    {{- with site.GetPage "section" . }}
-    {{- if eq .Path "/blog" }}
-    <li class="s sub">
-      <a  href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-      <ul class="s">
-        {{- range .Pages -}}
-        <li class="s">
-          <a href="{{ .RelPermalink }}" class="s{{ if eq . $page }} selected{{ end }}">{{ .LinkTitle }}</a>
-        </li>
-        {{ end }}
-      </ul>
-    </li>
-    {{- else }}
-    <li class="s{{ if or .Pages .Sections}} sub{{ end }} off">
-      <a  href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
-      <ul class="s">
-      {{- partial "menu/tree.html" (dict "pages" .Pages "page" $page) }}
-      </ul>
-    </li>
-    {{- end }}{{/* if */}}
-    {{- end }}{{/* with */}}
-    {{- end }}{{/* range */}}
-  </ul>
-  <hr class="n"/>
-</nav>
+{{- partial "menu/blog.html" (dict "page" .) }}
 {{- end }}{{/* end menu */}}