]> juplo.de Git - website/commitdiff
projects / website / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f221c57)
Taxonomien `Categories` und `Tags` als Untersektionen von `Blog` -- MOVE
authorKai Moritz <kai@juplo.de>
Sat, 27 Dec 2025 15:42:07 +0000 (16:42 +0100)
committerKai Moritz <kai@juplo.de>
Sun, 28 Dec 2025 15:07:12 +0000 (16:07 +0100)
* Jahres-Sektionen unter die Sektion `/blog/archive` verschoben.
* Die Taxonomien `categories` und `tags` über eine explizite URL-Angabe
  virtuell in die Sektion `blog` verschoben.
* Angeapsste `section`- und `taxonomy`-Templates erstellt, die das
  Menü entsprechend darstellen.

content/blog/archive/_index.html [new file with mode: 0644] patch | blob
content/categories/_index.html [new file with mode: 0644] patch | blob
content/tags/_index.html [new file with mode: 0644] patch | blob
layouts/baseof.html patch | blob | history
layouts/blog/archive/page.html patch | blob | history
layouts/blog/archive/year.html patch | blob | history
layouts/blog/section.html patch | blob | history
layouts/categories/taxonomy.html patch | blob | history
layouts/categories/term.html patch | blob | history
layouts/rss.xml [deleted file] patch | blob | history
layouts/tags/taxonomy.html patch | blob | history

diff --git a/content/blog/archive/_index.html b/content/blog/archive/_index.html
new file mode 100644 (file)
index 0000000..10db07b
--- /dev/null
+++ b/content/blog/archive/_index.html
@@ -0,0 +1,3 @@
+---
+title: "Archive"
+---
diff --git a/content/categories/_index.html b/content/categories/_index.html
new file mode 100644 (file)
index 0000000..3417dd6
--- /dev/null
+++ b/content/categories/_index.html
@@ -0,0 +1,5 @@
+---
+title: Blog - Categories
+linkTitle: Categories
+url: /blog/categories/
+---
diff --git a/content/tags/_index.html b/content/tags/_index.html
new file mode 100644 (file)
index 0000000..8ac82d4
--- /dev/null
+++ b/content/tags/_index.html
@@ -0,0 +1,5 @@
+---
+title: Blog - Tags
+linkTitle: Tags
+url: /blog/tags/
+---
diff --git a/layouts/baseof.html b/layouts/baseof.html
index da0ed3254f1d5d8f312601c11c0a74395cf48695..50dc933884a3a747bd05312b8d758a2e07e3226c 100644 (file)
--- a/layouts/baseof.html
+++ b/layouts/baseof.html
@@ -6,7 +6,7 @@
 <body id="top" class="menu" onload="prettyPrint()">
   <div id="page" class="cf">
     {{- partial "header.html" . }}
-    {{- partial "breadcrumb.html" . }}
+    {{- block "breadcrumb" . }}{{ partial "breadcrumb.html" . }}{{ end -}}
     <main class="content cf">
         <article id="content" class="main">
           {{- block "article" . }}
diff --git a/layouts/blog/archive/page.html b/layouts/blog/archive/page.html
index 843c446602f0e616f69dda9e0ef6829c18a4a0db..2fe89e4af82d323fe83e19b07cdd66b69e046c51 100644 (file)
--- a/layouts/blog/archive/page.html
+++ b/layouts/blog/archive/page.html
@@ -14,7 +14,69 @@
   </div>
   {{ end }}
 {{ end }}
-{{ define "menu" }}{{ partial "menu/blog.html" (dict "page" .) }}{{ end }}
+{{- 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 sub">
+          <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
+          <ul class="s">
+            {{- range .Pages -}}
+            <li class="s">
+              <a href="{{ .RelPermalink }}" class="s{{ if or (eq . $page) (eq .LinkTitle ($page.Date | time.Format "2006")) }} selected{{ end }}">{{ .LinkTitle }}</a>
+            </li>
+            {{ end }}
+          </ul>
+        </li>
+        <li class="s off">
+          {{- with $.Site.GetPage "/categories" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </li>
+        <li class="s off">
+          {{- with $.Site.GetPage "/tags" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </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>
+{{- end }}{{/* end menu */}}
 {{ define "marginalcontent" }}
   {{ partial "terms.html" . }}
 {{ end }}
diff --git a/layouts/blog/archive/year.html b/layouts/blog/archive/year.html
index b897d4099cf0ec335867c1e20da2ef3952e520fa..54167c6a08f74885bcbe48dbcf0eaa6c24f4fd73 100644 (file)
--- a/layouts/blog/archive/year.html
+++ b/layouts/blog/archive/year.html
@@ -47,5 +47,65 @@
 {{- end }}{{/* end main */}}
 
 {{- define "menu" }}
-{{- partial "menu/blog.html" (dict "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>
+  <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 sub">
+          <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
+          <ul class="s">
+            {{- range .Pages -}}
+            <li class="s">
+              <a href="{{ .RelPermalink }}" class="s{{ if or (eq . $page) (eq .LinkTitle ($page.Date | time.Format "2006")) }} selected{{ end }}">{{ .LinkTitle }}</a>
+            </li>
+            {{ end }}
+          </ul>
+        </li>
+        <li class="s off">
+          {{- with $.Site.GetPage "/categories" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </li>
+        <li class="s off">
+          {{- with $.Site.GetPage "/tags" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </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>
 {{- end }}{{/* end menu */}}
diff --git a/layouts/blog/section.html b/layouts/blog/section.html
index b50e04ad16898193724057a17b23cff3d5560bc9..2f7b25092cb073656a1f15ab0b249f9d94394bb8 100644 (file)
--- a/layouts/blog/section.html
+++ b/layouts/blog/section.html
@@ -1,23 +1,65 @@
-{{- define "title" }}
-  <h1>
-    {{- with .OutputFormats.Get "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="4"
-        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>
-      Archive of all Blog-Articles
-    </a>
-  </h1>
-  {{- end }}
-{{- end }}{{/* end title */}}
+{{ 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">{{ .LinkTitle }}</a>
+        </li>
+        <li class="s">
+          {{- with $.Site.GetPage "/categories" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </li>
+        <li class="s">
+          {{- with $.Site.GetPage "/tags" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </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>
+{{ end }}
 
-{{- define "content" }}
-{{- range .RegularPagesRecursive }}
+{{- define "article" }}
+  <header><h1>Recently Published Articles</h1></header>
+      {{- range first 3 .RegularPagesRecursive.ByDate.Reverse }}
       <div class="archive-entry">
-        <h3 class="archive-entry-title entry-hint-parent">
+        <h2 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">
@@ -27,10 +69,47 @@
             </svg>
           </span>
           {{- end }}
-        </h3>
+        </h2>
         <div class="archive-meta">
           {{- partial "post_meta.html" . -}}
         </div>
+        <div class="archive-summary">
+          {{ .Summary | plainify }}
+          <a href="{{ .RelPermalink }}">Read on...</a>
+        </div>
       </div>
+      {{- end }}
+
+  <header><h1>Browse Articles By Year</h1></header>
+  <ul class="t">
+    {{- range (.Site.GetPage "/blog/archive").Pages -}}
+    <li>
+      <a href="{{ .RelPermalink }}"><span class="title">{{ .LinkTitle }}</span><span class="sep"> | </span><span class="count">{{ .Pages | len }}</span></a>
+    </li>
+    {{- end }}
+  </ul>
+{{- with .Site.Taxonomies.categories -}}
+  <header><h1>Browse Articles By Category</h1></header>
+  <ul class="t">
+    {{- range $category, $_ := . -}}
+    {{- with $.Site.GetPage (print "/categories/" $category) -}}
+    <li>
+      <a href="{{ .RelPermalink }}"><span class="title">{{ .LinkTitle }}</span><span class="sep"> | </span><span class="count">{{ .Pages | len }}</span></a>
+    </li>
+    {{- end }}
+    {{- end }}
+  </ul>
+{{- end }}
+{{- with .Site.Taxonomies.tags -}}
+  <header><h1>Browse Articles By Tag</h1></header>
+  <ul class="t">
+    {{- range $tag, $_ := . -}}
+    {{- with $.Site.GetPage (print "/tags/" $tag) -}}
+    <li>
+      <a href="{{ .RelPermalink }}"><span class="title">{{ .LinkTitle }}</span><span class="sep"> | </span><span class="count">{{ .Pages | len }}</span></a>
+    </li>
+    {{- end }}
+    {{- end }}
+  </ul>
 {{- end }}
 {{- end }}{{/* end main */}}
diff --git a/layouts/categories/taxonomy.html b/layouts/categories/taxonomy.html
index b50e04ad16898193724057a17b23cff3d5560bc9..8afdd174b24c151a87d9ef4c29d1324da6d1fa51 100644 (file)
--- a/layouts/categories/taxonomy.html
+++ b/layouts/categories/taxonomy.html
@@ -1,36 +1,88 @@
+{{ define "breadcrumb" }}
+<div id="breadcrumb">
+  <strong class="b title">You are here:</strong>
+  <ol class="b">
+    {{- range (slice "/" "/blog") -}}
+    {{- with $.Site.GetPage . -}}
+    <li class="b"><a class="b" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+    {{- end -}}
+    {{- end -}}
+    <li class="b"><strong class="b">{{ .LinkTitle }}</strong></li>
+  </ol>
+  <a class="hide" href="#nav" title="Show navigation menu">Jump to navigation</a>
+  <hr class="b" />
+</div>
+{{ end }}
+
+{{ 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">{{ .LinkTitle }}</a>
+        </li>
+        <li class="s">
+          {{- with $.Site.GetPage "/categories" -}}
+          <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </li>
+        <li class="s">
+          {{- with $.Site.GetPage "/tags" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </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>
+{{ end }}
+
 {{- define "title" }}
-  <h1>
-    {{- with .OutputFormats.Get "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="4"
-        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>
-      Archive of all Blog-Articles
-    </a>
-  </h1>
-  {{- end }}
-{{- end }}{{/* end title */}}
+<h1>{{ .Title }}</h1>
+{{- with .Description }}<p>{{ . }}</p>{{- end }}
+{{- end }}
 
 {{- define "content" }}
-{{- range .RegularPagesRecursive }}
-      <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 */}}
+<ul class="t">
+  {{ range .Pages }}
+  <li>
+    <a href="{{ .RelPermalink }}"><span class="title">{{ .LinkTitle }}</span><span class="sep"> | </span><span class="count">{{ .Pages | len }}</span></a>
+  </li>
+  {{- end }}
+</ul>
+{{ .Content }}
+{{- end }}{{/* end main */ -}}
diff --git a/layouts/categories/term.html b/layouts/categories/term.html
index b50e04ad16898193724057a17b23cff3d5560bc9..3df28692faa939446e8a504feddcdc03f4114025 100644 (file)
--- a/layouts/categories/term.html
+++ b/layouts/categories/term.html
@@ -1,3 +1,83 @@
+{{ define "breadcrumb" }}
+<div id="breadcrumb">
+  <strong class="b title">You are here:</strong>
+  <ol class="b">
+    {{- range (slice "/" "/blog" "/categories") -}}
+    {{- with $.Site.GetPage . -}}
+    <li class="b"><a class="b" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+    {{- end -}}
+    {{- end -}}
+    <li class="b"><strong class="b">{{ .LinkTitle }}</strong></li>
+  </ol>
+  <a class="hide" href="#nav" title="Show navigation menu">Jump to navigation</a>
+  <hr class="b" />
+</div>
+{{ end }}
+
+{{ 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 off">
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+        </li>
+        <li class="s sub">
+          {{- with $.Site.GetPage "/categories" -}}
+          <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
+          <ul class="s">
+            {{- range .Pages -}}
+            <li class="s">
+              <a  href="{{ .RelPermalink }}" class="s {{ if eq . $ }} selected{{ end }}">{{ .LinkTitle }}</a>
+            </li>
+            {{- end -}}
+          </ul>
+          {{- end -}}
+        </li>
+        <li class="s off">
+          {{- with $.Site.GetPage "/tags" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </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>
+{{ end }}
+
 {{- define "title" }}
   <h1>
     {{- with .OutputFormats.Get "rss" }}
@@ -8,7 +88,7 @@
         <path d="M4 4a16 16 0 0 1 16 16" />
         <circle cx="5" cy="19" r="1" />
       </svg>
-      Archive of all Blog-Articles
+      {{ ($.Site.GetPage $.Section).LinkTitle }}: {{ $.Title }}
     </a>
   </h1>
   {{- end }}
diff --git a/layouts/rss.xml b/layouts/rss.xml
deleted file mode 100644 (file)
index 70b7340..0000000
--- a/layouts/rss.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/">
-  <channel>
-    <title>{{ site.Title }}</title>
-    <link>{{ .Permalink }}</link>
-    <description>{{ site.Params.description }}</description>
-    <generator>Hugo -- {{ hugo.Version }}</generator>
-    <language>{{ site.Language.LanguageCode }}</language>
-    <managingEditor>{{site.Params.author.email}} ({{site.Params.author.name}})</managingEditor>
-    <webMaster>{{site.Params.author.email}} ({{site.Params.author.name}})</webMaster>
-    <copyright>{{ site.Copyright | markdownify | plainify | strings.TrimPrefix "© " }}</copyright>
-    <lastBuildDate>{{ site.Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>
-    <atom:link href="{{ .Permalink }}" rel="self" type="rss" />
-    {{- range .RegularPagesRecursive }}
-    <item>
-      <title>{{ .Title }}</title>
-      <link>{{ .Permalink }}</link>
-      <pubDate>{{ .PublishDate.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
-      <author>{{site.Params.author.email}} ({{site.Params.author.name}})</author>
-      <guid>{{ .Permalink }}</guid>
-      {{ with .Description }}
-      <description>{{ . }}</description>
-      {{ end -}}
-    </item>
-    {{- end }}
-  </channel>
-</rss>
diff --git a/layouts/tags/taxonomy.html b/layouts/tags/taxonomy.html
index b50e04ad16898193724057a17b23cff3d5560bc9..3c8a37bc0e93f902e6326805c677dbdcec94c154 100644 (file)
--- a/layouts/tags/taxonomy.html
+++ b/layouts/tags/taxonomy.html
@@ -1,36 +1,88 @@
+{{ define "breadcrumb" }}
+<div id="breadcrumb">
+  <strong class="b title">You are here:</strong>
+  <ol class="b">
+    {{- range (slice "/" "/blog") -}}
+    {{- with $.Site.GetPage . -}}
+    <li class="b"><a class="b" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+    {{- end -}}
+    {{- end -}}
+    <li class="b"><strong class="b">{{ .LinkTitle }}</strong></li>
+  </ol>
+  <a class="hide" href="#nav" title="Show navigation menu">Jump to navigation</a>
+  <hr class="b" />
+</div>
+{{ end }}
+
+{{ 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">{{ .LinkTitle }}</a>
+        </li>
+        <li class="s">
+          {{- with $.Site.GetPage "/categories" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </li>
+        <li class="s">
+          {{- with $.Site.GetPage "/tags" -}}
+          <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </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>
+{{ end }}
+
 {{- define "title" }}
-  <h1>
-    {{- with .OutputFormats.Get "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="4"
-        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>
-      Archive of all Blog-Articles
-    </a>
-  </h1>
-  {{- end }}
-{{- end }}{{/* end title */}}
+<h1>{{ .Title }}</h1>
+{{- with .Description }}<p>{{ . }}</p>{{- end }}
+{{- end }}
 
 {{- define "content" }}
-{{- range .RegularPagesRecursive }}
-      <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 */}}
+<ul class="t">
+  {{ range .Pages }}
+  <li>
+    <a href="{{ .RelPermalink }}"><span class="title">{{ .LinkTitle }}</span><span class="sep"> | </span><span class="count">{{ .Pages | len }}</span></a>
+  </li>
+  {{- end }}
+</ul>
+{{ .Content }}
+{{- end }}{{/* end main */ -}}
Unnamed repository; edit this file 'description' to name the repository.