Skip to content
Snippets Groups Projects
Commit 8080553d authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Improved templating

parent 2498a652
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
main.go
+ 7
− 1
View file @ 8080553d
...@@ -96,7 +96,13 @@ type UploadData struct { ...@@ -96,7 +96,13 @@ type UploadData struct {
} }
func returnResult(w http.ResponseWriter, templateName string, data interface{}) error { 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 { if err != nil {
return err return err
} }
......
templates/_base.html 0 → 100644
+ 4
− 0
View file @ 8080553d
{{template "header" .}}
{{template "navigation" .User}}
{{template "content" .}}
{{template "footer" .}}
\ No newline at end of file
templates/_footer.html 0 → 100644
+ 2
− 0
View file @ 8080553d
{{ define "footer"}}
{{end}}
\ No newline at end of file
templates/_header.html 0 → 100644
+ 7
− 0
View file @ 8080553d
{{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
templates/_navigation.html 0 → 100644
+ 10
− 0
View file @ 8080553d
{{ 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
templates/index.html
+ 2
− 14
View file @ 8080553d
<!DOCTYPE html> {{define "title"}}ik8r{{end}}
<meta charset="utf-8"> {{define "content"}}{{end}}
<title>ik8r</title> \ No newline at end of file
<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
templates/me_images.html
+ 16
− 26
View file @ 8080553d
<!DOCTYPE html> {{define "title"}}My Images | ik8r{{end}}
<meta charset="utf-8"> {{define "content"}}
<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>
<div class="images"> <div class="images">
{{ range .Images }} {{ range .Images }}
<a class="image" href="/i/{{ .Id }}"> <a class="image" href="/i/{{ .Id }}">
<div class="image-container"> <div class="image-container">
<img src="/i/{{ .Id }}t" > <img src="/i/{{ .Id }}t" >
</div> </div>
<div class="info"> <div class="info">
<p>{{ .OriginalName }}</p> <p>{{ .OriginalName }}</p>
<p><time>{{ .CreatedAt.Format "2006-01-02 15:04" }}</time></p> <p><time>{{ .CreatedAt.Format "2006-01-02 15:04" }}</time></p>
<p>{{ .MimeType }}</p> <p>{{ .MimeType }}</p>
</div> </div>
</a> </a>
{{ end }} {{ end }}
</div> </div>
\ No newline at end of file {{end}}
\ No newline at end of file
templates/upload.html
+ 4
− 14
View file @ 8080553d
<!DOCTYPE html> {{define "title"}}Upload | ik8r{{end}}
<meta charset="utf-8"> {{define "content"}}
<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>
{{ range .Results }} {{ range .Results }}
{{ if .Success }} {{ if .Success }}
<div class="info success"> <div class="info success">
...@@ -29,4 +18,5 @@ ...@@ -29,4 +18,5 @@
<form action="/upload/" method="POST" enctype="multipart/form-data"> <form action="/upload/" method="POST" enctype="multipart/form-data">
<input type="file" name="file" accept="image/jpeg,image/png,image/bmp,*.jpeg,*.jpg,*.png,*.bmp" multiple/> <input type="file" name="file" accept="image/jpeg,image/png,image/bmp,*.jpeg,*.jpg,*.png,*.bmp" multiple/>
<input type="submit"/> <input type="submit"/>
</form> </form>
\ No newline at end of file {{end}}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment