diff --git a/extra/webapps/mason/dashboard.xml b/extra/webapps/mason/dashboard.xml index 4ce01bff83..d6d4651ece 100644 --- a/extra/webapps/mason/dashboard.xml +++ b/extra/webapps/mason/dashboard.xml @@ -3,22 +3,26 @@ <t:chloe xmlns:t="http://factorcode.org/chloe/1.0"> <t:title>Mason dashboard</t:title> - <h1>Force build now</h1> - <t:form t:action="$mason-app/dashboard/increment-counter"> - <p><button type="submit">Increment counter</button></p> - </t:form> - <h1>Crashed build machines</h1> - <p>Crashed machines have not sent a heartbeat for several hours.</p> + <p>Crashed machines have not sent a heartbeat for several hours:</p> <t:xml t:name="crashed" /> <h1>Broken build machines</h1> - <p>Broken machines have not had a successful build for over a week.</p> + <p>Broken machines have not had a successful build for over a week:</p> <t:xml t:name="broken" /> + <h1>Force build now</h1> + <p>Requires build engineer status.</p> + + <t:form t:action="$mason-app/dashboard/increment-counter"> + <p><button type="submit">Increment counter</button></p> + </t:form> + <h1>Make a release</h1> + <p>Requires build engineer status.</p> + <t:form t:action="$mason-app/dashboard/make-release"> <table> <tr><td>Version:</td><td><t:field t:name="version" /></td></tr> diff --git a/extra/webapps/mason/dashboard/dashboard.factor b/extra/webapps/mason/dashboard/dashboard.factor index c6edd2ec99..cae5932b35 100644 --- a/extra/webapps/mason/dashboard/dashboard.factor +++ b/extra/webapps/mason/dashboard/dashboard.factor @@ -9,7 +9,9 @@ IN: webapps.mason.downloads [ package-url ] [ [ os>> ] [ cpu>> ] bi "/" glue ] bi [XML <li><a href=<->><-></a></li> XML] ] map - [XML <ul><-></ul> XML] ; + [ [XML <p>No machines.</p> XML] ] + [ [XML <ul><-></ul> XML] ] + if-empty ; : <dashboard-action> ( -- action ) <page-action> diff --git a/extra/webapps/mason/downloads.xml b/extra/webapps/mason/downloads.xml index fd9acf35d0..3fcb997d83 100644 --- a/extra/webapps/mason/downloads.xml +++ b/extra/webapps/mason/downloads.xml @@ -14,6 +14,6 @@ <t:xml t:name="package-grid" /> </table> -<p><t:a t:href="$mason-app/dashboard">Build farm dashboard</t:a> (core team only)</p>. +<p>If you're curious, take a look at the <t:a t:href="$mason-app/dashboard">Build farm dashboard</t:a>.</p> </t:chloe> diff --git a/extra/webapps/mason/mason.factor b/extra/webapps/mason/mason.factor index 4f816bb482..25736b884a 100644 --- a/extra/webapps/mason/mason.factor +++ b/extra/webapps/mason/mason.factor @@ -47,10 +47,10 @@ build-engineer? define-capability { mason-app "dashboard" } >>template "" add-responder - <make-release-action> + <make-release-action> <mason-protected> "increment-counter" add-responder - <increment-counter-action> + <increment-counter-action> <mason-protected> "increment-counter" add-responder - <mason-protected> "dashboard" add-responder ; + "dashboard" add-responder ;