Changed .Var to .Doc in Markdown templates

Put the title into the .Doc variables as well. Changed the test template file to use new names.

Changed .Var to .Doc in Markdown templates
Put the title into the .Doc variables as well. Changed the test template file to use new names.
24bdb433 · Maxime · 97dcc79a · 24bdb433 · 24bdb433
Commit 24bdb433 authored Jul 24, 2015 by Maxime
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 13 deletions

middleware/markdown/process.go middleware/markdown/process.go +8 -10

middleware/markdown/testdata/markdown_tpl.html middleware/markdown/testdata/markdown_tpl.html +3 -3

No files found.
--- a/middleware/markdown/process.go
+++ b/middleware/markdown/process.go
@@ -20,9 +20,8 @@ const (
 type MarkdownData struct {
 	middleware.Context
-	Var      map[string]interface{}
+	Doc      map[string]interface{}
-	Title    string
+	markdown string
-	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)
 }
@@ -91,9 +91,7 @@ func (md Markdown) processTemplate(c Config, requestPath string, tmpl []byte, me
 	}
 	mdData := MarkdownData{
 		Context: ctx,
-		Var:      metadata.Variables,
+		Doc:     metadata.Variables,
-		Title:    metadata.Title,
-		Markdown: metadata.Variables["markdown"].(string),
 	}
 	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}}">`

--- a/middleware/markdown/testdata/markdown_tpl.html
+++ b/middleware/markdown/testdata/markdown_tpl.html
 <!DOCTYPE html>
 <html>
 <head>
-<title>{{.Title}}</title>
+<title>{{.Doc.title}}</title>
 </head>
 <body>
 {{.Include "header.html"}}
-Welcome to {{.Var.sitename}}!
+Welcome to {{.Doc.sitename}}!
-{{.Markdown}}
+{{.Doc.body}}
 </body>
 </html>