update example

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
gin-contrib · Dec 20, 2016 · 5196daa · 5196daa
1 parent 2095b85
commit 5196daa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -38,8 +38,8 @@ import (
 
 func createMyRender() multitemplate.Render {
 	r := multitemplate.New()
-	r.AddFromFiles("index", "templates/base.html", "templates/base.html")
-	r.AddFromFiles("article", "templates/base.html", "templates/article.html")
+	r.AddFromFiles("index", "templates/base.html", "templates/index.html")
+	r.AddFromFiles("article", "templates/base.html", "templates/index.html", "templates/article.html")
 
 	return r
 }
@@ -53,7 +53,7 @@ func main() {
 		})
 	})
 	router.GET("/article", func(c *gin.Context) {
-		c.HTML(200, "index", gin.H{
+		c.HTML(200, "article", gin.H{
 			"title": "Html5 Article Engine",
 		})
 	})

diff --git a/example/example.go b/example/example.go
@@ -8,8 +8,9 @@ import (
 
 func createMyRender() multitemplate.Render {
 	r := multitemplate.New()
-	r.AddFromFiles("index", "templates/base.html", "templates/base.html")
-	r.AddFromFiles("article", "templates/base.html", "templates/article.html")
+	r.AddFromFiles("index", "templates/base.html", "templates/index.html")
+	r.AddFromFiles("article", "templates/base.html", "templates/index.html", "templates/article.html")
+
 	// r.AddFromFiles("login", "base.html", "login.html")
 	// r.AddFromFiles("dashboard", "base.html", "dashboard.html")
 
@@ -25,7 +26,7 @@ func main() {
 		})
 	})
 	router.GET("/article", func(c *gin.Context) {
-		c.HTML(200, "index", gin.H{
+		c.HTML(200, "article", gin.H{
 			"title": "Html5 Article Engine",
 		})
 	})

diff --git a/example/templates/article.html b/example/templates/article.html
@@ -1 +1 @@
-Welcome to {{ .title }}
+{{define "article.html"}}Hi, this is article template{{end}}
diff --git a/example/templates/base.html b/example/templates/base.html
@@ -1 +1,3 @@
-Welcome to {{ .title }}
+Title: {{ .title }}
+
+index template: {{template "index.html"}}
diff --git a/example/templates/index.html b/example/templates/index.html
@@ -0,0 +1 @@
+Hi, this is index.html