sklad: clean up templates

cmd/sklad/container.tmpl

@@ -21,13 +21,12 @@
 {{ end }}
 
 {{ if .Container }}
-
 <section>
 	<header>
 		<h2>{{ .Container.Id }}
-{{ range .Container.Path }}
+		{{- range .Container.Path }}
 		<small>&laquo; <a href="container?id={{ . }}">{{ . }}</a></small>
-{{ end }}
+		{{- end }}
 		</h2>
 		<form method=post action="label?id={{ .Container.Id }}" target=_blank>
 			<input type=submit value="Vytisknout štítek">
@@ -36,25 +35,27 @@
 			<input type=submit value="Odstranit">
 		</form>
 	</header>
-
 	<form method=post action="container?id={{ .Container.Id }}">
-<textarea name=description rows="{{ max 5 (lines .Container.Description) }}"
+		<textarea name=description
+			rows="{{ max 5 (lines .Container.Description) }}"
 			placeholder="Popis obalu nebo jeho obsahu">
-{{ .Container.Description }}</textarea>
+			{{- .Container.Description -}}
+		</textarea>
 		<footer>
 			<div>
 				<label for=series>Řada:</label>
 				<select name=series id=series>
-{{ range $prefix, $desc := .AllSeries }}
+				{{- range $prefix, $desc := .AllSeries }}
 					<option value="{{ $prefix }}"
-				{{ if eq $prefix $.Container.Series }}selected{{ end }}
+						{{ if eq $prefix $.Container.Series }}selected{{ end -}}
 						>{{ $prefix }} &mdash; {{ $desc }}</option>
-{{ end }}
+				{{- end }}
 				</select>
 			</div>
 			<div>
 				<label for=parent>Nadobal:</label>
-		<input type=text name=parent id=parent value="{{ .Container.Parent }}">
+				<input type=text name=parent id=parent
+					value="{{ .Container.Parent }}">
 			</div>
 			<input type=submit value="Uložit">
 		</footer>
@@ -62,7 +63,6 @@
 </section>
 
 <h2>Podobaly</h3>
-
 {{ else }}
 <section>
 	<header>
@@ -75,10 +75,10 @@
 			<div>
 				<label for=series>Řada:</label>
 				<select name=series id=series>
-{{ range $prefix, $desc := .AllSeries }}
+				{{- range $prefix, $desc := .AllSeries }}
 					<option value="{{ $prefix }}"
 						>{{ $prefix }} &mdash; {{ $desc }}</option>
-{{ end }}
+				{{- end }}
 				</select>
 			</div>
 			<div>
@@ -97,26 +97,34 @@
 <section>
 	<header>
 		<h3><a href="container?id={{ .Id }}">{{ .Id }}</a>
-{{ range .Path }}
+		{{- range .Path }}
 		<small>&laquo; <a href="container?id={{ . }}">{{ . }}</a></small>
-{{ end }}
+		{{- end }}
 		</h3>
 		<form method=post action="label?id={{ .Id }}" target=_blank>
+			{{- if $.Container }}
+			<input type=hidden name=context value="{{ $.Container.Id }}">
+			{{- end }}
 			<input type=submit value="Vytisknout štítek">
 		</form>
 		<form method=post action="container?id={{ .Id }}&amp;remove">
+			{{- if $.Container }}
+			<input type=hidden name=context value="{{ $.Container.Id }}">
+			{{- end }}
 			<input type=submit value="Odstranit">
 		</form>
 	</header>
-{{ if .Description }}
+
+	{{- if .Description }}
 	<p>{{ .Description }}
-{{ end }}
+	{{- end }}
-{{ if .Children }}
+
+	{{- if .Children }}
 	<p>
-{{ range .Children }}
+	{{- range .Children }}
 	<a href="container?id={{ .Id }}">{{ .Id }}</a>
-{{ end }}
+	{{- end }}
-{{ end }}
+	{{- end }}
 </section>
 {{ else }}
 <p>Obal je prázdný.

cmd/sklad/label.tmpl

@@ -1,5 +1,6 @@
 {{ define "Title" }}Tisk štítku{{ end }}
 {{ define "Content" }}
+
 <h2>Tisk štítku pro <a href="container?id={{ .Id }}">{{ .Id }}</a></h2>
 
 {{ if .UnknownId }}

cmd/sklad/main.go

@@ -103,8 +103,11 @@ func handleContainer(w http.ResponseWriter, r *http.Request) {
 	var err error
 	if r.Method == http.MethodPost {
 		err = handleContainerPost(r)
-		// XXX: This is rather ugly. When removing, we want to keep
+		// FIXME: This is rather ugly. When removing, we want to keep
 		// the context id, in addition to the id being changed.
+		// TODO: If there were no errors, redirect the user to GET,
+		// which is related to the previous comment.
+		// TODO: If there were errors, use the last data as a prefill.
 	} else if r.Method != http.MethodGet {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return

cmd/sklad/search.tmpl

@@ -1,7 +1,7 @@
 {{ define "Title" }}„{{ .Query }}“ — Vyhledávání{{ end }}
 {{ define "Content" }}
 
-<h2>Vyhledávání: &bdquo;{{ .Query }}&ldquo;<h2>
+<h2>Vyhledávání: &bdquo;{{ .Query }}&ldquo;</h2>
 
 <h3>Řady</h3>
 
@@ -22,14 +22,14 @@
 <section>
 	<header>
 		<h3><a href="container?id={{ .Id }}">{{ .Id }}</a>
-{{ range .Path }}
+		{{- range .Path }}
 		<small>&laquo; <a href="container?id={{ . }}">{{ . }}</a></small>
-{{ end }}
+		{{- end }}
 		</h3>
 	</header>
-{{ if .Description }}
+	{{- if .Description }}
 	<p>{{ .Description }}
-{{ end }}
+	{{- end }}
 </section>
 {{ else }}
 <p>Neodpovídají žádné obaly.

cmd/sklad/series.tmpl

@@ -22,7 +22,6 @@
 <p>{{ .Description }}
 {{ end }}
 {{ else }}
-
 <section>
 	<form method=post action="series">
 		<header>
@@ -30,7 +29,6 @@
 			<input type=text name=prefix placeholder="Prefix řady">
 			<input type=text name=description placeholder="Popis řady"
 			><input type=submit value="Uložit">
-	</form>
 		</header>
 	</form>
 </section>
@@ -39,15 +37,15 @@
 <section>
 	<header>
 		<h3><a href="series?prefix={{ .Prefix }}">{{ .Prefix }}</a></h3>
-{{ with $count := len .Containers }}
+		{{- with $count := len .Containers }}
-{{ if eq $count 1 }}
+		{{- if eq $count 1 }}
 		<p>{{ $count }} obal
-{{ else if and (ge $count 2) (le $count 4) }}
+		{{- else if and (ge $count 2) (le $count 4) }}
 		<p>{{ $count }} obaly
-{{ else if gt $count 0 }}
+		{{- else if gt $count 0 }}
 		<p>{{ $count }} obalů
-{{ end }}
+		{{- end }}
-{{ end }}
+		{{- end }}
 		<form method=post action="series?prefix={{ .Prefix }}">
 			<input type=text name=description value="{{ .Description }}"
 			><input type=submit value="Uložit">
@@ -60,7 +58,6 @@
 {{ else }}
 <p>Nejsou žádné řady.
 {{ end }}
-
 {{ end }}
 
 {{ end }}