404 is homeless - hugo - [fork] hugo port for 9front
(HTM) git clone git@git.drkhsh.at/hugo.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
(DIR) README
(DIR) LICENSE
---
(DIR) commit 664a97819f8eea0e1da399148958fe7a2ae2c8cc
(DIR) parent 50df31406fe4cb7fcc857f9689101ce65794e255
(HTM) Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sun, 28 Jun 2015 10:43:43 +0200
404 is homeless
Fixes #1235
Diffstat:
M hugolib/site.go | 2 ++
M hugolib/site_test.go | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
---
(DIR) diff --git a/hugolib/site.go b/hugolib/site.go
@@ -1314,7 +1314,9 @@ func (s *Site) RenderHomePage() error {
}
}
+ // TODO(bep) reusing the Home Node smells trouble
n.URL = helpers.URLize("404.html")
+ n.IsHome = false
n.Title = "404 Page not found"
n.Permalink = s.permalink("404.html")
(DIR) diff --git a/hugolib/site_test.go b/hugolib/site_test.go
@@ -398,9 +398,9 @@ func doTest404ShouldAlwaysHaveUglyUrls(t *testing.T, uglyURLs bool) {
s.initializeSiteInfo()
templatePrep(s)
- must(s.addTemplate("index.html", "Home Sweet Home"))
- must(s.addTemplate("_default/single.html", "{{.Content}}"))
- must(s.addTemplate("404.html", "Page Not Found"))
+ must(s.addTemplate("index.html", "Home Sweet Home. IsHome={{ .IsHome }}"))
+ must(s.addTemplate("_default/single.html", "{{.Content}} IsHome={{ .IsHome }}"))
+ must(s.addTemplate("404.html", "Page Not Found. IsHome={{ .IsHome }}"))
// make sure the XML files also end up with ugly urls
must(s.addTemplate("rss.xml", "<root>RSS</root>"))
@@ -421,9 +421,9 @@ func doTest404ShouldAlwaysHaveUglyUrls(t *testing.T, uglyURLs bool) {
doc string
expected string
}{
- {filepath.FromSlash("index.html"), "Home Sweet Home"},
- {filepath.FromSlash(expectedPagePath), "\n\n<h1 id=\"title:5d74edbb89ef198cd37882b687940cda\">title</h1>\n\n<p>some <em>content</em></p>\n"},
- {filepath.FromSlash("404.html"), "Page Not Found"},
+ {filepath.FromSlash("index.html"), "Home Sweet Home. IsHome=true"},
+ {filepath.FromSlash(expectedPagePath), "\n\n<h1 id=\"title:5d74edbb89ef198cd37882b687940cda\">title</h1>\n\n<p>some <em>content</em></p>\n IsHome=false"},
+ {filepath.FromSlash("404.html"), "Page Not Found. IsHome=false"},
{filepath.FromSlash("index.xml"), "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n<root>RSS</root>"},
{filepath.FromSlash("sitemap.xml"), "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n<root>SITEMAP</root>"},
}