LICENSE

@@ -1,12 +0,0 @@
-Copyright (c) 2019, Přemysl Janouch <p@janouch.name>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

cmd/sklad/container.tmpl

@@ -21,12 +21,13 @@
 {{ 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">
@@ -35,27 +36,25 @@
 	<input type=submit value="Odstranit">
 	</form>
 </header>
+
 <form method=post action="container?id={{ .Container.Id }}">
-		<textarea name=description
+<textarea name=description rows="{{ max 5 (lines .Container.Description) }}"
-			rows="{{ max 5 (lines .Container.Description) }}"
 	placeholder="Popis obalu nebo jeho obsahu">
-			{{- .Container.Description -}}
+{{ .Container.Description }}</textarea>
-		</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
+		<input type=text name=parent id=parent value="{{ .Container.Parent }}">
-					value="{{ .Container.Parent }}">
 	</div>
 	<input type=submit value="Uložit">
 </footer>
@@ -63,6 +62,7 @@
 </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,34 +97,26 @@
 <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,6 +1,5 @@
 {{ 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

@@ -12,7 +12,6 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
-	"sync"
 	"time"
 
 	"janouch.name/sklad/imgutil"
@@ -104,11 +103,8 @@ func handleContainer(w http.ResponseWriter, r *http.Request) {
 	var err error
 	if r.Method == http.MethodPost {
 		err = handleContainerPost(r)
-		// FIXME: This is rather ugly. When removing, we want to keep
+		// XXX: 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
@@ -309,8 +305,6 @@ func handleLabel(w http.ResponseWriter, r *http.Request) {
 	executeTemplate("label.tmpl", w, &params)
 }
 
-var mutex sync.Mutex
-
 func handle(w http.ResponseWriter, r *http.Request) {
 	if err := r.ParseForm(); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -320,9 +314,6 @@ func handle(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Cache-Control", "no-store")
 	}
 
-	mutex.Lock()
-	defer mutex.Unlock()
-
 	switch _, base := path.Split(r.URL.Path); base {
 	case "login":
 		handleLogin(w, r)

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,6 +22,7 @@
 <p>{{ .Description }}
 {{ end }}
 {{ else }}
+
 <section>
 <form method=post action="series">
 <header>
@@ -29,6 +30,7 @@
 	<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>
@@ -37,15 +39,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">
@@ -58,6 +60,7 @@
 {{ else }}
 <p>Nejsou žádné řady.
 {{ end }}
+
 {{ end }}
 
 {{ end }}