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

Fix two errors in two internal templates

Browse source 
* template: _internal/_default/opengraph.html:39: unexpected EOF
 * template: _internal/_default/schema.html:15: unexpected {{end}}

Also change the DateTime inside these templates to ISO 8601 format,
and skip <meta itemprop="datePublished"> if `publishdate` is not set.

Perhaps it would be a good idea to expose `func (Time) IsZero`
to our templates?  :-)
This commit is contained in:
Anthony Fok 2015-01-20 02:43:42 -07:00
parent d897b1e8a7
commit edcdb6f49c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tpl/template_embedded.go
View file

@ -99,20 +99,20 @@ func (t *GoHtmlTemplate) EmbedTemplates() {
// Add SEO & Social metadata // Add SEO & Social metadata
t.AddInternalTemplate("_default", "opengraph.html", `<meta property="og:title" content="{{ .Title }}" /> t.AddInternalTemplate("_default", "opengraph.html", `<meta property="og:title" content="{{ .Title }}" />
<meta property="og:description" content="{{ if .Description }}{{ .Description }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ end }}{{ end }}" /> <meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ 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 }}" />
{{ with .Params.images }}{{ range first 6 . }} {{ with .Params.images }}{{ range first 6 . }}
<meta property="og:image" content="{{ . }}" /> <meta property="og:image" content="{{ . }}" />
{{ end }}{{ end }} {{ end }}{{ end }}
<meta property="og:updated_time" content="{{ .Date }}"/>{{ with .Params.audio }} <meta property="og:updated_time" content="{{ .Date.Format "2006-01-02T15:04:05-07:00" }}"/>{{ with .Params.audio }}
<meta property="og:audio" content="{{ . }}" />{{ end }}{{ with .Params.locale }} <meta property="og:audio" content="{{ . }}" />{{ end }}{{ with .Params.locale }}
<meta property="og:locale" content="{{ . }}" />{{ end }}{{ with .Site.Params.title }} <meta property="og:locale" content="{{ . }}" />{{ end }}{{ with .Site.Params.title }}
<meta property="og:site_name" content="{{ . }}" />{{ end }}{{ with .Params.videos }} <meta property="og:site_name" content="{{ . }}" />{{ end }}{{ with .Params.videos }}
{{ range .Params.videos }} {{ range .Params.videos }}
<meta property="og:video" content="{{ . }}" /> <meta property="og:video" content="{{ . }}" />
{{ 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 -->
{{ $permalink := .Permalink }} {{ $permalink := .Permalink }}
@ -133,7 +133,7 @@ func (t *GoHtmlTemplate) EmbedTemplates() {
<meta property="article:section" content="{{ .Section }}" /> <meta property="article:section" content="{{ .Section }}" />
{{ with .Params.tags }}{{ range first 6 . }} {{ with .Params.tags }}{{ range first 6 . }}
<meta property="article:tag" content="{{ . }}" />{{ end }}{{ end }} <meta property="article:tag" content="{{ . }}" />{{ end }}{{ end }}
{{ end }} {{ end }}{{ end }}
<!-- Facebook Page Admin ID for Domain Insights --> <!-- Facebook Page Admin ID for Domain Insights -->
{{ with .Site.Social.facebook_admin }}<meta property="fb:admins" content="{{ . }}" />{{ end }}`) {{ with .Site.Social.facebook_admin }}<meta property="fb:admins" content="{{ . }}" />{{ end }}`)
@ -162,11 +162,11 @@ func (t *GoHtmlTemplate) EmbedTemplates() {
t.AddInternalTemplate("_default", "schema.html", `{{ with .Site.Social.GooglePlus }}<link rel="publisher" href="{{ . }}"/>{{ end }} t.AddInternalTemplate("_default", "schema.html", `{{ with .Site.Social.GooglePlus }}<link rel="publisher" href="{{ . }}"/>{{ end }}
<meta itemprop="name" content="{{ .Title }}"> <meta itemprop="name" content="{{ .Title }}">
<meta itemprop="description" content="{{ if .Description }}{{ .Description }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ end }}{{ end }}"> <meta itemprop="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ end }}{{ end }}">
{{if .IsPage}} {{if .IsPage}}{{ $ISO8601 := "2006-01-02T15:04:05-07:00" }}{{ if ne (.PublishDate.Format $ISO8601) "0001-01-01T00:00:00+00:00" }}
<meta itemprop="datePublished" content="{{ .PublishDate }}" /> <meta itemprop="datePublished" content="{{ .PublishDate.Format $ISO8601 }}" />{{ end }}
<meta itemprop="dateModified" content="{{ .Date }}" /> <meta itemprop="dateModified" content="{{ .Date.Format $ISO8601 }}" />
<meta itemprop="wordCount" content="{{ .WordCount }}"> <meta itemprop="wordCount" content="{{ .WordCount }}">
{{ with .Params.images }}{{ range first 6 . }} {{ with .Params.images }}{{ range first 6 . }}
<meta itemprop="image" content="{{ . }}"> <meta itemprop="image" content="{{ . }}">
@ -174,6 +174,6 @@ func (t *GoHtmlTemplate) EmbedTemplates() {
<!-- Output all taxonomies as schema.org keywords --> <!-- Output all taxonomies as schema.org keywords -->
<meta itemprop="keywords" content="{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ printf "%s," $term }}{{ end }}{{ end }}" /> <meta itemprop="keywords" content="{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ printf "%s," $term }}{{ end }}{{ end }}" />
{{ end }}{{ end }}`) {{ end }}`)
} }