cuirass: Restore search query.

* src/cuirass/templates.scm (search-form): Take the query as an argument and
set it as the value (unless #F).
(html-page): Optionally take a value for QUERY as an argument.
* src/cuirass/http.scm (url-handler): Let "search" handler pass QUERY to
HTML-PAGE.
This commit is contained in:
Ricardo Wurmus 2019-06-19 15:38:01 +02:00
parent c3ff064e97
commit 219506d5f9
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 8 additions and 5 deletions

View File

@ -440,7 +440,8 @@ Hydra format."
(border-high-id . ,border-high-id)))
builds-id-min
builds-id-max)
'()))
'()
query))
(respond-json-with-error 500 "Query parameter not provided!"))))
(("static" path ...)

View File

@ -45,7 +45,7 @@
,(assq-ref item #:name)))
(navigation-items rest)))))
(define search-form
(define (search-form query)
`(form (@ (id "search")
(class "form-inline")
(action "/search"))
@ -55,14 +55,16 @@
(class "form-control")
(id "query")
(name "query")
(placeholder "search for builds")))
,(if query
`(value ,query)
'(placeholder "search for builds"))))
(span (@ (class "input-group-append"))
(button
(@ (type "submit")
(class "btn btn-primary"))
"Search")))))
(define (html-page title body navigation)
(define* (html-page title body navigation #:optional query)
"Return HTML page with given TITLE and BODY."
`(html (@ (xmlns "http://www.w3.org/1999/xhtml")
(xml:lang "en")
@ -95,7 +97,7 @@
(href "/"))
Home))
,@(navigation-items navigation)))
,search-form)
,(search-form query))
(main (@ (role "main") (class "container pt-4 px-1"))
,body
(hr)))))