Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-31 02:27:19 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed .Var to .Doc in Markdown templates

Browse Source 
Put the title into the .Doc variables as well.
Changed the test template file to use new names.
This commit is contained in:
Maxime 2015-07-24 22:14:05 +02:00
parent 97dcc79a7f
commit 24bdb433c9
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
middleware/markdown/process.go
View File

@ -20,9 +20,8 @@ const (
type MarkdownData struct {
middleware.Context
Var map[string]interface{}
Title string
Markdown string
Doc map[string]interface{}
markdown string
}
// Process processes the contents of a page in b. It parses the metadata
@ -69,7 +68,8 @@ func (md Markdown) Process(c Config, requestPath string, b []byte, ctx middlewar
markdown = blackfriday.Markdown(markdown, c.Renderer, 0)
// set it as body for template
metadata.Variables["markdown"] = string(markdown)
metadata.Variables["body"] = string(markdown)
metadata.Variables["title"] = metadata.Title
return md.processTemplate(c, requestPath, tmpl, metadata, ctx)
}
@ -90,10 +90,8 @@ func (md Markdown) processTemplate(c Config, requestPath string, tmpl []byte, me
return nil, err
}
mdData := MarkdownData{
Context: ctx,
Var: metadata.Variables,
Title: metadata.Title,
Markdown: metadata.Variables["markdown"].(string),
Context: ctx,
Doc: metadata.Variables,
}
if err = t.Execute(b, mdData); err != nil {
@ -166,7 +164,7 @@ func defaultTemplate(c Config, metadata Metadata, requestPath string) []byte {
title := metadata.Title
if title == "" {
title = filepath.Base(requestPath)
if body, _ := metadata.Variables["markdown"].([]byte); len(body) > 128 {
if body, _ := metadata.Variables["body"].([]byte); len(body) > 128 {
title = string(body[:128])
} else if len(body) > 0 {
title = string(body)
@ -191,7 +189,7 @@ const (
{{js}}
</head>
<body>
{{.Markdown}}
{{.Doc.body}}
</body>
</html>`
cssTemplate = `<link rel="stylesheet" href="{{url}}">`

6
middleware/markdown/testdata/markdown_tpl.html vendored
View File

@ -1,11 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<title>{{.Title}}</title>
<title>{{.Doc.title}}</title>
</head>
<body>
{{.Include "header.html"}}
Welcome to {{.Var.sitename}}!
{{.Markdown}}
Welcome to {{.Doc.sitename}}!
{{.Doc.body}}
</body>
</html>