mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-17 21:01:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor layout selection code

Browse Source 
The render code path would use a fallback if there was an exception.
This change instead relies on explicit declaration of the layout to use
and includes a check to see if the layout indeed exists before
attempting to render it.
This commit is contained in:
Noah Campbell
2013-10-07 07:57:45 +03:00
parent 197aacb647
commit 9500ec1b6b
10 changed files with 134 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hugolib/site.go
View File

@@ -67,6 +67,7 @@ type Site struct {
Transformer transform.Transformer
Target target.Output
Alias target.AliasPublisher
Completed chan bool
}
type SiteInfo struct {
@@ -364,19 +365,21 @@ func (s *Site) RenderAliases() error {
func (s *Site) RenderPages() (err error) {
for _, p := range s.Pages {
var layout string
var layout []string
if !p.IsRenderable() {
layout = "__" + p.TargetPath()
_, err := s.Tmpl.New(layout).Parse(string(p.Content))
self := "__" + p.TargetPath()
_, err := s.Tmpl.New(self).Parse(string(p.Content))
if err != nil {
return err
}
layout = append(layout, self)
} else {
layout = p.Layout()
layout = append(layout, p.Layout()...)
layout = append(layout, "_default/single.html")
}
err := s.render(p, p.TargetPath(), layout, "_default/single.html")
err := s.render(p, p.TargetPath(), layout...)
if err != nil {
return err
}
@@ -484,7 +487,7 @@ func (s *Site) RenderHomePage() error {
n.Data["Pages"] = s.Pages[:9]
}
}
err := s.render(n, "/", "index.html")
err := s.render(n, "/", "index.html", "_default/single.html")
if err != nil {
return err
}
@@ -554,8 +557,6 @@ func (s *Site) render(d interface{}, out string, layouts ...string) (err error)
section, _ = page.RelPermalink()
}
fmt.Println("Section is:", section)
transformer := transform.NewChain(
&transform.AbsURL{BaseURL: s.Config.BaseUrl},
&transform.NavActive{Section: section},