Merge partials for head and add logic so they can be added once in baseof instead of in each single and list template.

layouts/_default/baseof.html

@@ -4,11 +4,11 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width">
 <title>{{ block "title" . }}{{ .Title }} – {{ .Site.Title }}{{ end }}</title>
-{{ block "meta" . }}{{ end }}
+{{ partial "meta.html" . }}
-{{- partial "meta.html" . -}}
+{{ partialCached "styles.html" . }}
-{{- partialCached "styles.html" . -}}
+{{- block "head" . }}{{ end }}
-{{ block "header" . }}{{ end }}
+{{ partial "meta_json_ld.html" . }}
-{{ partial "scripts.html" . -}}
+{{ partial "scripts.html" . }}
 {{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "matomo.html" . }}{{ end -}}
 </head>
 
@@ -20,8 +20,8 @@
 <a href="{{ "/" | relLangURL }}" title="Home" class="header__site-link" rel="home"><span>{{ .Site.Title }}</span></a>
 </h1>
 <div class="region header__region">
-{{ if .Site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end }}
+{{ if .Site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end -}}
-{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end }}
+{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end -}}
 </div>
 </header>
 
@@ -29,7 +29,7 @@
 
 {{ block "main" . }}{{ end }}
 
-{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . -}}{{ end }}
+{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . }}{{ end -}}
 
 <footer class="footer layout__footer">
 {{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}}

layouts/_default/list.html

@@ -1,12 +1,3 @@
-{{ define "meta" }}
-{{- partial "section_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "section_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <h1 class="title">{{ .Title }}</h1>

layouts/_default/single.html

@@ -1,12 +1,3 @@
-{{ define "meta" }}
-{{- partial "single_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "single_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">

layouts/index.html

@@ -1,15 +1,5 @@
 {{ define "title" }}{{ .Site.Title }}{{ end }}
 
-{{ define "meta" }}
-{{- partial "section_meta.html" . -}}
-{{- partial "single_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "section_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">

layouts/micro/list.html

@@ -1,12 +1,3 @@
-{{ define "meta" }}
-{{- partial "section_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "section_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <h1 class="title">Micro posts</h1>

layouts/micro/single.html

@@ -1,11 +1,3 @@
-{{ define "meta" }}
-{{- partial "single_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "single_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">

layouts/partials/meta.html

@@ -1,3 +1,14 @@
+{{ range .AlternativeOutputFormats -}}
+<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
+{{ end -}}
+<meta name="description" content="{{ if .IsPage }}{{ .Description | default (replaceRE "\n" " " .Summary) }}{{ else }}{{ $.Param "description" }}{{ end }}">
+<meta name="created" content="{{ .Date.Format "2006-01-02T15:04:05-0700" }}">
+<meta name="modified" content="{{ .Lastmod.Format "2006-01-02T15:04:05-0700" }}">
+{{ with $.Param "author" }}<meta name="author" content="{{ . }}">{{ end }}
+<meta property="og:site_name" content="{{ .Site.Title }}">
+<meta property="og:title" content="{{ .Title }}">
+<meta property="og:url" content="{{ .Permalink }}">
+{{ with $.Param "image" }}<meta name="og:image" content="{{ . | absURL }}">{{ end }}
 {{ hugo.Generator }}
 {{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end }}
 <meta name="msapplication-TileColor" content="{{ $.Param "themecolor" | default "#ffffff" }}">

layouts/partials/meta_json_ld.html

@@ -1,12 +1,24 @@
 <script type="application/ld+json">
   {
-    "@context": "http://schema.org",
+    "@context": "https://schema.org",
+    {{ if .IsPage -}}
+    "@type": {{ if or (eq .Section "blog") (eq .Section "post") }}"BlogPosting"{{ else }}"WebPage"{{ end }},
+    "headline": {{ .Title }},
+    "datePublished": {{ .Date.Format "2006-01-02T15:04:05Z07:00" }},
+    "dateModified": {{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }},
+    "url" : {{ .Permalink }},
+    "description": {{ with (.Description | default (replaceRE "\n" " " .Summary)) }}{{ . }}{{ end }},
+    {{ with .Params.tags -}}
+    "keywords": {{ . }},
+    {{ end -}}
+    {{ else -}}
     "@type": "WebPage",
     "url" : {{ .Permalink }},
     "name": {{ .Title }},
     {{ with $.Param "description" -}}
     "description": {{ . }},
     {{ end -}}
+    {{ end -}}
     {{ with $.Param "image" -}}
     "image" : {{ . | absURL }},
     {{ end -}}
@@ -22,7 +34,7 @@
     },
     "publisher": {
       "@type": "Organization",
-      "name": {{ .Site.Title }},
+      "name": {{ .Site.Title  }},
       {{ with $.Param "icon" -}}
       "logo" : {
         "@type": "ImageObject",

layouts/partials/opengraph_meta.html

@@ -1,9 +0,0 @@
-{{ if .IsPage -}}
-<meta name="description" content="{{ .Description | default (replaceRE "\n" " " .Summary) }}">
-{{ else -}}
-<meta name="description" content="{{ $.Param "description" }}">
-{{ end -}}
-<meta property="og:site_name" content="{{ .Site.Title }}">
-<meta property="og:title" content="{{ .Title }}">
-<meta property="og:url" content="{{ .Permalink }}">
-{{ with $.Param "image" }}<meta name="og:image" content="{{ . | absURL }}">{{ end }}

layouts/partials/section_meta.html

@@ -1,3 +0,0 @@
-{{ range .AlternativeOutputFormats -}}
-<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
-{{ end -}}

layouts/partials/single_meta.html

@@ -1,3 +0,0 @@
-<meta name="created" content="{{ .Date.Format "2006-01-02T15:04:05-0700" }}">
-<meta name="modified" content="{{ .Lastmod.Format "2006-01-02T15:04:05-0700" }}">
-{{ with $.Param "author" }}<meta name="author" content="{{ . }}">{{ end }}

layouts/podcast/single.html

@@ -1,12 +1,3 @@
-{{ define "meta" }}
-{{- partial "single_meta.html" . -}}
-{{- partial "opengraph_meta.html" . -}}
-{{ end }}
-
-{{ define "header" }}
-{{- partial "single_json_ld.html" . -}}
-{{ end }}
-
 {{ define "main" -}}
 <main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">