tpl: Regenerate templates

This commit is contained in:
Bjørn Erik Pedersen 2020-12-16 12:20:02 +01:00
parent d2d493ab5d
commit a2d146ec32
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
4 changed files with 7 additions and 35 deletions

View file

@ -17,9 +17,6 @@ package page
import ( import (
"encoding/json" "encoding/json"
"html/template"
"time"
"github.com/bep/gitmap" "github.com/bep/gitmap"
"github.com/gohugoio/hugo/common/maps" "github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/config"
@ -29,6 +26,8 @@ import (
"github.com/gohugoio/hugo/media" "github.com/gohugoio/hugo/media"
"github.com/gohugoio/hugo/navigation" "github.com/gohugoio/hugo/navigation"
"github.com/gohugoio/hugo/source" "github.com/gohugoio/hugo/source"
"html/template"
"time"
) )
func MarshalPageToJSON(p Page) ([]byte, error) { func MarshalPageToJSON(p Page) ([]byte, error) {

View file

@ -16,11 +16,10 @@
package page package page
import ( import (
"html/template"
"github.com/gohugoio/hugo/common/hugo" "github.com/gohugoio/hugo/common/hugo"
"github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/helpers"
"github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/hugofs"
"html/template"
) )
// NewDeprecatedWarningPage adds deprecation warnings to the given implementation. // NewDeprecatedWarningPage adds deprecation warnings to the given implementation.
@ -36,77 +35,62 @@ func (p *pageDeprecated) Filename() string {
helpers.Deprecated("Page.Filename", "Use .File.Filename", false) helpers.Deprecated("Page.Filename", "Use .File.Filename", false)
return p.p.Filename() return p.p.Filename()
} }
func (p *pageDeprecated) Dir() string { func (p *pageDeprecated) Dir() string {
helpers.Deprecated("Page.Dir", "Use .File.Dir", false) helpers.Deprecated("Page.Dir", "Use .File.Dir", false)
return p.p.Dir() return p.p.Dir()
} }
func (p *pageDeprecated) IsDraft() bool { func (p *pageDeprecated) IsDraft() bool {
helpers.Deprecated("Page.IsDraft", "Use .Draft.", false) helpers.Deprecated("Page.IsDraft", "Use .Draft.", false)
return p.p.IsDraft() return p.p.IsDraft()
} }
func (p *pageDeprecated) Extension() string { func (p *pageDeprecated) Extension() string {
helpers.Deprecated("Page.Extension", "Use .File.Extension", false) helpers.Deprecated("Page.Extension", "Use .File.Extension", false)
return p.p.Extension() return p.p.Extension()
} }
func (p *pageDeprecated) Hugo() hugo.Info { func (p *pageDeprecated) Hugo() hugo.Info {
helpers.Deprecated("Page.Hugo", "Use the global hugo function.", false) helpers.Deprecated("Page.Hugo", "Use the global hugo function.", false)
return p.p.Hugo() return p.p.Hugo()
} }
func (p *pageDeprecated) Ext() string { func (p *pageDeprecated) Ext() string {
helpers.Deprecated("Page.Ext", "Use .File.Ext", false) helpers.Deprecated("Page.Ext", "Use .File.Ext", false)
return p.p.Ext() return p.p.Ext()
} }
func (p *pageDeprecated) LanguagePrefix() string { func (p *pageDeprecated) LanguagePrefix() string {
helpers.Deprecated("Page.LanguagePrefix", "Use .Site.LanguagePrefix.", false) helpers.Deprecated("Page.LanguagePrefix", "Use .Site.LanguagePrefix.", false)
return p.p.LanguagePrefix() return p.p.LanguagePrefix()
} }
func (p *pageDeprecated) GetParam(arg0 string) interface{} { func (p *pageDeprecated) GetParam(arg0 string) interface{} {
helpers.Deprecated("Page.GetParam", "Use .Param or .Params.myParam.", false) helpers.Deprecated("Page.GetParam", "Use .Param or .Params.myParam.", false)
return p.p.GetParam(arg0) return p.p.GetParam(arg0)
} }
func (p *pageDeprecated) LogicalName() string { func (p *pageDeprecated) LogicalName() string {
helpers.Deprecated("Page.LogicalName", "Use .File.LogicalName", false) helpers.Deprecated("Page.LogicalName", "Use .File.LogicalName", false)
return p.p.LogicalName() return p.p.LogicalName()
} }
func (p *pageDeprecated) BaseFileName() string { func (p *pageDeprecated) BaseFileName() string {
helpers.Deprecated("Page.BaseFileName", "Use .File.BaseFileName", false) helpers.Deprecated("Page.BaseFileName", "Use .File.BaseFileName", false)
return p.p.BaseFileName() return p.p.BaseFileName()
} }
func (p *pageDeprecated) RSSLink() template.URL { func (p *pageDeprecated) RSSLink() template.URL {
helpers.Deprecated("Page.RSSLink", "Use the Output Format's link, e.g. something like: \n {{ with .OutputFormats.Get \"RSS\" }}{{ .RelPermalink }}{{ end }}", false) helpers.Deprecated("Page.RSSLink", "Use the Output Format's link, e.g. something like:\n {{ with .OutputFormats.Get \"RSS\" }}{{ .RelPermalink }}{{ end }}", false)
return p.p.RSSLink() return p.p.RSSLink()
} }
func (p *pageDeprecated) TranslationBaseName() string { func (p *pageDeprecated) TranslationBaseName() string {
helpers.Deprecated("Page.TranslationBaseName", "Use .File.TranslationBaseName", false) helpers.Deprecated("Page.TranslationBaseName", "Use .File.TranslationBaseName", false)
return p.p.TranslationBaseName() return p.p.TranslationBaseName()
} }
func (p *pageDeprecated) URL() string { func (p *pageDeprecated) URL() string {
helpers.Deprecated("Page.URL", "Use .Permalink or .RelPermalink. If what you want is the front matter URL value, use .Params.url", false) helpers.Deprecated("Page.URL", "Use .Permalink or .RelPermalink. If what you want is the front matter URL value, use .Params.url", false)
return p.p.URL() return p.p.URL()
} }
func (p *pageDeprecated) ContentBaseName() string { func (p *pageDeprecated) ContentBaseName() string {
helpers.Deprecated("Page.ContentBaseName", "Use .File.ContentBaseName", false) helpers.Deprecated("Page.ContentBaseName", "Use .File.ContentBaseName", false)
return p.p.ContentBaseName() return p.p.ContentBaseName()
} }
func (p *pageDeprecated) UniqueID() string { func (p *pageDeprecated) UniqueID() string {
helpers.Deprecated("Page.UniqueID", "Use .File.UniqueID", false) helpers.Deprecated("Page.UniqueID", "Use .File.UniqueID", false)
return p.p.UniqueID() return p.p.UniqueID()
} }
func (p *pageDeprecated) FileInfo() hugofs.FileMetaInfo { func (p *pageDeprecated) FileInfo() hugofs.FileMetaInfo {
helpers.Deprecated("Page.FileInfo", "Use .File.FileInfo", false) helpers.Deprecated("Page.FileInfo", "Use .File.FileInfo", false)
return p.p.FileInfo() return p.p.FileInfo()

View file

@ -38,62 +38,50 @@ func (z zeroFile) Path() (o0 string) {
z.log.Println(".File.Path on zero object. Wrap it in if or with: {{ with .File }}{{ .Path }}{{ end }}") z.log.Println(".File.Path on zero object. Wrap it in if or with: {{ with .File }}{{ .Path }}{{ end }}")
return return
} }
func (z zeroFile) Section() (o0 string) { func (z zeroFile) Section() (o0 string) {
z.log.Println(".File.Section on zero object. Wrap it in if or with: {{ with .File }}{{ .Section }}{{ end }}") z.log.Println(".File.Section on zero object. Wrap it in if or with: {{ with .File }}{{ .Section }}{{ end }}")
return return
} }
func (z zeroFile) Lang() (o0 string) { func (z zeroFile) Lang() (o0 string) {
z.log.Println(".File.Lang on zero object. Wrap it in if or with: {{ with .File }}{{ .Lang }}{{ end }}") z.log.Println(".File.Lang on zero object. Wrap it in if or with: {{ with .File }}{{ .Lang }}{{ end }}")
return return
} }
func (z zeroFile) Filename() (o0 string) { func (z zeroFile) Filename() (o0 string) {
z.log.Println(".File.Filename on zero object. Wrap it in if or with: {{ with .File }}{{ .Filename }}{{ end }}") z.log.Println(".File.Filename on zero object. Wrap it in if or with: {{ with .File }}{{ .Filename }}{{ end }}")
return return
} }
func (z zeroFile) Dir() (o0 string) { func (z zeroFile) Dir() (o0 string) {
z.log.Println(".File.Dir on zero object. Wrap it in if or with: {{ with .File }}{{ .Dir }}{{ end }}") z.log.Println(".File.Dir on zero object. Wrap it in if or with: {{ with .File }}{{ .Dir }}{{ end }}")
return return
} }
func (z zeroFile) Extension() (o0 string) { func (z zeroFile) Extension() (o0 string) {
z.log.Println(".File.Extension on zero object. Wrap it in if or with: {{ with .File }}{{ .Extension }}{{ end }}") z.log.Println(".File.Extension on zero object. Wrap it in if or with: {{ with .File }}{{ .Extension }}{{ end }}")
return return
} }
func (z zeroFile) Ext() (o0 string) { func (z zeroFile) Ext() (o0 string) {
z.log.Println(".File.Ext on zero object. Wrap it in if or with: {{ with .File }}{{ .Ext }}{{ end }}") z.log.Println(".File.Ext on zero object. Wrap it in if or with: {{ with .File }}{{ .Ext }}{{ end }}")
return return
} }
func (z zeroFile) LogicalName() (o0 string) { func (z zeroFile) LogicalName() (o0 string) {
z.log.Println(".File.LogicalName on zero object. Wrap it in if or with: {{ with .File }}{{ .LogicalName }}{{ end }}") z.log.Println(".File.LogicalName on zero object. Wrap it in if or with: {{ with .File }}{{ .LogicalName }}{{ end }}")
return return
} }
func (z zeroFile) BaseFileName() (o0 string) { func (z zeroFile) BaseFileName() (o0 string) {
z.log.Println(".File.BaseFileName on zero object. Wrap it in if or with: {{ with .File }}{{ .BaseFileName }}{{ end }}") z.log.Println(".File.BaseFileName on zero object. Wrap it in if or with: {{ with .File }}{{ .BaseFileName }}{{ end }}")
return return
} }
func (z zeroFile) TranslationBaseName() (o0 string) { func (z zeroFile) TranslationBaseName() (o0 string) {
z.log.Println(".File.TranslationBaseName on zero object. Wrap it in if or with: {{ with .File }}{{ .TranslationBaseName }}{{ end }}") z.log.Println(".File.TranslationBaseName on zero object. Wrap it in if or with: {{ with .File }}{{ .TranslationBaseName }}{{ end }}")
return return
} }
func (z zeroFile) ContentBaseName() (o0 string) { func (z zeroFile) ContentBaseName() (o0 string) {
z.log.Println(".File.ContentBaseName on zero object. Wrap it in if or with: {{ with .File }}{{ .ContentBaseName }}{{ end }}") z.log.Println(".File.ContentBaseName on zero object. Wrap it in if or with: {{ with .File }}{{ .ContentBaseName }}{{ end }}")
return return
} }
func (z zeroFile) UniqueID() (o0 string) { func (z zeroFile) UniqueID() (o0 string) {
z.log.Println(".File.UniqueID on zero object. Wrap it in if or with: {{ with .File }}{{ .UniqueID }}{{ end }}") z.log.Println(".File.UniqueID on zero object. Wrap it in if or with: {{ with .File }}{{ .UniqueID }}{{ end }}")
return return
} }
func (z zeroFile) FileInfo() (o0 hugofs.FileMetaInfo) { func (z zeroFile) FileInfo() (o0 hugofs.FileMetaInfo) {
z.log.Println(".File.FileInfo on zero object. Wrap it in if or with: {{ with .File }}{{ .FileInfo }}{{ end }}") z.log.Println(".File.FileInfo on zero object. Wrap it in if or with: {{ with .File }}{{ .FileInfo }}{{ end }}")
return return

View file

@ -229,7 +229,7 @@ if (!doNotTrack) {
{{- $permalink := .Permalink }} {{- $permalink := .Permalink }}
{{- $siteSeries := .Site.Taxonomies.series }}{{ with .Params.series }} {{- $siteSeries := .Site.Taxonomies.series }}{{ with .Params.series }}
{{- range $name := . }} {{- range $name := . }}
{{- $series := index $siteSeries $name }} {{- $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 }}
@ -536,7 +536,8 @@ if (!doNotTrack) {
<div {{ with $class }}class="{{ . }}"{{ else }}style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden;"{{ end }}> <div {{ with $class }}class="{{ . }}"{{ else }}style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden;"{{ end }}>
<iframe src="https://{{ $ytHost }}/embed/{{ $id }}{{ with .Get "autoplay" }}{{ if eq . "true" }}?autoplay=1{{ end }}{{ end }}" {{ if not $class }}style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; border:0;" {{ end }}allowfullscreen title="{{ $title }}"></iframe> <iframe src="https://{{ $ytHost }}/embed/{{ $id }}{{ with .Get "autoplay" }}{{ if eq . "true" }}?autoplay=1{{ end }}{{ end }}" {{ if not $class }}style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; border:0;" {{ end }}allowfullscreen title="{{ $title }}"></iframe>
</div> </div>
{{ end -}}`}, {{ end -}}
`},
{`twitter_cards.html`, `{{- with $.Params.images -}} {`twitter_cards.html`, `{{- with $.Params.images -}}
<meta name="twitter:card" content="summary_large_image"/> <meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:image" content="{{ index . 0 | absURL }}"/> <meta name="twitter:image" content="{{ index . 0 | absURL }}"/>