Improved templating

8080553d · Janne Mareike Koschinski · 2498a652 · 8080553d · 8080553d · 8080553d
Commit 8080553d authored 7 years ago by Janne Mareike Koschinski
--- a/main.go
+++ b/main.go
@@ -96,7 +96,13 @@ type UploadData struct {
 }

 func returnResult(w http.ResponseWriter, templateName string, data interface{}) error {
-	pageTemplate, err := template.New(templateName).ParseFiles(fmt.Sprintf("templates/%s", templateName))
+	pageTemplate, err := template.ParseFiles(
+		"templates/_base.html",
+		"templates/_header.html",
+		"templates/_navigation.html",
+		"templates/_footer.html",
+		fmt.Sprintf("templates/%s", templateName),
+	)
 	if err != nil {
 		return err
 	}

--- a/templates/_base.html
+++ b/templates/_base.html
+{{template "header" .}}
+{{template "navigation" .User}}
+{{template "content" .}}
+{{template "footer" .}}
\ No newline at end of file
--- a/templates/_footer.html
+++ b/templates/_footer.html
+{{ define "footer"}}
+{{end}}
\ No newline at end of file
--- a/templates/_header.html
+++ b/templates/_header.html
+{{define "header"}}
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>{{ template "title" .}}</title>
+<link href="/assets/css/style.css" rel="stylesheet">
+<link href="/assets/css/fonts.css" rel="stylesheet">
+{{end}}
\ No newline at end of file
--- a/templates/_navigation.html
+++ b/templates/_navigation.html
+{{ define "navigation" }}
+{{ if .Id }}
+<p>Welcome, {{ .Name }}</p>
+<p>
+    <a href="/me/images">My Images</a> |
+    <a href="/me/albums">My Albums</a> |
+    <a href="/upload">Upload</a>
+</p>
+{{ end }}
+{{ end}}
\ No newline at end of file
--- a/templates/index.html
+++ b/templates/index.html
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>ik8r</title>
-<link href="/assets/css/style.css" rel="stylesheet">
-<link href="/assets/css/fonts.css" rel="stylesheet">
-
-{{ if .User.Id }}
-    <p>Welcome, {{ .User.Name }}</p>
-    <p>
-        <a href="/me/images">My Images</a> |
-        <a href="/me/albums">My Albums</a> |
-        <a href="/upload">Upload</a>
-    </p>
-{{ end }}
\ No newline at end of file
+{{define "title"}}ik8r{{end}}
+{{define "content"}}{{end}}
\ No newline at end of file
--- a/templates/me_images.html
+++ b/templates/me_images.html
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>My Images | ik8r</title>
-<link href="/assets/css/style.css" rel="stylesheet">
-<link href="/assets/css/fonts.css" rel="stylesheet">
-
-<p>Welcome, {{ .User.Name }}</p>
-<p>
-    <a href="/me/images">My Images</a> |
-    <a href="/me/albums">My Albums</a> |
-    <a href="/upload">Upload</a>
-</p>
-
+{{define "title"}}My Images | ik8r{{end}}
+{{define "content"}}
 <div class="images">
 {{ range .Images }}
    <a class="image" href="/i/{{ .Id }}">
@@ -25,3 +14,4 @@
    </a>
 {{ end }}
 </div>
+{{end}}
\ No newline at end of file
--- a/templates/upload.html
+++ b/templates/upload.html
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Upload | ik8r</title>
-<link href="/assets/css/style.css" rel="stylesheet">
-<link href="/assets/css/fonts.css" rel="stylesheet">
-
-<p>Welcome, {{ .User.Name }}</p>
-<p>
-    <a href="/me/images">My Images</a> |
-    <a href="/me/albums">My Albums</a> |
-    <a href="/upload">Upload</a>
-</p>
-
+{{define "title"}}Upload | ik8r{{end}}
+{{define "content"}}
 {{ range .Results }}
 {{ if .Success }}
 <div class="info success">
@@ -30,3 +19,4 @@
    <input type="file" name="file" accept="image/jpeg,image/png,image/bmp,*.jpeg,*.jpg,*.png,*.bmp" multiple/>
    <input type="submit"/>
 </form>
+{{end}}
\ No newline at end of file