cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure all rows contain a column

Browse source 
As this helps with the layout, especially the whitespace to the left
on smaller screens.
This commit is contained in:
Christopher Baines 2019-03-17 23:32:54 +00:00
parent f7587bd818
commit 5a936ae101
Signed by: cbaines
GPG key ID: 5E28A33B0B84F577
1 changed files with 503 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

96
guix-data-service/web/view/html.scm
View file

@ -99,9 +99,13 @@
(@ (class "container")) (@ (class "container"))
(div (div
(@ (class "row")) (@ (class "row"))
(h1 "Guix Data Service")) (div
(@ (class "col-sm-12"))
(h1 "Guix Data Service")))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(form (form
(@ (id "compare") (@ (id "compare")
(action "/compare")) (action "/compare"))
@ -130,9 +134,11 @@
(button (button
(@ (type "submit") (@ (type "submit")
(class "btn btn-lg btn-primary")) (class "btn btn-lg btn-primary"))
"Compare")))) "Compare")))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Recent fetched revisions") (h3 "Recent fetched revisions")
,(if (null? guix-revisions) ,(if (null? guix-revisions)
'(p "No revisions") '(p "No revisions")
@ -151,9 +157,11 @@
(td (a (@ (href ,(string-append (td (a (@ (href ,(string-append
"/revision/" commit))) "/revision/" commit)))
(samp ,commit)))))) (samp ,commit))))))
guix-revisions))))) guix-revisions))))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Queued revisions") (h3 "Queued revisions")
,(if (null? queued-guix-revisions) ,(if (null? queued-guix-revisions)
'(p "No queued revisions") '(p "No queued revisions")
@ -172,7 +180,7 @@
(td ,url) (td ,url)
(td (samp ,commit)) (td (samp ,commit))
(td ,source)))) (td ,source))))
queued-guix-revisions))))))))) queued-guix-revisions))))))))))
(define (view-revision-package-and-version revision-commit-hash name version (define (view-revision-package-and-version revision-commit-hash name version
package-metadata package-metadata
@ -186,14 +194,20 @@
(@ (class "container")) (@ (class "container"))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 (a (@ (href ,(string-append (h3 (a (@ (href ,(string-append
"/revision/" revision-commit-hash))) "/revision/" revision-commit-hash)))
"Revision " (samp ,revision-commit-hash)))) "Revision " (samp ,revision-commit-hash)))))
(div (div
(@ (class "row")) (@ (class "row"))
(h1 "Package " ,name " @ " ,version)) (div
(@ (class "col-sm-12"))
(h1 "Package " ,name " @ " ,version)))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
,(match package-metadata ,(match package-metadata
(((synopsis description home-page)) (((synopsis description home-page))
`(dl `(dl
@ -204,9 +218,11 @@
(dd ,(stexi->shtml (texi-fragment->stexi description))) (dd ,(stexi->shtml (texi-fragment->stexi description)))
(dt "Home page") (dt "Home page")
(dd (a (@ (href ,home-page)) (dd (a (@ (href ,home-page))
,home-page)))))) ,home-page)))))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(table (table
(@ (class "table")) (@ (class "table"))
(thead (thead
@ -225,7 +241,7 @@
(td (a (@ (href ,file-name)) (td (a (@ (href ,file-name))
,(display-store-item-short file-name))) ,(display-store-item-short file-name)))
(td ,(build-status-span status))))) (td ,(build-status-span status)))))
derivations)))))))) derivations)))))))))
(define (view-revision commit-hash packages-count derivations-count) (define (view-revision commit-hash packages-count derivations-count)
(layout (layout
@ -288,11 +304,15 @@
(@ (class "container")) (@ (class "container"))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 (a (@ (href ,(string-append (h3 (a (@ (href ,(string-append
"/revision/" revision-commit-hash))) "/revision/" revision-commit-hash)))
"Revision " (samp ,revision-commit-hash)))) "Revision " (samp ,revision-commit-hash)))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h1 "Packages") (h1 "Packages")
(table (table
(@ (class "table table-responsive")) (@ (class "table table-responsive"))
@ -315,7 +335,7 @@
"/revision/" revision-commit-hash "/revision/" revision-commit-hash
"/package/" name "/" version))) "/package/" name "/" version)))
"More information"))))) "More information")))))
packages)))))))) packages)))))))))
(define (view-builds stats builds) (define (view-builds stats builds)
(layout (layout
@ -327,6 +347,8 @@
(@ (class "container")) (@ (class "container"))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h1 "Builds") (h1 "Builds")
(table (table
(@ (class "table")) (@ (class "table"))
@ -341,9 +363,11 @@
`(tr `(tr
(td ,(build-status-span status)) (td ,(build-status-span status))
(td ,count)))) (td ,count))))
stats)))) stats)))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(table (table
(@ (class "table")) (@ (class "table"))
(thead (thead
@ -368,7 +392,7 @@
(td (a (@ (href ,(simple-format (td (a (@ (href ,(simple-format
#f "~Abuild/~A" build-server-url build-id))) #f "~Abuild/~A" build-server-url build-id)))
"View build on " ,build-server-url))))) "View build on " ,build-server-url)))))
builds)))))))) builds)))))))))
(define (build-status-value->display-string value) (define (build-status-value->display-string value)
(assoc-ref (assoc-ref
@ -435,6 +459,8 @@
(@ (class "container")) (@ (class "container"))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
,(display-store-item-title filename)) ,(display-store-item-title filename))
,@(map (lambda (derivation derivations-using-store-item) ,@(map (lambda (derivation derivations-using-store-item)
`((div `((div
@ -460,7 +486,7 @@
,(display-store-item file-name))))) ,(display-store-item file-name)))))
derivations-using-store-item))))) derivations-using-store-item)))))
derivations derivations
derivations-using-store-item-list))))) derivations-using-store-item-list))))))
(define (view-derivation derivation derivation-inputs derivation-outputs (define (view-derivation derivation derivation-inputs derivation-outputs
builds) builds)
@ -560,6 +586,8 @@
(@ (class "container")) (@ (class "container"))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h1 (@ (class "pull-left")) (h1 (@ (class "pull-left"))
"Comparing " "Comparing "
(samp ,(string-take base-commit 8) "…") (samp ,(string-take base-commit 8) "…")
@ -574,15 +602,19 @@
"Compare packages") "Compare packages")
(a (@ (class "btn btn-default") (a (@ (class "btn btn-default")
(href ,(string-append "/compare/derivations" query-params))) (href ,(string-append "/compare/derivations" query-params)))
"Compare derivations"))) "Compare derivations"))))
(div (div
(@ (class "row") (style "clear: left;")) (@ (class "row") (style "clear: left;"))
(div
(@ (class "col-sm-12"))
(a (@ (class "btn btn-default btn-lg") (a (@ (class "btn btn-default btn-lg")
(href ,(string-append (href ,(string-append
"/compare.json" query-params))) "/compare.json" query-params)))
"View JSON")) "View JSON")))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 (@ (style "clear: both;")) (h3 (@ (style "clear: both;"))
"New packages") "New packages")
,(if (null? new-packages) ,(if (null? new-packages)
@ -601,9 +633,11 @@
`(tr `(tr
(td ,name) (td ,name)
(td ,version)))) (td ,version))))
new-packages))))) new-packages))))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Removed packages") (h3 "Removed packages")
,(if (null? removed-packages) ,(if (null? removed-packages)
'(p "No removed packages") '(p "No removed packages")
@ -621,9 +655,11 @@
`(tr `(tr
(td ,name) (td ,name)
(td ,version)))) (td ,version))))
removed-packages))))) removed-packages))))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Version changes") (h3 "Version changes")
,(if (null? version-changes) ,(if (null? version-changes)
'(p "No version changes") '(p "No version changes")
@ -652,9 +688,11 @@
" (old)" " (old)"
" (new)")))) " (new)"))))
versions)))))) versions))))))
version-changes))))) version-changes))))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Package derivation changes") (h3 "Package derivation changes")
,(if ,(if
(null? derivation-changes) (null? derivation-changes)
@ -726,7 +764,7 @@
,@(map (lambda (data-row) ,@(map (lambda (data-row)
`(tr ,data-row)) `(tr ,data-row))
(cdr data-columns)))))) (cdr data-columns))))))
(vector->list derivation-changes)))))))))) (vector->list derivation-changes)))))))))))
(define (compare/derivations valid-systems (define (compare/derivations valid-systems
valid-build-statuses valid-build-statuses
@ -883,6 +921,8 @@
"View JSON"))))) "View JSON")))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Base (" (h3 "Base ("
(samp ,base-commit) (samp ,base-commit)
")") ")")
@ -905,9 +945,11 @@
(td (samp ,system)) (td (samp ,system))
(td (samp ,target)) (td (samp ,target))
(td ,(build-status-span build-status))))) (td ,(build-status-span build-status)))))
base-derivations)))) base-derivations)))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Target (" (h3 "Target ("
(samp ,target-commit) (samp ,target-commit)
")") ")")
@ -930,7 +972,7 @@
(td (samp ,system)) (td (samp ,system))
(td (samp ,target)) (td (samp ,target))
(td ,(build-status-span build-status))))) (td ,(build-status-span build-status)))))
target-derivations)))))))) target-derivations)))))))))
(define (compare/packages base-commit (define (compare/packages base-commit
target-commit target-commit
@ -949,6 +991,8 @@
(@ (class "container")) (@ (class "container"))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h1 "Comparing " (h1 "Comparing "
(samp ,(string-take base-commit 8) "…") (samp ,(string-take base-commit 8) "…")
" and " " and "
@ -956,9 +1000,11 @@
(a (@ (class "btn btn-default btn-lg") (a (@ (class "btn btn-default btn-lg")
(href ,(string-append (href ,(string-append
"/compare/packages.json" query-params))) "/compare/packages.json" query-params)))
"View JSON")) "View JSON")))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Base (" (h3 "Base ("
(samp ,base-commit) (samp ,base-commit)
")") ")")
@ -985,9 +1031,11 @@
(delete-duplicates (delete-duplicates
(map (lambda (data) (map (lambda (data)
(take data 2)) (take data 2))
(vlist->list base-packages-vhash))))))) (vlist->list base-packages-vhash))))))))
(div (div
(@ (class "row")) (@ (class "row"))
(div
(@ (class "col-sm-12"))
(h3 "Target (" (h3 "Target ("
(samp ,target-commit) (samp ,target-commit)
")") ")")
@ -1014,7 +1062,7 @@
(delete-duplicates (delete-duplicates
(map (lambda (data) (map (lambda (data)
(take data 2)) (take data 2))
(vlist->list target-packages-vhash))))))))))) (vlist->list target-packages-vhash))))))))))))
(define (compare-unknown-commit base-commit target-commit (define (compare-unknown-commit base-commit target-commit
base-exists? target-exists? base-exists? target-exists?