Improved templating

6e7f3701 · Janne Mareike Koschinski · 8080553d · 6e7f3701 · 6e7f3701 · 6e7f3701
Commit 6e7f3701 authored 7 years ago by Janne Mareike Koschinski
--- a/templates/_footer.html
+++ b/templates/_footer.html
-{{ define "footer"}}
+{{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>
+<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
+{{define "navigation"}}
+<nav>
+    <ul>
+        <li class="title">ik8r</li>
+    {{if .Id}}
+        <li class="upload"><a href="/upload">Upload</a></li>
+        <li class="images"><a href="/me/images">My Images</a></li>
+        <li class="albums"><a href="/me/albums">My Albums</a></li>
+        <li class="me"><a href="/me/">{{.Name}}</a></li>
+    {{end}}
+    </ul>
+</nav>
+{{end}}
\ No newline at end of file
--- a/templates/me_images.html
+++ b/templates/me_images.html
 {{define "title"}}My Images | ik8r{{end}}
 {{define "content"}}
 <div class="images">
-{{ range .Images }}
-    <a class="image" href="/i/{{ .Id }}">
+{{range .Images}}
+    <a class="image" href="/i/{{.Id}}">
        <div class="image-container">
-            <img src="/i/{{ .Id }}t" >
+            <img src="/i/{{.Id}}t" >
        </div>
        <div class="info">
-            <p>{{ .OriginalName }}</p>
-            <p><time>{{ .CreatedAt.Format "2006-01-02 15:04" }}</time></p>
-            <p>{{ .MimeType }}</p>
+            <p>{{.OriginalName}}</p>
+            <p><time>{{.CreatedAt.Format "2006-01-02 15:04"}}</time></p>
+            <p>{{.MimeType}}</p>
        </div>
    </a>
-{{ end }}
+{{end}}
 </div>
 {{end}}
\ No newline at end of file
--- a/templates/upload.html
+++ b/templates/upload.html
 {{define "title"}}Upload | ik8r{{end}}
 {{define "content"}}
-{{ range .Results }}
-{{ if .Success }}
+{{range .Results}}
+{{if .Success}}
 <div class="info success">
-    <h2>Upload of {{ .Id }} finished. <a href="/i/{{ .Id }}">View</a>.</h2>
+    <h2>Upload of {{.Id}} finished. <a href="/i/{{.Id}}">View</a>.</h2>
 </div>
-{{ else }}
+{{else}}
 <div class="info error">
-    <h2>Upload of {{ .Id }} failed.</h2>
-{{ range .Errors }}
-    <pre>{{ . }}</pre>
-{{ end }}
+    <h2>Upload of {{.Id}} failed.</h2>
+{{range .Errors}}
+    <pre>{{.}}</pre>
+{{end}}
 </div>
-{{ end }}
-{{ end }}
+{{end}}
+{{end}}

 <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/>