github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert "add preliminary support for content/index.md file to be homepage content"

Browse source 
This reverts commit 5f84bc02cd.
This commit is contained in:
Bjørn Erik Pedersen 2015-06-21 15:01:09 +02:00
parent 3eb301b57a
commit 6bcb7e83e7
1 changed files with 3 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
hugolib/site.go
View file

@ -1247,7 +1247,6 @@ func (s *Site) RenderSectionLists() error {
return nil return nil
} }
// When Paginating, HomePage is a Node
func (s *Site) newHomeNode() *Node { func (s *Site) newHomeNode() *Node {
n := s.NewNode() n := s.NewNode()
n.Title = n.Site.Title n.Title = n.Site.Title
@ -1257,43 +1256,9 @@ func (s *Site) newHomeNode() *Node {
return n return n
} }
func (s *Site) findHomePage() (*Page, error) {
for _, y := range s.Pages {
if y.Source.BaseFileName() == "index" && y.Source.Dir() == "" && strings.ToLower(y.Source.Ext()) != "xml" {
return y, nil
}
}
return nil, errors.New("No content file for homepage")
}
// Homepage is a special page
// Homepage is only rendered as a page when
// 1. a content/index.md is found
// 2. pagination isn't used for the homepage
func (s *Site) newHomePage() *Page {
var p *Page
p, _ = s.findHomePage()
if p == nil {
p, _ = NewPage("HugoHomePage")
p.Site = &s.Info
}
p.Title = p.Site.Title
p.URL = helpers.URLizeAndPrep("/")
p.URLPath.Permalink = s.permalink(p.URL)
p.RSSLink = s.permalink("/" + ".xml")
p.Data = make(map[string]interface{})
p.Data["Pages"] = s.Pages
return p
}
func (s *Site) RenderHomePage() error { func (s *Site) RenderHomePage() error {
n := s.newHomePage() n := s.newHomeNode()
layouts := s.appendThemeTemplates([]string{"index.html", "_default/list.html", "_default/single.html"}) layouts := s.appendThemeTemplates([]string{"index.html", "_default/list.html"})
//layouts := s.appendThemeTemplates([]string{"index.html", "_default/list.html"})
if err := s.renderAndWritePage("homepage", helpers.FilePathSeparator, n, layouts...); err != nil { if err := s.renderAndWritePage("homepage", helpers.FilePathSeparator, n, layouts...); err != nil {
return err return err
@ -1314,7 +1279,6 @@ func (s *Site) RenderHomePage() error {
continue continue
} }
// When paginating HomePage is a node
homePagerNode := s.newHomeNode() homePagerNode := s.newHomeNode()
homePagerNode.paginator = pager homePagerNode.paginator = pager
if pager.TotalPages() > 0 { if pager.TotalPages() > 0 {
@ -1352,8 +1316,7 @@ func (s *Site) RenderHomePage() error {
n.URL = helpers.URLize("404.html") n.URL = helpers.URLize("404.html")
n.Title = "404 Page not found" n.Title = "404 Page not found"
n.URLPath.Permalink = s.permalink("404.html") n.Permalink = s.permalink("404.html")
//n.Permalink = s.permalink("404.html")
nfLayouts := []string{"404.html"} nfLayouts := []string{"404.html"}
if nfErr := s.renderAndWritePage("404 page", "404.html", n, s.appendThemeTemplates(nfLayouts)...); nfErr != nil { if nfErr := s.renderAndWritePage("404 page", "404.html", n, s.appendThemeTemplates(nfLayouts)...); nfErr != nil {