From 59b7717e8fff9a71438775be0e4803448245425f Mon Sep 17 00:00:00 2001 From: Fotis Gimian Date: Sun, 10 May 2015 14:53:01 +1000 Subject: [PATCH] Added a skipped count for nodes in the overview and nodes pages --- puppetboard/static/css/puppetboard.css | 5 +++-- puppetboard/templates/index.html | 3 ++- puppetboard/templates/nodes.html | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/puppetboard/static/css/puppetboard.css b/puppetboard/static/css/puppetboard.css index c8eeb7a..0e2444b 100644 --- a/puppetboard/static/css/puppetboard.css +++ b/puppetboard/static/css/puppetboard.css @@ -31,12 +31,13 @@ th.tablesorter-headerDesc::after { } .status { - width: 47%; + width: 47.5%; text-align: center; display: block; } + .count { - width: 21%; + width: 14%; text-align: center; display: block; } diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html index a7dec4e..d43225c 100644 --- a/puppetboard/templates/index.html +++ b/puppetboard/templates/index.html @@ -88,10 +88,11 @@ {{node.status}} {% if node.status=='unreported'%} - {{ node.unreported_time }} + {{ node.unreported_time }} {% else %} {% if node.events['failures'] %}{{node.events['failures']}}{% else %}0{% endif%} {% if node.events['successes'] %}{{node.events['successes']}}{% else %}0{% endif%} + {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} {% endif %} diff --git a/puppetboard/templates/nodes.html b/puppetboard/templates/nodes.html index 4bc2b68..14cc0cf 100644 --- a/puppetboard/templates/nodes.html +++ b/puppetboard/templates/nodes.html @@ -35,6 +35,7 @@ {% else %} {% if node.events['failures'] %}{{node.events['failures']}}{% else %}0{% endif%} {% if node.events['successes'] %}{{node.events['successes']}}{% else %}0{% endif%} + {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} {% endif %} {{node.name}}