sklad: show whole container descriptions
This commit is contained in:
parent
82c6c34ea5
commit
0b32fa576f
|
@ -36,7 +36,7 @@
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<form method=post action="container?id={{ .Container.Id }}">
|
<form method=post action="container?id={{ .Container.Id }}">
|
||||||
<textarea name=description rows=5>
|
<textarea name=description rows="{{ max 5 (lines .Container.Description) }}">
|
||||||
{{ .Container.Description }}
|
{{ .Container.Description }}
|
||||||
</textarea>
|
</textarea>
|
||||||
<footer>
|
<footer>
|
||||||
|
|
|
@ -334,6 +334,18 @@ func handle(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var funcMap = template.FuncMap{
|
||||||
|
"max": func(i, j int) int {
|
||||||
|
if i > j {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
return j
|
||||||
|
},
|
||||||
|
"lines": func(s string) int {
|
||||||
|
return strings.Count(s, "\n") + 1
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
// Randomize the RNG for session string generation.
|
// Randomize the RNG for session string generation.
|
||||||
rand.Seed(time.Now().UnixNano())
|
rand.Seed(time.Now().UnixNano())
|
||||||
|
@ -356,7 +368,8 @@ func main() {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
}
|
}
|
||||||
for _, name := range m {
|
for _, name := range m {
|
||||||
templates[name] = template.Must(template.ParseFiles("base.tmpl", name))
|
templates[name] = template.Must(template.New("base.tmpl").
|
||||||
|
Funcs(funcMap).ParseFiles("base.tmpl", name))
|
||||||
}
|
}
|
||||||
|
|
||||||
http.HandleFunc("/", handle)
|
http.HandleFunc("/", handle)
|
||||||
|
|
Loading…
Reference in New Issue