From d97d4b3202839289cbcd9d7af087556fc98d6b94 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Wed, 10 Dec 2025 19:51:38 +0100 Subject: [PATCH] =?utf8?q?Templating=20f=C3=BCr=20das=20Juplo-Layout=20?= =?utf8?q?=C3=BCberarbeitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- layouts/_partials/breadcrumb.html | 14 +++ layouts/_partials/footer.html | 1 - layouts/_partials/header.html | 7 +- layouts/_partials/marginalcontent.html | 20 +++++ layouts/_partials/menu.html | 114 +++++++++++++++---------- layouts/baseof.html | 33 ++++--- layouts/page.html | 2 - layouts/section.html | 1 - layouts/term.html | 1 - 9 files changed, 132 insertions(+), 61 deletions(-) create mode 100644 layouts/_partials/breadcrumb.html delete mode 100644 layouts/_partials/footer.html create mode 100644 layouts/_partials/marginalcontent.html diff --git a/layouts/_partials/breadcrumb.html b/layouts/_partials/breadcrumb.html new file mode 100644 index 00000000..aeeceb88 --- /dev/null +++ b/layouts/_partials/breadcrumb.html @@ -0,0 +1,14 @@ + diff --git a/layouts/_partials/footer.html b/layouts/_partials/footer.html deleted file mode 100644 index a7cd916d..00000000 --- a/layouts/_partials/footer.html +++ /dev/null @@ -1 +0,0 @@ -

Copyright {{ now.Year }}. All rights reserved.

diff --git a/layouts/_partials/header.html b/layouts/_partials/header.html index 7980a00e..78e6631a 100644 --- a/layouts/_partials/header.html +++ b/layouts/_partials/header.html @@ -1,2 +1,5 @@ -

{{ site.Title }}

-{{ partial "menu.html" (dict "menuID" "main" "page" .) }} + diff --git a/layouts/_partials/marginalcontent.html b/layouts/_partials/marginalcontent.html new file mode 100644 index 00000000..94f3697f --- /dev/null +++ b/layouts/_partials/marginalcontent.html @@ -0,0 +1,20 @@ + + diff --git a/layouts/_partials/menu.html b/layouts/_partials/menu.html index 14245b55..a8d39bd1 100644 --- a/layouts/_partials/menu.html +++ b/layouts/_partials/menu.html @@ -1,51 +1,77 @@ -{{- /* -Renders a menu for the given menu ID. - -@context {page} page The current page. -@context {string} menuID The menu ID. - -@example: {{ partial "menu.html" (dict "menuID" "main" "page" .) }} -*/}} - {{- $page := .page }} {{- $menuID := .menuID }} -{{- with index site.Menus $menuID }} - -{{- end }} - -{{- define "_partials/inline/menu/walk.html" }} - {{- $page := .page }} - {{- range .menuEntries }} - {{- $attrs := dict "href" .URL }} - {{- if $page.IsMenuCurrent .Menu . }} - {{- $attrs = merge $attrs (dict "class" "active" "aria-current" "page") }} - {{- else if $page.HasMenuCurrent .Menu .}} - {{- $attrs = merge $attrs (dict "class" "ancestor" "aria-current" "true") }} - {{- end }} - {{- $name := .Name }} - {{- with .Identifier }} - {{- with T . }} - {{- $name = . }} - {{- end }} + diff --git a/layouts/baseof.html b/layouts/baseof.html index 39dcbec6..d90dd13b 100644 --- a/layouts/baseof.html +++ b/layouts/baseof.html @@ -3,15 +3,28 @@ {{ partial "head.html" . }} - -
- {{ partial "header.html" . }} -
-
- {{ block "main" . }}{{ end }} -
- + +
+ {{- partial "header.html" . }} + {{- partial "breadcrumb.html" . }} +
+
+

{{ .Title }}

+ {{- block "main" . }}{{ end }} +
+
+ {{- partial "menu.html" (dict "menuID" "main" "page" .) }} + {{- partial "marginalcontent.html" . }} +
+
+ +
diff --git a/layouts/page.html b/layouts/page.html index 7e286c80..30fcf482 100644 --- a/layouts/page.html +++ b/layouts/page.html @@ -1,6 +1,4 @@ {{ define "main" }} -

{{ .Title }}

- {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} {{ $dateHuman := .Date | time.Format ":date_long" }} diff --git a/layouts/section.html b/layouts/section.html index 4cfd224d..e0e83081 100644 --- a/layouts/section.html +++ b/layouts/section.html @@ -1,4 +1,3 @@ {{ define "main" }} -

{{ .Title }}

{{ .Content }} {{ end }} diff --git a/layouts/term.html b/layouts/term.html index c2e78751..7c5437dd 100644 --- a/layouts/term.html +++ b/layouts/term.html @@ -1,5 +1,4 @@ {{ define "main" }} -

{{ .Title }}

{{ .Content }} {{ range .Pages }}

{{ .LinkTitle }}

-- 2.39.5