Put graph on same line

This commit is contained in:
David Buxton 2014-01-10 22:54:28 +00:00
parent 94dcdf9942
commit bea45d1238

View File

@ -14,44 +14,41 @@
</div> </div>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-md-6 col-xs-12">
<div class="col-xs-1"><h5><i class="glyphicon glyphicon-link"></i></h5></div> <div class="col-xs-1"><h3><i class="fa fa-cog"></i></h3></div>
<div class="col-xs-3"><h5><span class="break"></span>Service URL</h5></div> <div class="col-xs-11"><h3>Configuration</h3></div>
<div class="col-xs-8"><h5>{{ service.url|urlize|default:"None configured" }}</h5></div> <div class="col-xs-12">
</div> <div class="col-xs-1"><h5><i class="glyphicon glyphicon-link"></i></h5></div>
</div> <div class="col-xs-3"><h5><span class="break"></span>Service URL</h5></div>
<div class="row"> <div class="col-xs-8"><h5>{{ service.url|urlize|default:"None configured" }}</h5></div>
<div class="col-xs-12"> </div>
<div class="col-xs-1"><h5><i class="glyphicon glyphicon-user"></i></h5></div> <div class="col-xs-12">
<div class="col-xs-3"><h5><span class="break"></span>Users watching</h5></div> <div class="col-xs-1"><h5><i class="glyphicon glyphicon-user"></i></h5></div>
<div class="col-xs-8"><h5> <div class="col-xs-3"><h5><span class="break"></span>Users watching</h5></div>
{% if not service.users_to_notify.all %} <div class="col-xs-8"><h5>
No users subscribed {% if not service.users_to_notify.all %}
{% else %} No users subscribed
{{ service.users_to_notify.all|join:", " }} {% else %}
{% endif %} {{ service.users_to_notify.all|join:", " }}
</h5></div> {% endif %}
</div> </h5></div>
</div> </div>
<div class="row"> <div class="col-xs-12">
<div class="col-xs-12"> <div class="col-xs-1"><h5><i class="fa fa-exclamation-triangle"></i></h5></div>
<div class="col-xs-1"><h5><i class="fa fa-exclamation-triangle"></i></h5></div> <div class="col-xs-3"><h5><span class="break"></span>Alert types</h5></div>
<div class="col-xs-3"><h5><span class="break"></span>Alert types</h5></div> <div class="col-xs-8">
<div class="col-xs-8"> <h5>
<h5> {% if service.email_alert %}<i class="fa fa-envelope"></i> Email{% endif %}
{% if service.email_alert %}<i class="fa fa-envelope"></i> Email{% endif %} {% if service.hipchat_alert %}<i class="fa fa-comment"></i> Hipchat{% endif %}
{% if service.hipchat_alert %}<i class="fa fa-comment"></i> Hipchat{% endif %} {% if service.sms_alert %}<i class="fa fa-mobile"></i> SMS{% endif %}
{% if service.sms_alert %}<i class="fa fa-mobile"></i> SMS{% endif %} {% if service.telephone_alert %}<i class="fa fa-phone"></i> Telephone{% endif %}
{% if service.telephone_alert %}<i class="fa fa-phone"></i> Telephone{% endif %} </h5>
</h5> </div>
</div> </div>
</div> </div>
</div> <div class="col-xs-12 col-md-6">
<hr>
<div class="row">
<div class="col-xs-12">
<div class="col-xs-1"><h3><i class="fa fa-bar-chart-o"></i></h3></div> <div class="col-xs-1"><h3><i class="fa fa-bar-chart-o"></i></h3></div>
<div class="col-xs-11"><h3>Service status (last 4 hours)</h3></div> <div class="col-xs-11"><h3>Status (4 hours)</h3></div>
<div class="col-xs-12" id="graph" style="height:150px;"></div> <div class="col-xs-12" id="graph" style="height:150px;"></div>
</div> </div>
</div> </div>