Skip to content

Commit

Permalink
Merge pull request arachnys#293 from iliyanotlioneberia/ccsfix1
Browse files Browse the repository at this point in the history
alerts plugin css fix
  • Loading branch information
dbuxton committed Dec 9, 2015
2 parents 525dffc + de0b437 commit fb48dad
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions cabot/templates/cabotapp/_service_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@
<span class="label label-{% if service.inactive_status_checks.all.count > 0 %}warning{% else %}default{% endif %}">{{ service.inactive_status_checks.all.count }}</span>
</td>
<td>
{% if service.overall_status != service.PASSING_STATUS %}
<div class="col-xs-12 alert alert-warning">
{% if service.overall_status != service.PASSING_STATUS %}
{# <div class="col-xs-12 alert alert-warning">#}
<div>
<div class="row">
{% if service.unexpired_acknowledgement %}
<div class="col-xs-4">
<div class="col-xs-10">
<a href="{% url 'remove-acknowledgement' pk=service.id %}" class="btn btn-xs btn-warning btn-block"><i class="glyphicon glyphicon-play"></i> Re-enable alerts</a>
</div>
{% else %}
<div class="col-xs-4">
<div class="col-xs-10">
<a class="btn btn-success btn-block btn-xs" href="{% url 'acknowledge-alert' pk=service.id %}"><i class="glyphicon glyphicon-pause"></i> Acknowledge alert</a>
</div>
{% endif %}
Expand Down

0 comments on commit fb48dad

Please sign in to comment.