Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Visual tweaks #667

Merged
merged 5 commits into from
Mar 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions puppetboard/static/css/puppetboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ h1.ui.header.no-margin-bottom {
background-color: #989898;
}

.ui.header.unchanged {
color: #89A54E;
}

.ui.label.unchanged {
background-color: #89A54E;
}
Expand Down
19 changes: 13 additions & 6 deletions puppetboard/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ <h1 class="ui header changed no-margin-bottom">
</a>
<span>with status changed</span>
</div>
<div class="column">
<a href="{{url_for('nodes', env=current_env, status='unchanged')}}">
<h1 class="ui header unchanged no-margin-bottom">
{{stats['unchanged']}}
<small>{% if stats['unchanged'] == 1 %} node {% else %} nodes {% endif %}</small>
</h1>
</a>
<span>with status unchanged</span>
</div>
</div>
<div class="four column row">
<div class="column">
<a href="{{url_for('nodes', env=current_env, status='unreported')}}">
<h1 class="ui header unreported no-margin-bottom">
Expand All @@ -50,10 +61,6 @@ <h1 class="ui header unreported no-margin-bottom">
</a>
<span>unreported in the last {{ config.UNRESPONSIVE_HOURS }} hours</span>
</div>
</div>
<div class="four column row">
<div class="column">
</div>
<div class="column">
<h1 class="ui header darkblue no-margin-bottom">{{metrics['num_nodes']}}</h1>
<span>Population</span>
Expand All @@ -76,7 +83,7 @@ <h1 class="ui header darkblue no-margin-bottom">{{metrics['avg_resources_node']}
<div class="one column row">
<div class="column">
{% if nodes %}
<h2>Nodes status detail ({{nodes|length}})</h2>
<h2>Nodes, except with status unchanged ({{nodes|length}})</h2>
<table class='ui sortable very compact very basic table'>
<thead>
<tr>
Expand Down Expand Up @@ -118,7 +125,7 @@ <h2>Nodes status detail ({{nodes|length}})</h2>
</tbody>
</table>
{% else %}
<h2>Nodes status detail</h2>
<h2>Nodes, except with status unchanged</h2>
<div class="ui info message">
Nothing seems to be changing.
</div>
Expand Down
5 changes: 0 additions & 5 deletions puppetboard/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,5 @@
<i class="large arrow up icon"></i>
</div>

<footer class="ui absolute fixed bottom">
<div>
Copyright &copy; 2013-{{ now('%Y') }} <a href="https://github.com/voxpupuli" target="_blank">Puppet Community</a>. <span style="float:right">Live from PuppetDB.</span>
</div>
</footer>
</body>
</html>
2 changes: 1 addition & 1 deletion puppetboard/templates/node.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h1>Details</h1>
</tbody>
</table>
</div>
<div class='row'>
<div class='row' style="padding-top: 2em;">
<h1>Reports</h1>
{% if config.DAILY_REPORTS_CHART_ENABLED %}
<div id="dailyReportsChartContainer" class="one column row">
Expand Down
4 changes: 4 additions & 0 deletions puppetboard/templates/report.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ <h1>Summary</h1>
<th>Configuration version</th>
<th>Start time</th>
<th>End time</th>
<th>Duration</th>
</tr>
</thead>
<tbody>
Expand All @@ -22,6 +23,9 @@ <h1>Summary</h1>
<td rel="utctimestamp">
{{report.end}}
</td>
<td>
{{report.end - report.start}}
</td>
</tr>
</tbody>
</table>
Expand Down