Merge pull request #1744 from gethinode/templatev2

Templatev2

Author: markdumay

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/gethinode/mod-lottie/v2 v2.0.0 // indirect
 	github.com/gethinode/mod-mermaid/v3 v3.0.1 // indirect
 	github.com/gethinode/mod-simple-datatables/v3 v3.0.0 // indirect
-	github.com/gethinode/mod-utils/v5 v5.4.2 // indirect
+	github.com/gethinode/mod-utils/v5 v5.5.0 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20250907103239-defb38b083f0 // indirect
 	github.com/twbs/bootstrap v5.3.8+incompatible // indirect
 )

go.sum

@@ -42,6 +42,8 @@ github.com/gethinode/mod-utils/v5 v5.4.1 h1:iaQ8RTvK9p0JevaDW0c84fl/arDnDe2hu8Fm
 github.com/gethinode/mod-utils/v5 v5.4.1/go.mod h1:PwQN4oOjA6k/vet11JueJ9asZMgL0DBa3jyS9tPkBWU=
 github.com/gethinode/mod-utils/v5 v5.4.2 h1:/FSQ8yJ8rQaRDiA0sgcrrZX/asaFjjJMNap2pvQKZFk=
 github.com/gethinode/mod-utils/v5 v5.4.2/go.mod h1:PwQN4oOjA6k/vet11JueJ9asZMgL0DBa3jyS9tPkBWU=
+github.com/gethinode/mod-utils/v5 v5.5.0 h1:codE7hGNoORJ6GDOuFDXMDqQjw7yX89lfVHADEWacBs=
+github.com/gethinode/mod-utils/v5 v5.5.0/go.mod h1:PwQN4oOjA6k/vet11JueJ9asZMgL0DBa3jyS9tPkBWU=
 github.com/nextapps-de/flexsearch v0.0.0-20250907103239-defb38b083f0 h1:55phPhe6fDjfjG0jX4+br3nLORKgjgx8abZUdI0YJRA=
 github.com/nextapps-de/flexsearch v0.0.0-20250907103239-defb38b083f0/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
 github.com/twbs/bootstrap v5.3.8+incompatible h1:eK1fsXP7R/FWFt+sSNmmvUH9usPocf240nWVw7Dh02o=

layouts/_partials/assets/hero.html

@@ -20,11 +20,10 @@
 {{ end }}
 
 {{/* Initialize global variables */}}
-{{ $arrangement := site.Params.modules.bookshop.title.arrangement }}
-{{ if eq $args.order "first" }}{{ $arrangement = "above" }}{{ end }}
 {{- $padding := partial "utilities/GetPadding.html" -}}
 
 {{/* Initialize local variables */}}
+{{ $arrangement := or $args.heading.arrangement .Params.modules.bookshop.title.arrangement "above" }}
 {{ $align := $args.align }}
 {{ $class := $args.class | default "" }}
 {{ $scale := "" }}

layouts/_partials/head/stylesheet.html

@@ -7,7 +7,7 @@
     {{ $error = true }}
 {{- end -}}
 {{- if site.Params.main.build.silenceDeprecations -}}
-    {{- $silence = (slice "import" "color-functions" "global-builtin") -}}
+    {{- $silence = (slice "import" "color-functions" "global-builtin" "if-function" "legacy-js-api") -}}
 {{- end -}}
 
 {{- $absoluteURL := site.Params.main.canonifyAssetsURLs | default false -}}

layouts/_partials/page/contact.html

@@ -10,17 +10,19 @@
     {{- $result := partial "utilities/GetContact" (dict "contact" . "data" $section "language-tag" site.Language.Lang) -}}
     {{- with $result -}}
         {{- with .RelPermalink }}{{ $link = . }}{{ end -}}
-    {{- end -}}
 
-    {{- partial "assets/contact.html" (dict 
-        "page"        $page
-        "heading"     (dict "title" $title "content" (T "contactBody" $contact) "size" 5 "align" $align)
-        "background"  (dict "color" "light")
-        "order"       "first"
-        "orientation" $orientation
-        "class"       "contact-img"
-        "contact"     .
-        "links"       (slice (dict "title" (T "contactAction") "url" $link "icon" "fas chevron-right"))
-        "data"        site.Params.modules.bookshop.cta.section
-    ) }}
+        {{- partial "assets/contact.html" (dict 
+            "page"        $page
+            "heading"     (dict "title" $title "content" (T "contactBody" $contact) "size" 5 "align" $align)
+            "background"  (dict "color" "light")
+            "order"       "first"
+            "orientation" $orientation
+            "class"       "contact-img"
+            "contact"     $contact
+            "links"       (slice (dict "title" (T "contactAction") "url" $link "icon" "fas chevron-right"))
+            "data"        site.Params.modules.bookshop.cta.section
+        ) }}
+    {{ else }}
+        {{ warnf "Cannot find contact %q on page %q" $contact $page.RelPermalink }}
+    {{- end -}}
 {{ end -}}