Merge pull request #1671 from gethinode/templatev2

feat: add configurable page metadata and contact partial

Author: markdumay

config/_default/params.toml

@@ -120,6 +120,10 @@
     placement = "bottom-right"
 # toml-docs-end messages
 
+[pages]
+    readingTime = true
+    wordCount = true
+
 # toml-docs-start sharing
 [sharing]
     enabled = true

exampleSite/config/_default/params.toml

@@ -74,6 +74,10 @@
 [messages]
     placement = "bottom-right"
 
+[pages]
+    readingTime = true
+    wordCount = true
+
 [dam]
     dimensions = "dimensions.yml"
     videoCodecs = [

exampleSite/hugo_stats.json

@@ -254,9 +254,6 @@
       "fa-activity",
       "fa-address-card",
       "fa-angle-left",
-      "fa-angle-right",
-      "fa-angles-left",
-      "fa-angles-right",
       "fa-arrow-left",
       "fa-arrow-right",
       "fa-bars",
@@ -709,11 +706,11 @@
       "docs",
       "documentation",
       "dropdown-nav-0",
-      "dropdown-panel-05fb366961a032145e2dfc2f236575b2",
-      "dropdown-panel-269e7a3ab7c4557afd4f6fee4e4279e1",
-      "dropdown-panel-45614878ec222752158fe2410b5c88e5",
-      "dropdown-panel-8d7d288daff93a695081d2791a6bb737",
-      "dropdown-panel-d8c389bebb57d33ad37d1458bdfe710d",
+      "dropdown-panel-532552bc7725299df3e500db78ba48d9",
+      "dropdown-panel-6299e2fac3e9b4596906874362f6b59d",
+      "dropdown-panel-9712956d6754d2574b53836076ae4258",
+      "dropdown-panel-dc748813e64b8051f533a79bb86d48c4",
+      "dropdown-panel-f70d5abe28909e01139ecbf2ec78c36d",
       "eerste-artikel",
       "elements-type",
       "entity-relationship-diagram",
@@ -734,11 +731,11 @@
       "fab-whatsapp",
       "fab-x-twitter",
       "faq",
-      "faq-84625a3228fe3acb7b179fc35b56c777",
-      "faq-84625a3228fe3acb7b179fc35b56c777-heading-faq-84625a3228fe3acb7b179fc35b56c777",
-      "faq-84625a3228fe3acb7b179fc35b56c777-item-0",
-      "faq-84625a3228fe3acb7b179fc35b56c777-item-1",
-      "faq-84625a3228fe3acb7b179fc35b56c777-item-2",
+      "faq-34b844b2cdee85c20f86549880a74359",
+      "faq-34b844b2cdee85c20f86549880a74359-heading-faq-34b844b2cdee85c20f86549880a74359",
+      "faq-34b844b2cdee85c20f86549880a74359-item-0",
+      "faq-34b844b2cdee85c20f86549880a74359-item-1",
+      "faq-34b844b2cdee85c20f86549880a74359-item-2",
       "fas-1",
       "fas-2",
       "fas-3",
@@ -747,9 +744,6 @@
       "fas-6",
       "fas-address-card",
       "fas-angle-left",
-      "fas-angle-right",
-      "fas-angles-left",
-      "fas-angles-right",
       "fas-arrow-left",
       "fas-arrow-right",
       "fas-bars",
@@ -853,11 +847,11 @@
       "nav-0-btn-1",
       "nav-0-btn-2",
       "nav-nav-0",
-      "nav-panel-05fb366961a032145e2dfc2f236575b2",
-      "nav-panel-269e7a3ab7c4557afd4f6fee4e4279e1",
-      "nav-panel-45614878ec222752158fe2410b5c88e5",
-      "nav-panel-8d7d288daff93a695081d2791a6bb737",
-      "nav-panel-d8c389bebb57d33ad37d1458bdfe710d",
+      "nav-panel-532552bc7725299df3e500db78ba48d9",
+      "nav-panel-6299e2fac3e9b4596906874362f6b59d",
+      "nav-panel-9712956d6754d2574b53836076ae4258",
+      "nav-panel-dc748813e64b8051f533a79bb86d48c4",
+      "nav-panel-f70d5abe28909e01139ecbf2ec78c36d",
       "navbar",
       "navbar-0-collapse",
       "navbar-mode",
@@ -867,36 +861,36 @@
       "notification",
       "over-mij",
       "overview",
-      "panel-05fb366961a032145e2dfc2f236575b2-0",
-      "panel-05fb366961a032145e2dfc2f236575b2-1",
-      "panel-05fb366961a032145e2dfc2f236575b2-2",
-      "panel-05fb366961a032145e2dfc2f236575b2-btn-0",
-      "panel-05fb366961a032145e2dfc2f236575b2-btn-1",
-      "panel-05fb366961a032145e2dfc2f236575b2-btn-2",
-      "panel-269e7a3ab7c4557afd4f6fee4e4279e1-0",
-      "panel-269e7a3ab7c4557afd4f6fee4e4279e1-1",
-      "panel-269e7a3ab7c4557afd4f6fee4e4279e1-2",
-      "panel-269e7a3ab7c4557afd4f6fee4e4279e1-btn-0",
-      "panel-269e7a3ab7c4557afd4f6fee4e4279e1-btn-1",
-      "panel-269e7a3ab7c4557afd4f6fee4e4279e1-btn-2",
-      "panel-45614878ec222752158fe2410b5c88e5-0",
-      "panel-45614878ec222752158fe2410b5c88e5-1",
-      "panel-45614878ec222752158fe2410b5c88e5-2",
-      "panel-45614878ec222752158fe2410b5c88e5-btn-0",
-      "panel-45614878ec222752158fe2410b5c88e5-btn-1",
-      "panel-45614878ec222752158fe2410b5c88e5-btn-2",
-      "panel-8d7d288daff93a695081d2791a6bb737-0",
-      "panel-8d7d288daff93a695081d2791a6bb737-1",
-      "panel-8d7d288daff93a695081d2791a6bb737-2",
-      "panel-8d7d288daff93a695081d2791a6bb737-btn-0",
-      "panel-8d7d288daff93a695081d2791a6bb737-btn-1",
-      "panel-8d7d288daff93a695081d2791a6bb737-btn-2",
-      "panel-d8c389bebb57d33ad37d1458bdfe710d-0",
-      "panel-d8c389bebb57d33ad37d1458bdfe710d-1",
-      "panel-d8c389bebb57d33ad37d1458bdfe710d-2",
-      "panel-d8c389bebb57d33ad37d1458bdfe710d-btn-0",
-      "panel-d8c389bebb57d33ad37d1458bdfe710d-btn-1",
-      "panel-d8c389bebb57d33ad37d1458bdfe710d-btn-2",
+      "panel-532552bc7725299df3e500db78ba48d9-0",
+      "panel-532552bc7725299df3e500db78ba48d9-1",
+      "panel-532552bc7725299df3e500db78ba48d9-2",
+      "panel-532552bc7725299df3e500db78ba48d9-btn-0",
+      "panel-532552bc7725299df3e500db78ba48d9-btn-1",
+      "panel-532552bc7725299df3e500db78ba48d9-btn-2",
+      "panel-6299e2fac3e9b4596906874362f6b59d-0",
+      "panel-6299e2fac3e9b4596906874362f6b59d-1",
+      "panel-6299e2fac3e9b4596906874362f6b59d-2",
+      "panel-6299e2fac3e9b4596906874362f6b59d-btn-0",
+      "panel-6299e2fac3e9b4596906874362f6b59d-btn-1",
+      "panel-6299e2fac3e9b4596906874362f6b59d-btn-2",
+      "panel-9712956d6754d2574b53836076ae4258-0",
+      "panel-9712956d6754d2574b53836076ae4258-1",
+      "panel-9712956d6754d2574b53836076ae4258-2",
+      "panel-9712956d6754d2574b53836076ae4258-btn-0",
+      "panel-9712956d6754d2574b53836076ae4258-btn-1",
+      "panel-9712956d6754d2574b53836076ae4258-btn-2",
+      "panel-dc748813e64b8051f533a79bb86d48c4-0",
+      "panel-dc748813e64b8051f533a79bb86d48c4-1",
+      "panel-dc748813e64b8051f533a79bb86d48c4-2",
+      "panel-dc748813e64b8051f533a79bb86d48c4-btn-0",
+      "panel-dc748813e64b8051f533a79bb86d48c4-btn-1",
+      "panel-dc748813e64b8051f533a79bb86d48c4-btn-2",
+      "panel-f70d5abe28909e01139ecbf2ec78c36d-0",
+      "panel-f70d5abe28909e01139ecbf2ec78c36d-1",
+      "panel-f70d5abe28909e01139ecbf2ec78c36d-2",
+      "panel-f70d5abe28909e01139ecbf2ec78c36d-btn-0",
+      "panel-f70d5abe28909e01139ecbf2ec78c36d-btn-1",
+      "panel-f70d5abe28909e01139ecbf2ec78c36d-btn-2",
       "panels",
       "persona",
       "pie-chart",

layouts/_partials/page/contact.html

@@ -0,0 +1,26 @@
+{{- $page := .page -}}
+{{- $contact := .contact -}}
+{{- $orientation := .orientation -}}
+{{- $align := .align | default "start" }}
+{{- $title := .title | default (T "contactHeaderTopic") }}
+
+{{- with $contact -}}
+    {{- $link := "" -}}
+    {{- $section := site.Params.modules.bookshop.contacts.section -}}
+    {{- $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
+    ) }}
+{{ end -}}

layouts/_partials/page/metadata.html

@@ -1,6 +1,9 @@
 {{- $metadata := .Scratch.Get "metadata" -}}
 {{ if ne $metadata "none" }}
     <small class="text-body-secondary text-uppercase">
+        {{- $readingTime := (index site.Params.pages "readingTime") | default true -}}
+        {{- $wordCount := (index site.Params.pages "wordCount") | default true -}}
+        
         {{ if .Date }}
             {{ $lastmodstr := (partial "utilities/date.html" (dict "date" .Lastmod "format" "long")) -}}
             {{ $datestr := (partial "utilities/date.html" (dict "date" .Date "format" "long")) -}}
@@ -9,9 +12,14 @@
             {{ else }}
                 {{ $datestr | i18n "postedOnDate" -}}
             {{ end }}
-            &bull;
+            {{ if or $readingTime $wordCount }}&bull;{{ end }}
         {{ end }}
-        {{ .ReadingTime | lang.FormatNumber 0 }}&nbsp;{{ i18n "minutesShort" }} {{ i18n "read" }} &bull;
-        {{ .WordCount | lang.FormatNumber 0 }}&nbsp;{{ i18n "words" }}
+
+        {{- if $readingTime }}
+            {{ .ReadingTime | lang.FormatNumber 0 }}&nbsp;{{ i18n "minutesShort" }} {{ i18n "read" }}
+            {{ if $wordCount }}&bull;{{ end }}
+        {{ end }}
+        
+        {{- if $wordCount }}{{ .WordCount | lang.FormatNumber 0 }}&nbsp;{{ i18n "words" }}{{ end }}
     </small>
 {{ end }}