From 575cc0ca8c4e5904c7ae77e76db812c52e5f8ed1 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 27 Mar 2022 18:44:06 +0530 Subject: [PATCH] Use `site` function instead of `.Site` or `$.Site` - The site function provides global access to the same data as the .Site page method. - Current context (`.`) is never considered. --- layouts/_default/archives.html | 2 +- layouts/_default/baseof.html | 4 +- layouts/_default/index.json | 2 +- layouts/_default/list.html | 8 +-- layouts/_default/rss.xml | 22 ++++---- layouts/_default/single.html | 4 +- layouts/_default/terms.html | 2 +- layouts/partials/author.html | 4 +- layouts/partials/breadcrumbs.html | 4 +- layouts/partials/cover.html | 6 +- layouts/partials/edit_post.html | 8 +-- layouts/partials/footer.html | 12 ++-- layouts/partials/head.html | 56 +++++++++---------- layouts/partials/header.html | 30 +++++----- layouts/partials/home_info.html | 4 +- layouts/partials/index_profile.html | 6 +- layouts/partials/post_canonical.html | 4 +- layouts/partials/post_meta.html | 2 +- layouts/partials/templates/opengraph.html | 10 ++-- layouts/partials/templates/schema_json.html | 28 +++++----- layouts/partials/templates/twitter_cards.html | 6 +- layouts/partials/translation_list.html | 4 +- layouts/robots.txt | 2 +- 23 files changed, 115 insertions(+), 115 deletions(-) diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 435d2a1e..e400e2c5 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -11,7 +11,7 @@ {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} -{{- if .Site.Params.ShowAllPagesInArchive }} +{{- if site.Params.ShowAllPagesInArchive }} {{- $pages = site.RegularPages }} {{- end }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 6dfe7415..3d13f07a 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,5 +1,5 @@ - + {{- partial "head.html" . }} @@ -9,7 +9,7 @@ {{- if (or (ne .Kind `page` ) (eq .Layout `archives`) (eq .Layout `search`)) -}} {{- print "list" -}} {{- end -}} -{{- if eq $.Site.Params.defaultTheme `dark` -}} +{{- if eq site.Params.defaultTheme `dark` -}} {{- print " dark" }} {{- end -}} " id="top"> diff --git a/layouts/_default/index.json b/layouts/_default/index.json index 2c86f7c4..feeb437d 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -1,5 +1,5 @@ {{- $.Scratch.Add "index" slice -}} -{{- range .Site.RegularPages -}} +{{- range site.RegularPages -}} {{- if and (not .Params.searchHidden) (ne .Layout `archives`) (ne .Layout `search`) }} {{- $.Scratch.Add "index" (dict "title" .Title "content" .Plain "permalink" .Permalink "summary" .Summary) -}} {{- end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 0cc1ad9e..f4ff6eca 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,6 +1,6 @@ {{- define "main" }} -{{- if (and .Site.Params.profileMode.enabled .IsHome) }} +{{- if (and site.Params.profileMode.enabled .IsHome) }} {{- partial "index_profile.html" . }} {{- else }} {{/* if not profileMode */}} @@ -32,7 +32,7 @@ {{- $paginator := .Paginate $pages }} -{{- if and .IsHome .Site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} +{{- if and .IsHome site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} {{- partial "home_info.html" . }} {{- end }} @@ -41,7 +41,7 @@ {{- $class := "post-entry" }} -{{- $user_preferred := or .Site.Params.disableSpecial1stPost .Site.Params.homeInfoParams }} +{{- $user_preferred := or site.Params.disableSpecial1stPost site.Params.homeInfoParams }} {{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0) (not $user_preferred)) }} {{- $class = "first-entry" }} {{- else if $term }} @@ -49,7 +49,7 @@ {{- end }}
- {{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList) }} + {{- $isHidden := (site.Params.cover.hidden | default site.Params.cover.hiddenInList) }} {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }}

diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index eca41b7e..134d50d4 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -1,31 +1,31 @@ {{- $pctx := . -}} -{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}} +{{- if .IsHome -}}{{ $pctx = site }}{{- end -}} {{- $pages := slice -}} {{- if or $.IsHome $.IsSection -}} {{- $pages = $pctx.RegularPages -}} {{- else -}} {{- $pages = $pctx.Pages -}} {{- end -}} -{{- $limit := .Site.Config.Services.RSS.Limit -}} +{{- $limit := site.Config.Services.RSS.Limit -}} {{- if ge $limit 1 -}} {{- $pages = $pages | first $limit -}} {{- end -}} {{- printf "" | safeHTML }} - {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} + {{ if eq .Title site.Title }}{{ site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ site.Title }}{{ end }} {{ .Permalink }} - Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} - {{- with $.Site.Params.images }} + Recent content {{ if ne .Title site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ site.Title }} + {{- with site.Params.images }} {{ index . 0 | absURL }} {{ index . 0 | absURL }} {{- end }} - Hugo -- gohugo.io{{ with .Site.LanguageCode }} - {{.}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} + Hugo -- gohugo.io{{ with site.LanguageCode }} + {{.}}{{end}}{{ with site.Author.email }} + {{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}}{{ with site.Author.email }} + {{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}}{{ with site.Copyright }} {{.}}{{end}}{{ if not .Date.IsZero }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} {{- with .OutputFormats.Get "RSS" -}} @@ -37,10 +37,10 @@ {{ .Title }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ with site.Author.email }}{{.}}{{ with site.Author.name }} ({{.}}){{end}}{{end}} {{ .Permalink }} {{ with .Description | html }}{{ . }}{{ else }}{{ .Summary | html }}{{ end -}} - {{- if .Site.Params.ShowFullTextinRSS }} + {{- if site.Params.ShowFullTextinRSS }} {{ (printf "" .Content) | safeHTML }} {{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 1d983fd0..d313500a 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -21,7 +21,7 @@ {{- end }}

- {{- $isHidden := .Params.cover.hidden | default .Site.Params.cover.hiddenInSingle | default .Site.Params.cover.hidden }} + {{- $isHidden := .Params.cover.hidden | default site.Params.cover.hiddenInSingle | default site.Params.cover.hidden }} {{- partial "cover.html" (dict "cxt" . "IsHome" false "isHidden" $isHidden) }} {{- if (.Param "ShowToc") }} {{- partial "toc.html" . }} @@ -46,7 +46,7 @@ {{- if (.Param "ShowPostNavLinks") }} {{- partial "post_nav_links.html" . }} {{- end }} - {{- if (and .Site.Params.ShowShareButtons (ne .Params.disableShare true)) }} + {{- if (and site.Params.ShowShareButtons (ne .Params.disableShare true)) }} {{- partial "share_icons.html" . -}} {{- end }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index d5a9e66e..6fd26540 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -16,7 +16,7 @@ {{- range $key, $value := .Data.Terms.Alphabetical }} {{- $name := .Name }} {{- $count := .Count }} - {{- with $.Site.GetPage (printf "/%s/%s" $type $name) }} + {{- with site.GetPage (printf "/%s/%s" $type $name) }}
  • {{ .Name }} {{ $count }}
    • diff --git a/layouts/partials/author.html b/layouts/partials/author.html index 4582b126..8f2758fa 100644 --- a/layouts/partials/author.html +++ b/layouts/partials/author.html @@ -1,5 +1,5 @@ -{{- if or .Params.author .Site.Params.author }} -{{- $author := (.Params.author | default .Site.Params.author) }} +{{- if or .Params.author site.Params.author }} +{{- $author := (.Params.author | default site.Params.author) }} {{- $author_type := (printf "%T" $author) }} {{- if (or (eq $author_type "[]string") (eq $author_type "[]interface {}")) }} {{- (delimit $author ", " ) }} diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index 742254a3..7e8257b7 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -1,6 +1,6 @@ {{- if (.Param "ShowBreadCrumbs") -}}
    - {{- $url := replace .Parent.Permalink (printf "%s" .Site.BaseURL) "" }} + {{- $url := replace .Parent.Permalink (printf "%s" site.BaseURL) "" }} {{- $lang_url := strings.TrimPrefix (printf "%s/" .Lang) $url -}} {{ i18n "home" | default "Home" }} @@ -8,7 +8,7 @@ {{- range $index, $element := split $lang_url "/" }} {{- $scratch.Add "path" (printf "%s/" $element )}} - {{- $bc_pg := $.Site.GetPage ($scratch.Get "path") -}} + {{- $bc_pg := site.GetPage ($scratch.Get "path") -}} {{- if (and ($bc_pg) (gt (len . ) 0))}} {{- print " ยป " | safeHTML -}}{{ $bc_pg.Name }} diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html index b4e7c786..5c5f2fbb 100644 --- a/layouts/partials/cover.html +++ b/layouts/partials/cover.html @@ -2,8 +2,8 @@ {{- if (and .Params.cover.image (not $.isHidden)) }} {{- $alt := (.Params.cover.alt | default .Params.cover.caption | plainify) }}
    - {{- $responsiveImages := (.Params.cover.responsiveImages | default .Site.Params.cover.responsiveImages) | default true }} - {{- $addLink := (and .Site.Params.cover.linkFullImages (not $.IsHome)) }} + {{- $responsiveImages := (.Params.cover.responsiveImages | default site.Params.cover.responsiveImages) | default true }} + {{- $addLink := (and site.Params.cover.linkFullImages (not $.IsHome)) }} {{- $cover := (.Resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }} {{- if $cover -}}{{/* i.e it is present in page bundle */}} {{- if $addLink }} - {{- .Params.editPost.Text | default (.Site.Params.editPost.Text | default (i18n "edit_post" | default "Edit")) -}} +{{- if or .Params.author site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) .IsTranslated }} | {{- end -}} + + {{- .Params.editPost.Text | default (site.Params.editPost.Text | default (i18n "edit_post" | default "Edit")) -}} {{- end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 8dee3280..d76058f8 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,9 +1,9 @@ {{- if not (.Param "hideFooter") }}
    - {{- if .Site.Copyright }} - {{ .Site.Copyright | markdownify }} + {{- if site.Copyright }} + {{ site.Copyright | markdownify }} {{- else }} - © {{ now.Year }} {{ .Site.Title }} + © {{ now.Year }} {{ site.Title }} {{- end }} Powered by @@ -13,7 +13,7 @@
    {{- end }} -{{- if (not .Site.Params.disableScrollToTop) }} +{{- if (not site.Params.disableScrollToTop) }} @@ -53,7 +53,7 @@ -{{- if (not .Site.Params.disableScrollToTop) }} +{{- if (not site.Params.disableScrollToTop) }} {{- end }} -{{- if (not .Site.Params.disableThemeToggle) }} +{{- if (not site.Params.disableThemeToggle) }} -{{- if hugo.IsProduction | or (eq .Site.Params.env "production") }} +{{- if hugo.IsProduction | or (eq site.Params.env "production") }} {{- else }} {{- end }} {{- /* Title */}} -{{ if .IsHome }}{{ else }}{{ if .Title }}{{ .Title }} | {{ end }}{{ end }}{{ .Site.Title }} +{{ if .IsHome }}{{ else }}{{ if .Title }}{{ .Title }} | {{ end }}{{ end }}{{ site.Title }} {{- /* Meta */}} {{- if .IsHome }} -{{ with .Site.Params.keywords -}}{{ end }} +{{ with site.Params.keywords -}}{{ end }} {{- else }} {{- end }} + {{- .Summary | default (printf "%s - %s" .Title site.Title) }}{{- else }} + {{- with site.Params.description }}{{ . }}{{- end }}{{- end }}{{- end -}}"> -{{- if .Site.Params.analytics.google.SiteVerificationTag }} - +{{- if site.Params.analytics.googlesiteVerificationTag }} + {{- end }} -{{- if .Site.Params.analytics.yandex.SiteVerificationTag }} - +{{- if site.Params.analytics.yandexsiteVerificationTag }} + {{- end }} -{{- if .Site.Params.analytics.bing.SiteVerificationTag }} - +{{- if site.Params.analytics.bingsiteVerificationTag }} + {{- end }} {{- /* Styles */}} @@ -40,7 +40,7 @@ {{- $common := (resources.Match "css/common/*.css") | resources.Concat "assets/css/common.css" }} {{- /* include `an-old-hope` if hljs is on */}} -{{- $isHLJSdisabled := (.Site.Params.assets.disableHLJS | default false) }} +{{- $isHLJSdisabled := (site.Params.assets.disableHLJS | default false) }} {{- $hljs := (cond ($isHLJSdisabled) (" " | resources.FromString "assets/css/hljs-blank.css") (resources.Get "css/hljs/an-old-hope.min.css")) }} {{- /* order is important */}} @@ -51,29 +51,29 @@ {{- /* Add extended css after theme style */ -}} {{- $stylesheet := (slice $core $extended) | resources.Concat "assets/css/stylesheet.css" | minify }} -{{- if not .Site.Params.assets.disableFingerprinting }} +{{- if not site.Params.assets.disableFingerprinting }} {{- $stylesheet := $stylesheet | fingerprint }} {{- else }} {{- end }} -{{- with .Site.Params.profileMode }} +{{- with site.Params.profileMode }} {{- if and .enabled .imageUrl $.IsHome }} {{- end }} {{- end }} -{{- with .Site.Params.label.icon }} +{{- with site.Params.label.icon }} {{- end }} {{- /* Search */}} {{- if (eq .Layout `search`) -}} -{{- $fastsearch := resources.Get "js/fastsearch.js" | js.Build (dict "params" (dict "fuseOpts" .Site.Params.fuseOpts)) }} +{{- $fastsearch := resources.Get "js/fastsearch.js" | js.Build (dict "params" (dict "fuseOpts" site.Params.fuseOpts)) }} {{- $fusejs := resources.Get "js/fuse.basic.min.js" }} -{{- if not .Site.Params.assets.disableFingerprinting }} +{{- if not site.Params.assets.disableFingerprinting }} {{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify | fingerprint }} {{- else }} @@ -83,9 +83,9 @@ {{- end -}} {{- /* Highlight.js */}} -{{- $isHLJSdisabled := (.Site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} +{{- $isHLJSdisabled := (site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} {{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }} -{{- if not .Site.Params.assets.disableFingerprinting }} +{{- if not site.Params.assets.disableFingerprinting }} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint }} @@ -96,13 +96,13 @@ {{- end }} {{- /* Favicons */}} - - - - - - - + + + + + + + {{- /* RSS */}} {{ range .AlternativeOutputFormats -}} @@ -120,7 +120,7 @@ } - {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + {{- if (and (ne site.Params.defaultTheme "light") (ne site.Params.defaultTheme "dark")) }}