From 6cebeae654be09bdd30e802676d77525e2790613 Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Thu, 5 Sep 2019 17:20:00 +0100
Subject: [PATCH] refactor: strip out Microdata for blog posts, pages, and pubs

Forms part of the transition from Microdata to JSON-LD.

See #413
---
 layouts/_default/single.html         | 4 ++--
 layouts/partials/jsonld/article.html | 8 ++++----
 layouts/partials/page_header.html    | 8 ++++----
 layouts/partials/page_metadata.html  | 5 +----
 layouts/publication/single.html      | 4 ++--
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d2e483ff..45b9df9d 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,12 @@
 {{- define "main" -}}
 
-<article class="article" itemscope itemtype="http://schema.org/Article">
+<article class="article">
 
   {{ partial "page_header" . }}
 
   <div class="article-container">
 
-    <div class="article-style" itemprop="articleBody">
+    <div class="article-style">
       {{ .Content }}
     </div>
 
diff --git a/layouts/partials/jsonld/article.html b/layouts/partials/jsonld/article.html
index 1c3b148e..f9a9220e 100644
--- a/layouts/partials/jsonld/article.html
+++ b/layouts/partials/jsonld/article.html
@@ -2,10 +2,10 @@
 {{ $summary := .summary }}
 {{ $featured_image := ($page.Resources.ByType "image").GetMatch "*featured*" }}
 
-{{/* Get microdata type. */}}
-{{ $microdata_type := "Article" }}
+{{/* Get schema type. */}}
+{{ $schema := "Article" }}
 {{ if eq $page.Type "post" }}
-  {{ $microdata_type = "BlogPosting" }}
+  {{ $schema = "BlogPosting" }}
 {{ end }}
 
 {{/* Get author name. */}}
@@ -25,7 +25,7 @@
 <script type="application/ld+json">
   {
     "@context": "https://schema.org",
-    "@type": "BlogPosting",
+    "@type": {{$schema}},
     "mainEntityOfPage": {
       "@type": "WebPage",
       "@id": {{$page.Permalink}}
diff --git a/layouts/partials/page_header.html b/layouts/partials/page_header.html
index fbb5671b..f0bc71c3 100644
--- a/layouts/partials/page_header.html
+++ b/layouts/partials/page_header.html
@@ -19,9 +19,9 @@
 <div class="article-header">
   {{ $img_src := urls.Parse .Params.header.image }}
   {{ if $img_src.Scheme }}
-  <img src="{{ .Params.header.image }}" class="article-banner" itemprop="image" alt="">
+  <img src="{{ .Params.header.image }}" class="article-banner" alt="">
   {{ else }}
-  <img src="{{ (printf "/img/%s" .Params.header.image) | relURL }}" class="article-banner" itemprop="image" alt="">
+  <img src="{{ (printf "/img/%s" .Params.header.image) | relURL }}" class="article-banner" alt="">
   {{ end }}
 
   {{ with .Params.header.caption }}<span class="article-header-caption">{{ . | markdownify | emojify }}</span>{{ end }}
@@ -53,7 +53,7 @@
 {{end}}
 
 <div class="article-container pt-3">
-  <h1 itemprop="name">{{ $title }}</h1>
+  <h1>{{ $title }}</h1>
 
   {{ with $page.Params.subtitle }}
   <p class="page-subtitle">{{ . | markdownify | emojify }}</p>
@@ -79,7 +79,7 @@
     {{ $ctnr = "universal-wrapper" }}
   {{end}}
 <div class="{{$ctnr}} pt-3">
-  <h1 itemprop="name">{{ $title }}</h1>
+  <h1>{{ $title }}</h1>
 
   {{ with $page.Params.subtitle }}
   <p class="page-subtitle">{{ . | markdownify | emojify }}</p>
diff --git a/layouts/partials/page_metadata.html b/layouts/partials/page_metadata.html
index 6d8be540..208949c1 100644
--- a/layouts/partials/page_metadata.html
+++ b/layouts/partials/page_metadata.html
@@ -2,9 +2,6 @@
 {{ $share := .share | default false }}
 {{ $page := .page }}
 
-<meta content="{{ $page.Params.Date }}" itemprop="datePublished">
-<meta content="{{ $page.Params.LastMod }}" itemprop="dateModified">
-
 <div class="article-metadata">
 
   {{/* If `authors` is set and is not empty. */}}
@@ -27,7 +24,7 @@
           {{ i18n "last_updated" }}
       {{ end }}
     {{ end }}
-    <time>{{ $date }}</time>
+    {{ $date }}
   </span>
   {{ end }}
 
diff --git a/layouts/publication/single.html b/layouts/publication/single.html
index 14fe724f..3b90a347 100644
--- a/layouts/publication/single.html
+++ b/layouts/publication/single.html
@@ -1,6 +1,6 @@
 {{- define "main" -}}
 
-<div class="pub" itemscope itemtype="http://schema.org/CreativeWork">
+<div class="pub">
 
   {{ partial "page_header.html" . }}
 
@@ -8,7 +8,7 @@
 
     {{ if .Params.abstract }}
     <h3>{{ i18n "abstract" }}</h3>
-    <p class="pub-abstract" itemprop="text">{{ .Params.abstract | markdownify }}</p>
+    <p class="pub-abstract">{{ .Params.abstract | markdownify }}</p>
     {{ end }}
 
     {{ if (.Params.publication_types) and (ne (index .Params.publication_types 0) "0") }}