github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-28 21:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl/tplimpl: Remove trailing slash from void elements

Browse source 
Closes #11867
This commit is contained in:
Joe Mooring 2024-04-01 08:07:02 -07:00 committed by GitHub
parent f0a26cf58e
commit 2f7df4b926
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
hugolib/embedded_templates_test.go
View file

@ -60,13 +60,13 @@ title: My Site
b.Build(BuildCfg{}) b.Build(BuildCfg{})
b.AssertFileContent("public/mybundle/index.html", ` b.AssertFileContent("public/mybundle/index.html", `
<meta name="twitter:image" content="https://example.org/mybundle/featured-sunset.jpg" /> <meta name="twitter:image" content="https://example.org/mybundle/featured-sunset.jpg">
<meta name="twitter:title" content="My Bundle"/> <meta name="twitter:title" content="My Bundle">
<meta property="og:title" content="My Bundle" /> <meta property="og:title" content="My Bundle">
<meta property="og:url" content="https://example.org/mybundle/" /> <meta property="og:url" content="https://example.org/mybundle/">
<meta property="og:image" content="https://example.org/mybundle/featured-sunset.jpg" /> <meta property="og:image" content="https://example.org/mybundle/featured-sunset.jpg">
<meta property="article:published_time" content="2021-02-26T18:02:00-01:00" /> <meta property="article:published_time" content="2021-02-26T18:02:00-01:00">
<meta property="article:modified_time" content="2021-05-22T19:25:00-01:00" /> <meta property="article:modified_time" content="2021-05-22T19:25:00-01:00">
<meta itemprop="name" content="My Bundle"> <meta itemprop="name" content="My Bundle">
<meta itemprop="image" content="https://example.org/mybundle/featured-sunset.jpg"> <meta itemprop="image" content="https://example.org/mybundle/featured-sunset.jpg">
<meta itemprop="datePublished" content="2021-02-26T18:02:00-01:00"> <meta itemprop="datePublished" content="2021-02-26T18:02:00-01:00">
@ -74,13 +74,13 @@ title: My Site
`) `)
b.AssertFileContent("public/mypage/index.html", ` b.AssertFileContent("public/mypage/index.html", `
<meta name="twitter:image" content="https://example.org/pageimg1.jpg" /> <meta name="twitter:image" content="https://example.org/pageimg1.jpg">
<meta property="og:image" content="https://example.org/pageimg1.jpg" /> <meta property="og:image" content="https://example.org/pageimg1.jpg">
<meta property="og:image" content="https://example.org/pageimg2.jpg" /> <meta property="og:image" content="https://example.org/pageimg2.jpg">
<meta property="og:image" content="https://example.local/logo.png" /> <meta property="og:image" content="https://example.local/logo.png">
<meta property="og:image" content="https://example.org/mypage/sample.jpg" /> <meta property="og:image" content="https://example.org/mypage/sample.jpg">
<meta property="article:published_time" content="2021-02-26T18:02:00+01:00" /> <meta property="article:published_time" content="2021-02-26T18:02:00+01:00">
<meta property="article:modified_time" content="2021-05-22T19:25:00+01:00" /> <meta property="article:modified_time" content="2021-05-22T19:25:00+01:00">
<meta itemprop="image" content="https://example.org/pageimg1.jpg"> <meta itemprop="image" content="https://example.org/pageimg1.jpg">
<meta itemprop="image" content="https://example.org/pageimg2.jpg"> <meta itemprop="image" content="https://example.org/pageimg2.jpg">
<meta itemprop="image" content="https://example.local/logo.png"> <meta itemprop="image" content="https://example.local/logo.png">
@ -89,8 +89,8 @@ title: My Site
<meta itemprop="dateModified" content="2021-05-22T19:25:00+01:00"> <meta itemprop="dateModified" content="2021-05-22T19:25:00+01:00">
`) `)
b.AssertFileContent("public/mysite/index.html", ` b.AssertFileContent("public/mysite/index.html", `
<meta name="twitter:image" content="https://example.org/siteimg1.jpg" /> <meta name="twitter:image" content="https://example.org/siteimg1.jpg">
<meta property="og:image" content="https://example.org/siteimg1.jpg" /> <meta property="og:image" content="https://example.org/siteimg1.jpg">
<meta itemprop="image" content="https://example.org/siteimg1.jpg"> <meta itemprop="image" content="https://example.org/siteimg1.jpg">
`) `)
} }

28
tpl/tplimpl/embedded/templates/opengraph.html
View file

@ -1,25 +1,25 @@
<meta property="og:title" content="{{ .Title }}" /> <meta property="og:title" content="{{ .Title }}">
<meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}" /> <meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
<meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}" /> <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}">
<meta property="og:url" content="{{ .Permalink }}" /> <meta property="og:url" content="{{ .Permalink }}">
{{- $images := partial "_funcs/get-page-images" . -}} {{- $images := partial "_funcs/get-page-images" . -}}
{{- range first 6 $images -}} {{- range first 6 $images -}}
<meta property="og:image" content="{{ .Permalink }}" /> <meta property="og:image" content="{{ .Permalink }}">
{{- end -}} {{- end -}}
{{- if .IsPage }} {{- if .IsPage }}
{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} {{- $iso8601 := "2006-01-02T15:04:05-07:00" -}}
<meta property="article:section" content="{{ .Section }}" /> <meta property="article:section" content="{{ .Section }}">
{{ with .PublishDate }}<meta property="article:published_time" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end }} {{ with .PublishDate }}<meta property="article:published_time" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }}>{{ end }}
{{ with .Lastmod }}<meta property="article:modified_time" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end }} {{ with .Lastmod }}<meta property="article:modified_time" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }}>{{ end }}
{{- end -}} {{- end -}}
{{- with .Params.audio }}<meta property="og:audio" content="{{ . }}" />{{ end }} {{- with .Params.audio }}<meta property="og:audio" content="{{ . }}">{{ end }}
{{- with .Params.locale }}<meta property="og:locale" content="{{ . }}" />{{ end }} {{- with .Params.locale }}<meta property="og:locale" content="{{ . }}">{{ end }}
{{- with .Site.Params.title }}<meta property="og:site_name" content="{{ . }}" />{{ end }} {{- with .Site.Params.title }}<meta property="og:site_name" content="{{ . }}">{{ end }}
{{- with .Params.videos }}{{- range . }} {{- with .Params.videos }}{{- range . }}
<meta property="og:video" content="{{ . | absURL }}" /> <meta property="og:video" content="{{ . | absURL }}">
{{ end }}{{ end }} {{ end }}{{ end }}
{{- /* If it is part of a series, link to related articles */}} {{- /* If it is part of a series, link to related articles */}}
@ -29,7 +29,7 @@
{{ with .Params.series }}{{- range $name := . }} {{ with .Params.series }}{{- range $name := . }}
{{- $series := index $siteSeries ($name | urlize) }} {{- $series := index $siteSeries ($name | urlize) }}
{{- range $page := first 6 $series.Pages }} {{- range $page := first 6 $series.Pages }}
{{- if ne $page.Permalink $permalink }}<meta property="og:see_also" content="{{ $page.Permalink }}" />{{ end }} {{- if ne $page.Permalink $permalink }}<meta property="og:see_also" content="{{ $page.Permalink }}">{{ end }}
{{- end }} {{- end }}
{{ end }}{{ end }} {{ end }}{{ end }}
{{- end }} {{- end }}
@ -38,7 +38,7 @@
{{- with site.Params.social }} {{- with site.Params.social }}
{{- if reflect.IsMap . }} {{- if reflect.IsMap . }}
{{- with .facebook_admin }} {{- with .facebook_admin }}
<meta property="fb:admins" content="{{ . }}" /> <meta property="fb:admins" content="{{ . }}">
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

12
tpl/tplimpl/embedded/templates/twitter_cards.html
View file

@ -1,12 +1,12 @@
{{- $images := partial "_funcs/get-page-images" . -}} {{- $images := partial "_funcs/get-page-images" . -}}
{{- with index $images 0 -}} {{- with index $images 0 -}}
<meta name="twitter:card" content="summary_large_image" /> <meta name="twitter:card" content="summary_large_image">
<meta name="twitter:image" content="{{ .Permalink }}" /> <meta name="twitter:image" content="{{ .Permalink }}">
{{- else -}} {{- else -}}
<meta name="twitter:card" content="summary"/> <meta name="twitter:card" content="summary">
{{- end -}} {{- end -}}
<meta name="twitter:title" content="{{ .Title }}"/> <meta name="twitter:title" content="{{ .Title }}">
<meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}"/> <meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}">
{{- $twitterSite := "" }} {{- $twitterSite := "" }}
{{- with site.Params.social }} {{- with site.Params.social }}
@ -16,7 +16,7 @@
{{- if not (strings.HasPrefix . "@") }} {{- if not (strings.HasPrefix . "@") }}
{{- $content = printf "@%v" . }} {{- $content = printf "@%v" . }}
{{- end }} {{- end }}
<meta name="twitter:site" content="{{ $content }}"/> <meta name="twitter:site" content="{{ $content }}">
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}