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

Remove hugolib.HTML and hugolib.URL types

Browse Source 
These types were not be rendered correctly by the html/template package.
Removing them gets the correct behavior.

Fixes #74
This commit is contained in:
Noah Campbell
2013-09-03 12:41:13 -07:00
parent a591a10626
commit 3ecc698f5e
7 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hugolib/site.go
View File

@@ -15,6 +15,7 @@ package hugolib
import (
"bitbucket.org/pkg/inflect"
"html/template"
"bytes"
"fmt"
"github.com/spf13/hugo/target"
@@ -41,7 +42,7 @@ type Site struct {
}
type SiteInfo struct {
BaseUrl URL
BaseUrl template.URL
Indexes OrderedIndexList
Recent *Pages
LastChange time.Time
@@ -169,7 +170,7 @@ func (s *Site) initialize() {
filepath.Walk(s.absContentDir(), walker)
s.Info = SiteInfo{
BaseUrl: URL(s.Config.BaseUrl),
BaseUrl: template.URL(s.Config.BaseUrl),
Title: s.Config.Title,
Recent: &s.Pages,
Config: &s.Config,
@@ -206,7 +207,7 @@ func (s *Site) checkDirectories() {
func (s *Site) ProcessShortcodes() {
for _, page := range s.Pages {
page.Content = HTML(ShortcodesHandle(string(page.Content), page, s.Tmpl))
page.Content = template.HTML(ShortcodesHandle(string(page.Content), page, s.Tmpl))
}
}
@@ -220,7 +221,7 @@ func (s *Site) AbsUrlify() {
content = strings.Replace(content, " href='/", " href='"+baseWithSlash, -1)
content = strings.Replace(content, " href=\"/", " href=\""+baseWithSlash, -1)
content = strings.Replace(content, baseWithoutTrailingSlash+"//", baseWithSlash, -1)
page.Content = HTML(content)
page.Content = template.HTML(content)
}
}
@@ -525,7 +526,7 @@ func (s *Site) RenderLists() error {
} else {
n.Url = Urlize(section + "/" + "index.xml")
}
n.Permalink = HTML(string(n.Site.BaseUrl) + n.Url)
n.Permalink = template.HTML(string(n.Site.BaseUrl) + n.Url)
y := s.NewXMLBuffer()
s.Tmpl.ExecuteTemplate(y, "rss.xml", n)
err = s.WritePublic(section+"/index.xml", y.Bytes())
@@ -591,8 +592,8 @@ func (s *Site) Stats() {
}
}
func permalink(s *Site, plink string) HTML {
return HTML(MakePermalink(string(s.Info.BaseUrl), plink))
func permalink(s *Site, plink string) template.HTML {
return template.HTML(MakePermalink(string(s.Info.BaseUrl), plink))
}
func (s *Site) NewNode() *Node {