Skip to content

Commit 5eec243

Browse files
authored
Merge pull request #667 from voxpupuli/visual_tweaks
Visual tweaks
2 parents 5c543b1 + 69993a2 commit 5eec243

File tree

5 files changed

+22
-12
lines changed

5 files changed

+22
-12
lines changed

puppetboard/static/css/puppetboard.css

+4
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ h1.ui.header.no-margin-bottom {
7777
background-color: #989898;
7878
}
7979

80+
.ui.header.unchanged {
81+
color: #89A54E;
82+
}
83+
8084
.ui.label.unchanged {
8185
background-color: #89A54E;
8286
}

puppetboard/templates/index.html

+13-6
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,17 @@ <h1 class="ui header changed no-margin-bottom">
4141
</a>
4242
<span>with status changed</span>
4343
</div>
44+
<div class="column">
45+
<a href="{{url_for('nodes', env=current_env, status='unchanged')}}">
46+
<h1 class="ui header unchanged no-margin-bottom">
47+
{{stats['unchanged']}}
48+
<small>{% if stats['unchanged'] == 1 %} node {% else %} nodes {% endif %}</small>
49+
</h1>
50+
</a>
51+
<span>with status unchanged</span>
52+
</div>
53+
</div>
54+
<div class="four column row">
4455
<div class="column">
4556
<a href="{{url_for('nodes', env=current_env, status='unreported')}}">
4657
<h1 class="ui header unreported no-margin-bottom">
@@ -50,10 +61,6 @@ <h1 class="ui header unreported no-margin-bottom">
5061
</a>
5162
<span>unreported in the last {{ config.UNRESPONSIVE_HOURS }} hours</span>
5263
</div>
53-
</div>
54-
<div class="four column row">
55-
<div class="column">
56-
</div>
5764
<div class="column">
5865
<h1 class="ui header darkblue no-margin-bottom">{{metrics['num_nodes']}}</h1>
5966
<span>Population</span>
@@ -76,7 +83,7 @@ <h1 class="ui header darkblue no-margin-bottom">{{metrics['avg_resources_node']}
7683
<div class="one column row">
7784
<div class="column">
7885
{% if nodes %}
79-
<h2>Nodes status detail ({{nodes|length}})</h2>
86+
<h2>Nodes, except with status unchanged ({{nodes|length}})</h2>
8087
<table class='ui sortable very compact very basic table'>
8188
<thead>
8289
<tr>
@@ -118,7 +125,7 @@ <h2>Nodes status detail ({{nodes|length}})</h2>
118125
</tbody>
119126
</table>
120127
{% else %}
121-
<h2>Nodes status detail</h2>
128+
<h2>Nodes, except with status unchanged</h2>
122129
<div class="ui info message">
123130
Nothing seems to be changing.
124131
</div>

puppetboard/templates/layout.html

-5
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,5 @@
106106
<i class="large arrow up icon"></i>
107107
</div>
108108

109-
<footer class="ui absolute fixed bottom">
110-
<div>
111-
Copyright &copy; 2013-{{ now('%Y') }} <a href="https://github.com/voxpupuli" target="_blank">Puppet Community</a>. <span style="float:right">Live from PuppetDB.</span>
112-
</div>
113-
</footer>
114109
</body>
115110
</html>

puppetboard/templates/node.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h1>Details</h1>
4747
</tbody>
4848
</table>
4949
</div>
50-
<div class='row'>
50+
<div class='row' style="padding-top: 2em;">
5151
<h1>Reports</h1>
5252
{% if config.DAILY_REPORTS_CHART_ENABLED %}
5353
<div id="dailyReportsChartContainer" class="one column row">

puppetboard/templates/report.html

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ <h1>Summary</h1>
88
<th>Configuration version</th>
99
<th>Start time</th>
1010
<th>End time</th>
11+
<th>Duration</th>
1112
</tr>
1213
</thead>
1314
<tbody>
@@ -22,6 +23,9 @@ <h1>Summary</h1>
2223
<td rel="utctimestamp">
2324
{{report.end}}
2425
</td>
26+
<td>
27+
{{report.end - report.start}}
28+
</td>
2529
</tr>
2630
</tbody>
2731
</table>

0 commit comments

Comments
 (0)