Skip to content

More visual tweaks #668

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
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
5 changes: 5 additions & 0 deletions puppetboard/static/css/puppetboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ h1.ui.header.no-margin-bottom {
display: block;
}

td.reports_links {
display: flex;
justify-content: space-between;
}

.ui.table[class*="very compact"] td {
padding: 0.15em 0.1em;
max-width: 320px;
Expand Down
15 changes: 5 additions & 10 deletions puppetboard/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,9 @@ <h2>Nodes, except with status unchanged ({{nodes|length}})</h2>
<table class='ui sortable very compact very basic table'>
<thead>
<tr>
<th class="five wide">Status</th>
<th class="five wide">Certname</th>
<th class="date five wide default-sort">Report</th>
<th class="one wide"></th>
<th class="four wide">Status</th>
<th class="eight wide">Certname</th>
<th class="four wide default-sort">Report (last / all)</th>
</tr>
</thead>
<tbody>
Expand All @@ -107,18 +106,14 @@ <h2>Nodes, except with status unchanged ({{nodes|length}})</h2>
<td>
<a href="{{url_for('node', env=current_env, node_name=node.name)}}">{{ node.name }}</a>
</td>
<td>
<td class="reports_links">
{% if node.report_timestamp %}
<a href="{{url_for('report', env=current_env, node_name=node.name, report_id=node.latest_report_hash)}}" rel='utctimestamp'>{{ node.report_timestamp }}</a>
<a title='Reports' href="{{url_for('reports', env=current_env, node_name=node.name)}}"><i class='large darkblue book icon'></i></a>
{% else %}
<i class="large ban icon"></i>
{% endif %}
</td>
<td>
{% if node.report_timestamp %}
<a title='Reports' href="{{url_for('reports', env=current_env, node_name=node.name)}}"><i class='large darkblue book icon'></i></a>
{% endif %}
</td>
</tr>
{% endif %}
{% endfor %}
Expand Down
17 changes: 6 additions & 11 deletions puppetboard/templates/nodes.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<table class='ui very compact very basic sortable table'>
<thead>
<tr>
<th>Status</th>
<th class="default">Certname</th>
<th class="date default-sort">Catalog</th>
<th class="date">Report</th>
<th>&nbsp;</th>
<th class="four wide">Status</th>
<th class="eight wide">Certname</th>
<th class="two wide date default-sort">Catalog</th>
<th class="two wide date">Report (last / all)</th>
</tr>
</thead>
<tbody class="searchable">
Expand All @@ -26,18 +25,14 @@
</td>
<td><a href="{{url_for('node', env=current_env, node_name=node.name)}}">{{node.name}}</a></td>
<td><a rel="utctimestamp" href="{{url_for('catalog_node', env=current_env, node_name=node.name)}}">{{node.catalog_timestamp}}</a></td>
<td>
<td class="reports_links">
{% if node.report_timestamp %}
<a href="{{url_for('report', env=current_env, node_name=node.name, report_id=node.latest_report_hash)}}" rel='utctimestamp'>{{ node.report_timestamp }}</a>
<a title='Reports' href="{{url_for('reports', env=current_env, node_name=node.name)}}"><i class='large darkblue book icon'></i></a>
{% else %}
<i class="large darkblue ban icon"></i>
{% endif %}
</td>
<td>
{% if node.report_timestamp %}
<a title='Reports' href="{{url_for('reports', env=current_env, node_name=node.name)}}"><i class='large darkblue book icon'></i></a>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
Expand Down