-
-
Notifications
You must be signed in to change notification settings - Fork 7.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changes: - Remove trailing comma from list of keywords. - Improve keywords precedence: 1. Use "keywords" term page titles. 2. Use "keywords" from front matter if "keywords" is not a taxonomy. 3. Use "tags" term page titles. 4. Use term page titles from all taxonomies. - Enable schema for all page kinds, previously limited to kind = page. - Remove trailing slashes from void elements. - Improve readability. Closes #7570 Co-authored by: 0urobor0s <0urobor0s@users.noreply.github.com>
- Loading branch information
Showing
2 changed files
with
64 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,56 @@ | ||
<meta itemprop="name" content="{{ .Title }}"> | ||
<meta itemprop="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}"> | ||
|
||
{{- if .IsPage -}} | ||
{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} | ||
{{ with .PublishDate }}<meta itemprop="datePublished" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end}} | ||
{{ with .Lastmod }}<meta itemprop="dateModified" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end}} | ||
<meta itemprop="wordCount" content="{{ .WordCount }}"> | ||
|
||
{{- $images := partial "_funcs/get-page-images" . -}} | ||
{{- range first 6 $images -}} | ||
<meta itemprop="image" content="{{ .Permalink }}" /> | ||
{{- end -}} | ||
{{- with or .Title site.Title }} | ||
<meta itemprop="name" content="{{ . }}"> | ||
{{- end }} | ||
|
||
{{- with or .Description .Summary site.Params.Description }} | ||
<meta itemprop="description" content="{{ . }}"> | ||
{{- end }} | ||
|
||
{{- $ISO8601 := "2006-01-02T15:04:05-07:00" }} | ||
{{- with .PublishDate }} | ||
<meta itemprop="datePublished" {{ .Format $ISO8601 | printf "content=%q" | safeHTMLAttr }}> | ||
{{- end }} | ||
|
||
{{- with .Lastmod }} | ||
<meta itemprop="dateModified" {{ .Format $ISO8601 | printf "content=%q" | safeHTMLAttr }}> | ||
{{- end }} | ||
|
||
{{- with .WordCount }} | ||
<meta itemprop="wordCount" content="{{ . }}"> | ||
{{- end }} | ||
|
||
{{- $images := partial "_funcs/get-page-images" . }} | ||
{{- range first 6 $images }} | ||
<meta itemprop="image" content="{{ .Permalink }}"> | ||
{{- end }} | ||
|
||
{{- /* | ||
Keywords precedence: | ||
|
||
1. Use "keywords" term page titles. | ||
2. Use "keywords" from front matter if "keywords" is not a taxonomy. | ||
3. Use "tags" term page titles. | ||
4. Use term page titles from all taxonomies. | ||
|
||
<!-- Output all taxonomies as schema.org keywords --> | ||
<meta itemprop="keywords" content="{{ if .IsPage}}{{ range $index, $tag := .Params.tags }}{{ $tag }},{{ end }}{{ else }}{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ printf "%s," $term }}{{ end }}{{ end }}{{ end }}" /> | ||
*/}} | ||
{{- $keywords := slice }} | ||
{{- range .GetTerms "keywords" }} | ||
{{- $keywords = $keywords | append .Title }} | ||
{{- else }} | ||
{{- with .Keywords }} | ||
{{- $keywords = . }} | ||
{{- else }} | ||
{{- range .GetTerms "tags" }} | ||
{{- $keywords = $keywords | append .Title }} | ||
{{- else }} | ||
{{- range $taxonomy, $_ := site.Taxonomies }} | ||
{{- range $.GetTerms $taxonomy }} | ||
{{- $keywords = $keywords | append .Title }} | ||
{{- end }} | ||
{{- end }} | ||
{{- end }} | ||
{{- end }} | ||
{{- end }} | ||
{{- with $keywords }} | ||
<meta itemprop="keywords" content="{{ delimit . `,` }}"> | ||
{{- end -}} |