diff --git a/puppetboard/static/css/puppetboard.css b/puppetboard/static/css/puppetboard.css index 05794b4..c17e327 100644 --- a/puppetboard/static/css/puppetboard.css +++ b/puppetboard/static/css/puppetboard.css @@ -36,6 +36,55 @@ th.tablesorter-headerDesc::after { display: block; } +.ui.label.status { + color: white; + text-shadow: 0 0 1px; +} + +.ui.header.failed, .ui.line.failed { + color: #AA4643; +} + +.ui.label.failed { + background-color: #AA4643; +} + +.ui.header.changed, .ui.line.changed { + color: #4572A7; +} + +.ui.label.changed { + background-color: #4572A7; +} + +.ui.header.unreported { + color: #3D96AE; +} + +.ui.label.unreported { + background-color: #3D96AE; +} + +.ui.header.noop { + color: #DB843D; +} + +.ui.label.noop { + background-color: #DB843D; +} + +.ui.label.unchanged { + background-color: #89A54E; +} + +.ui.line.skipped { + color: orange; +} + +.ui.label.skipped { + background-color: orange; +} + .count { width: 14%; text-align: center; diff --git a/puppetboard/templates/_macros.html b/puppetboard/templates/_macros.html index 03a7c90..46b055c 100644 --- a/puppetboard/templates/_macros.html +++ b/puppetboard/templates/_macros.html @@ -150,13 +150,15 @@ {% macro status_counts(caller, status, node_name, events, current_env, unreported_time=False, report_hash=False) -%} {{ unreported_time }} {% else %} - {% if events['failures'] %}{{events['failures']}}{% else %}0{% endif%} - {% if events['successes'] %}{{events['successes']}}{% else %}0{% endif%} - {% if events['skips'] %}{{events['skips']}}{% else %}0{% endif%} + {% if events['failures'] %}{{events['failures']}}{% else %}0{% endif%} + {% if events['successes'] %}{{events['successes']}}{% else %}0{% endif%} + {% if events['skips'] %}{{events['skips']}}{% else %}0{% endif%} {% endif %} {%- endmacro %} {% macro render_pagination(pagination) -%} diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html index dcfe7be..3bf0d0a 100644 --- a/puppetboard/templates/index.html +++ b/puppetboard/templates/index.html @@ -8,7 +8,7 @@
-

+

{{stats['failed']}} {% if stats['failed']== 1 %} node {% else %} nodes {% endif %}

@@ -17,7 +17,7 @@
-

+

{{stats['noop']}} {% if stats['noop']== 1 %} node {% else %} nodes {% endif %}

@@ -26,7 +26,7 @@
-

+

{{stats['changed']}} {% if stats['changed']== 1 %} node {% else %} nodes {% endif %}

@@ -35,7 +35,7 @@
-

+

{{ stats['unreported'] }} {% if stats['unreported']== 1 %} node {% else %} nodes {% endif %}

diff --git a/puppetboard/templates/report.html b/puppetboard/templates/report.html index c640188..df05607 100644 --- a/puppetboard/templates/report.html +++ b/puppetboard/templates/report.html @@ -39,9 +39,11 @@ {% for event in events %} {% if not event.failed and event.item['old'] != event.item['new'] %} - + {% elif event.failed %} - + + {% else %} + {% endif %} {{event.item['type']}}[{{event.item['title']}}] {{event.status}}