puppet/puppetboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #137 from fgimian/further-details-for-nodes

Browse Source 
Further details for nodes added (skip count and reported date on overview page)
This commit is contained in:
Daniele Sluijters
2015-05-10 11:39:43 +02:00
parent 1a323a7700 62d1f26f7a
commit df3a797f0f
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
puppetboard/static/coffeescript/tables.coffee
View File

@@ -13,7 +13,7 @@ $('.facts').tablesorter(
$('.dashboard').tablesorter( $('.dashboard').tablesorter(
headers: headers:
2: 3:
sorter: false sorter: false
sortList: [[0, 1]] sortList: [[0, 1]]
) )

5
puppetboard/static/css/puppetboard.css
View File

@@ -31,12 +31,13 @@ th.tablesorter-headerDesc::after {
} }
.status { .status {
width: 47%; width: 47.5%;
text-align: center; text-align: center;
display: block; display: block;
} }
.count { .count {
width: 21%; width: 14%;
text-align: center; text-align: center;
display: block; display: block;
} }

4
puppetboard/static/js/tables.js
View File

@@ -21,7 +21,9 @@
$('.dashboard').tablesorter({ $('.dashboard').tablesorter({
headers: { headers: {
2: { sorter: false } 3: {
sorter: false
}
}, },
sortList: [[0, 1]] sortList: [[0, 1]]
}); });

19
puppetboard/templates/index.html
View File

@@ -65,7 +65,8 @@
<thead> <thead>
<tr> <tr>
<th class="five wide">Status</th> <th class="five wide">Status</th>
<th class="ten wide">Hostname</th> <th class="five wide">Hostname</th>
<th class="five wide">Report</th>
<th class="one wide"></th> <th class="one wide"></th>
</tr> </tr>
</thead> </thead>
@@ -88,19 +89,27 @@
{{node.status}} {{node.status}}
</a> </a>
{% if node.status=='unreported'%} {% if node.status=='unreported'%}
<span class="ui small label status"> {{ node.unreported_time }} </label> <span class="ui small label status"> {{ node.unreported_time }} </span>
{% else %} {% else %}
{% if node.events['failures'] %}<span class="ui small count label red">{{node.events['failures']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%} {% if node.events['failures'] %}<span class="ui small count label red">{{node.events['failures']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
{% if node.events['successes'] %}<span class="ui small count label green">{{node.events['successes']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%} {% if node.events['successes'] %}<span class="ui small count label green">{{node.events['successes']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
{% if node.events['skips'] %}<span class="ui small count label orange">{{node.events['skips']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
{% endif %} {% endif %}
</td> </td>
<td> <td>
<a href="{{url_for('node', node_name=node.name)}}">{{ node.name }}</a> <a href="{{url_for('node', node_name=node.name)}}">{{ node.name }}</a>
</td> </td>
<td> <td>
<a title="Latest Report" href="{{url_for('report_latest', node_name=node.name)}}"> {% if node.report_timestamp %}
<i class="large tasks darkblue icon"></i> <a href="{{url_for('report_latest', node_name=node.name)}}" rel='utctimestamp'>{{ node.report_timestamp }}</a>
</a> {% else %}
<i class="large ban circle icon"></i>
{% endif %}
</td>
<td>
{% if node.report_timestamp %}
<a title='Reports' href="{{url_for('reports_node', node=node.name)}}"><i class='large darkblue book icon'></i></a>
{% endif %}
</td> </td>
</tr> </tr>
{% endif %} {% endif %}

1
puppetboard/templates/nodes.html
View File

@@ -35,6 +35,7 @@
{% else %} {% else %}
<span>{% if node.events['failures'] %}<span class="ui small count label red">{{node.events['failures']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%} <span>{% if node.events['failures'] %}<span class="ui small count label red">{{node.events['failures']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
{% if node.events['successes'] %}<span class="ui small count label green">{{node.events['successes']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}</span> {% if node.events['successes'] %}<span class="ui small count label green">{{node.events['successes']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}</span>
{% if node.events['skips'] %}<span class="ui small count label yellow">{{node.events['skips']}}</span>{% else %}<span class="ui small count label">0</span>{% endif%}
{% endif %} {% endif %}
</td> </td>
<td><a href="{{url_for('node', node_name=node.name)}}">{{node.name}}</a></td> <td><a href="{{url_for('node', node_name=node.name)}}">{{node.name}}</a></td>