shithub: hugo

Info  •  Files  •  Log  •  Branches

hugolib, tplimpl: Use OutputFormats to create atom links

--- a/hugolib/hugo_sites_build_test.go

+++ b/hugolib/hugo_sites_build_test.go

@@ -112,13 +112,13 @@

 	th.assertFileContent("public/en/sitemap.xml", "<loc>http://example.com/blog/en/</loc>")

 	// Check rss

-	// TODO(bep) output the Atom link must be cretated from the OutputFormats.RSS.Permalink

-	//	th.assertFileContent("public/fr/index.xml", `<atom:link href="http://example.com/blog/fr/index.xml"`)

-	//	th.assertFileContent("public/en/index.xml", `<atom:link href="http://example.com/blog/en/index.xml"`)

-	//	th.assertFileContent("public/fr/sect/index.xml", `<atom:link href="http://example.com/blog/fr/sect/index.xml"`)

-	//	th.assertFileContent("public/en/sect/index.xml", `<atom:link href="http://example.com/blog/en/sect/index.xml"`)

-	//	th.assertFileContent("public/fr/plaques/frtag1/index.xml", `<atom:link href="http://example.com/blog/fr/plaques/frtag1/index.xml"`)

-	//	th.assertFileContent("public/en/tags/tag1/index.xml", `<atom:link href="http://example.com/blog/en/tags/tag1/index.xml"`)

+	th.assertFileContent("public/fr/index.xml", `<atom:link href="http://example.com/blog/fr/index.xml"`,

+		`rel="self" type="application/rss+xml"`)

+	th.assertFileContent("public/en/index.xml", `<atom:link href="http://example.com/blog/en/index.xml"`)

+	th.assertFileContent("public/fr/sect/index.xml", `<atom:link href="http://example.com/blog/fr/sect/index.xml"`)

+	th.assertFileContent("public/en/sect/index.xml", `<atom:link href="http://example.com/blog/en/sect/index.xml"`)

+	th.assertFileContent("public/fr/plaques/frtag1/index.xml", `<atom:link href="http://example.com/blog/fr/plaques/frtag1/index.xml"`)

+	th.assertFileContent("public/en/tags/tag1/index.xml", `<atom:link href="http://example.com/blog/en/tags/tag1/index.xml"`)

 	// Check paginators

 	th.assertFileContent("public/fr/page/1/index.html", `refresh" content="0; url=http://example.com/blog/fr/"`)

--- a/tpl/tplimpl/template_embedded.go

+++ b/tpl/tplimpl/template_embedded.go

@@ -76,7 +76,9 @@

     <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}

     <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}

     <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}

-    <atom:link href="{{.Permalink}}" rel="self" type="application/rss+xml" />

+    {{ with .OutputFormats.Get "RSS" }}

+	{{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}

+    {{ end }}

     {{ range .Data.Pages }}

     <item>

       <title>{{ .Title }}</title>