diff --git a/layouts/_default/index.json b/layouts/_default/index.json index b301c8d6..a7260a52 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -4,28 +4,30 @@ {{ $pages = $pages | lang.Merge .Site.Pages }} {{ end }} {{- range $pages -}} - {{- $section := .Site.GetPage "section" .Section -}} - {{- if .Date -}} - {{- $index = $index | append (dict - "date" (.Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long")) - "title" (.Title | emojify | safeJS) - "section" ($section.Title | emojify | safeJS) - "summary" (.Summary | safeJS) - "content" (.Plain | safeJS) - "permalink" .RelPermalink - "externalUrl" .Params.externalUrl - "type" .Type - ) -}} - {{- else -}} - {{- $index = $index | append (dict - "title" (.Title | emojify | safeJS) - "section" ($section.Title | emojify | safeJS) - "summary" (.Summary | safeJS) - "content" (.Plain | safeJS) - "permalink" .RelPermalink - "externalUrl" .Params.externalUrl - "type" .Type - ) -}} + {{- if not .Params.excludeFromSearch -}} + {{- $section := .Site.GetPage "section" .Section -}} + {{- if .Date -}} + {{- $index = $index | append (dict + "date" (.Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long")) + "title" (.Title | emojify | safeJS) + "section" ($section.Title | emojify | safeJS) + "summary" (.Summary | safeJS) + "content" (.Plain | safeJS) + "permalink" .RelPermalink + "externalUrl" .Params.externalUrl + "type" .Type + ) -}} + {{- else -}} + {{- $index = $index | append (dict + "title" (.Title | emojify | safeJS) + "section" ($section.Title | emojify | safeJS) + "summary" (.Summary | safeJS) + "content" (.Plain | safeJS) + "permalink" .RelPermalink + "externalUrl" .Params.externalUrl + "type" .Type + ) -}} + {{- end -}} {{- end -}} {{- end -}} {{- $index | jsonify -}} \ No newline at end of file diff --git a/layouts/_default/sitemap.xml b/layouts/_default/sitemap.xml index 94c04d55..5fb89f21 100644 --- a/layouts/_default/sitemap.xml +++ b/layouts/_default/sitemap.xml @@ -1,7 +1,7 @@ {{ printf "" | safeHTML }} -{{ range .Data.Pages }}{{ if not (in .Site.Params.sitemap.excludedKinds .Kind) }}{{ if and (.Param "xml" | default true) (or (not .Params.externalUrl) (and (.Params.externalUrl) (and (not (hasPrefix .Params.externalUrl "http://")) (not (hasPrefix .Params.externalUrl "https://"))))) }} +{{ range .Data.Pages }}{{ if not (in .Site.Params.sitemap.excludedKinds .Kind) }}{{ if and (.Param "xml" | default true) (or (not .Params.externalUrl) (and (.Params.externalUrl) (and (not (hasPrefix .Params.externalUrl "http://")) (not (hasPrefix .Params.externalUrl "https://"))))) (not .Params.excludeFromSearch) }} {{- if .Permalink -}}{{ $link := .Permalink }}{{ if .Params.externalUrl }}{{ $link = printf "%s%s" .Site.BaseURL (substr .Params.externalUrl 1) }}{{ end }} {{ $link }}{{ if not .Lastmod.IsZero }}