Commit 7ed87388 by Oláh István Gergely

Merge branch 'issue-110' into issue-110-merged

parents f068fe84 e76e772d
......@@ -77,12 +77,12 @@ class NodeListTable(Table):
number_of_VMs = TemplateColumn(
template_name='dashboard/node-list/column-vm.html',
attrs={'th': {'class': 'node-list-table-admin'}},
attrs={'th': {'class': 'node-list-table-thin'}},
)
admin = TemplateColumn(
template_name='dashboard/node-list/column-admin.html',
attrs={'th': {'class': 'node-list-table-admin'}},
monitor = TemplateColumn(
template_name='dashboard/node-list/column-monitor.html',
attrs={'th': {'class': 'node-list-table-monitor'}},
)
details = TemplateColumn(
......
......@@ -19,6 +19,11 @@
</div>
</div>
<style>
.node-list-table tbody>tr>td {
vertical-align: middle;
}
.popover {
max-width: 600px;
}
......@@ -39,8 +44,8 @@
width: 10px;
}
.node-list-table-admin {
width: 130px;
.node-list-table-monitor {
width: 200px;
}
</style>
{% endblock %}
......
{%load sizefieldtags %}
{% load i18n %}
<i class="icon-gears"></i> {% trans "CPU" %}
<div class="progress pull-right">
<div class="progress-bar progress-bar-success" role="progressbar"
aria-valuenow="{{ record.cpu_usage }}" aria-valuemin="0" aria-valuemax="1" style="width: 80%">
<span class="progress-bar-text">
{% if record.cpu_usage != None %}
{{ record.cpu_usage|floatformat:1 }} %
{% else %} - {% endif %}
</span>
</div>
</div>
<br>
<i class="icon-ticket"></i> {% trans "Memory" %}
<div class="progress pull-right">
<div class="progress-bar progress-bar-info" role="progressbar"
aria-valuenow="{{ record.ram_usage}}" aria-valuemin="0" aria-valuemax="1" >
<span class="progress-bar-text">
{% if record.byte_ram_usage != None %}
{% widthratio record.byte_ram_usage 1048576 1 %} MB
{% else %} - {% endif %}
</span>
</div>
</div>
{% block "extra-js" %}
<script>
$('.progress-bar').each(function() {
var min = $(this).attr('aria-valuemin');
var max = $(this).attr('aria-valuemax');
var now = $(this).attr('aria-valuenow');
var siz = (now-min)*100/(max-min);
$(this).css('width', siz+'%');
});
</script>
{% endblock %}
<style>
.progress {
position: relative;
width: 100px;
height: 12px;
margin-bottom: 0px;
margin-top: 5px;
background-image: linear-gradient(to bottom, #BBEBEB 0px, #F5F5F5 100%);
}
.progress-bar-text {
position: absolute;
display: block;
width: 100%;
color: white;
/* outline */
text-shadow:
-1px -1px 0 #000,
1px -1px 0 #000,
-1px 1px 0 #000,
1px 1px 0 #000;
font-size: 10px;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment