Fix issue in structured data with escape characters in output, add fa…

…llback for WebPage to site title and description
wjh18 · May 24, 2022 · d2e7a0c · d2e7a0c
1 parent 15b6f06
commit d2e7a0c
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/layouts/partials/head/seo/structured-data.html b/layouts/partials/head/seo/structured-data.html
@@ -38,8 +38,8 @@
       "@type": "WebSite",
       "@id": {{ print $baseURL "#/schema/website/1" }},
       "url": {{ print $baseURL }},
-      "name": "{{ .Site.Title }}",
-      "description": "{{ .Site.Params.description }}",
+      "name": {{ .Site.Title }},
+      "description": {{ .Site.Params.description }},
       "publisher": {
         "@id": {{ print $baseURL "#/schema/person/1" }}
       }
@@ -52,8 +52,8 @@
       {{ end -}}
       "@id": {{ .Permalink }},
       "url": {{ .Permalink }},
-      "name": "{{ .Title }}",
-      "description": "{{ .Description }}",
+      "name": {{ with .Title }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }},
+      "description": {{ with .Description }}{{ . }}{{ else }}{{ .Site.Params.description }}{{ end }},
       "isPartOf": {
         "@id": {{ print $baseURL "#/schema/website/1" }}
       },
@@ -68,7 +68,7 @@
       "primaryImageOfPage": {
         "@id": {{ print .Permalink "#/schema/image/2" }}
       },
-      "inLanguage": "{{ .Site.Params.schemaLocale }}",
+      "inLanguage": {{ .Site.Params.schemaLocale }},
       "potentialAction": [{
         "@type": "ReadAction", "target": [{{ .Permalink }}]
       }]
@@ -85,7 +85,7 @@
           "@type": "WebPage",
           "@id": {{ .url }},
           "url": {{ .url }},
-          "name": "{{ .name | humanize | title }}"
+          "name": {{ .name | humanize | title }}
           {{ else -}}
           "@id": {{ .url }}
           {{ end -}}
@@ -100,8 +100,8 @@
         {
           "@type": "Article",
           "@id": {{ print $baseURL "#/schema/article/1" }},
-          "headline": "{{ .Title }}",
-          "description": "{{ .Description }}",
+          "headline": {{ .Title }},
+          "description": {{ .Description }},
           "isPartOf": {
             "@id": {{ .Permalink }}
           },
@@ -131,7 +131,7 @@
           "@id": {{ print .Permalink "#/schema/image/2" }},
           "url": {{ $.Scratch.Get "primaryImage" }},
           "contentUrl": {{ $.Scratch.Get "primaryImage" }},
-          "caption": "{{ .Title }}"
+          "caption": {{ .Title }}
         }
       ]
     }