From abcab1b57d6bc3e6e44ff4d143f33bee8cc15a4d Mon Sep 17 00:00:00 2001 From: tdro Date: Tue, 6 Dec 2022 22:13:01 -0500 Subject: themes/default/layouts/_default/sitemap.xml: Add schema and transform Validate with schema. Switch to xml-data identifier attribute and adjust file name-spacing in configuration --- themes/default/layouts/_default/home.xslt.rss.xsl | 114 +++++++++++++++++++++ .../default/layouts/_default/home.xslt.sitemap.xsl | 97 ++++++++++++++++++ themes/default/layouts/_default/home.xslt.xsl | 114 --------------------- themes/default/layouts/_default/sitemap.xml | 68 ++++++++---- themes/default/layouts/partials/base-footer.html | 3 +- themes/default/layouts/shortcodes/version.html | 2 +- 6 files changed, 262 insertions(+), 136 deletions(-) create mode 100644 themes/default/layouts/_default/home.xslt.rss.xsl create mode 100644 themes/default/layouts/_default/home.xslt.sitemap.xsl delete mode 100644 themes/default/layouts/_default/home.xslt.xsl (limited to 'themes') diff --git a/themes/default/layouts/_default/home.xslt.rss.xsl b/themes/default/layouts/_default/home.xslt.rss.xsl new file mode 100644 index 0000000..e0be815 --- /dev/null +++ b/themes/default/layouts/_default/home.xslt.rss.xsl @@ -0,0 +1,114 @@ +{{- printf `` | safeHTML }} + + + + + + {{ printf `<xsl:value-of select="/rss/channel/title"/> Web Feed` | safeHTML }} + + + {{- $default := resources.Get "css/default.css" -}} + {{- if .Site.Params.site.production -}} + {{ $css := slice $default | resources.Concat "css/bundle.css" | resources.Minify | fingerprint }} + + {{- else }} + + {{- end }} + + + + + +
+ + + + + + +
+ + + + + + + + + + +
+
+ +

+ + + + +

+ Published: +
+
+
+
+
+
+ + + + +
+
diff --git a/themes/default/layouts/_default/home.xslt.sitemap.xsl b/themes/default/layouts/_default/home.xslt.sitemap.xsl new file mode 100644 index 0000000..167b773 --- /dev/null +++ b/themes/default/layouts/_default/home.xslt.sitemap.xsl @@ -0,0 +1,97 @@ +{{- printf `` | safeHTML }} + + + + + + {{ $.Site.Title }} Site Map + + + {{- $default := resources.Get "css/default.css" -}} + {{- if .Site.Params.site.production -}} + {{ $css := slice $default | resources.Concat "css/bundle.css" | resources.Minify | fingerprint }} + + {{- else }} + + {{- end }} + + + + + +
+ + +
+ + + + + + + + + + + + + +
+ + + Uniform Resource Locators (URLs) + +
+ + + + + + Last Modified: + Frequency: + Priority: + + + +
+
+
+
+ + + + +
+
diff --git a/themes/default/layouts/_default/home.xslt.xsl b/themes/default/layouts/_default/home.xslt.xsl deleted file mode 100644 index c242f70..0000000 --- a/themes/default/layouts/_default/home.xslt.xsl +++ /dev/null @@ -1,114 +0,0 @@ -{{- printf `` | safeHTML }} - - - - - - {{ printf `<xsl:value-of select="/rss/channel/title"/> Web Feed` | safeHTML }} - - - {{- $default := resources.Get "css/default.css" -}} - {{- if .Site.Params.site.production -}} - {{ $css := slice $default | resources.Concat "css/bundle.css" | resources.Minify | fingerprint }} - - {{- else }} - - {{- end }} - - - - - -
- - - - - - -
- - - - - - - - - - -
-
- -

- - - - -

- Published: -
-
-
-
-
-
- - - - -
-
diff --git a/themes/default/layouts/_default/sitemap.xml b/themes/default/layouts/_default/sitemap.xml index 63f5119..b751f65 100644 --- a/themes/default/layouts/_default/sitemap.xml +++ b/themes/default/layouts/_default/sitemap.xml @@ -1,22 +1,50 @@ -{{ printf "" | safeHTML }} - - {{ range .Data.Pages }} - - {{ .Permalink }}{{ if not .Lastmod.IsZero }} - {{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}{{ end }}{{ with .Sitemap.ChangeFreq }} - {{ . }}{{ end }}{{ if ge .Sitemap.Priority 0.0 }} - {{ .Sitemap.Priority }}{{ end }}{{ if .IsTranslated }}{{ range .Translations }} - {{ end }} - {{ end }} - +{{- printf `` | safeHTML }} +{{ printf `` | safeHTML }} + +{{- $changefreq := "weekly" -}} +{{- $priority := 0.5 -}} +{{- $lastmod := now.Format "2006-01-02T15:04:05-07:00" }} + + + {{- $notExpired := where .Data.Pages "Params.expirydate" "eq" nil -}} + {{- $notUnlisted := where .Data.Pages "Params.unlisted" "eq" nil -}} + {{- $filteredPages := $notExpired | intersect $notUnlisted -}} + {{- range $filteredPages }} + + {{- with .Sitemap.ChangeFreq -}} + {{- $changefreq = . -}} + {{- end -}} + + {{- if ge .Sitemap.Priority 0.0 -}} + {{- $priority = .Sitemap.Priority -}} + {{- end -}} + + {{- if not .Lastmod.IsZero -}} + {{- $lastmod = safeHTML (.Lastmod.Format "2006-01-02T15:04:05-07:00") -}} + {{- end }} + + + {{ .Permalink }} + {{ $lastmod }} + {{ $changefreq }} + {{ $priority }} + {{- if .IsTranslated -}} + {{ range .Translations }} + + {{- end -}} + + {{ end }} + {{ end }} diff --git a/themes/default/layouts/partials/base-footer.html b/themes/default/layouts/partials/base-footer.html index bda969c..f24b8d6 100644 --- a/themes/default/layouts/partials/base-footer.html +++ b/themes/default/layouts/partials/base-footer.html @@ -8,5 +8,6 @@ {{ $author.title }} {{- end -}} {{- end }} - | Copyright © {{ now.Format "2006"}} + · Copyright © {{ now.Format "2006"}} + · Site Map diff --git a/themes/default/layouts/shortcodes/version.html b/themes/default/layouts/shortcodes/version.html index 9c993b3..48aed2c 100644 --- a/themes/default/layouts/shortcodes/version.html +++ b/themes/default/layouts/shortcodes/version.html @@ -1,4 +1,4 @@ -{{- $version := "0.11.7" -}} +{{- $version := "0.11.8" -}} {{- $number := default false (.Get "number" | default (.Get 0)) -}} {{- $clone := default false (.Get "clone" | default (.Get 1)) -}} -- cgit v1.2.3