Fix resource usage display.

see #585
This commit is contained in:
Antoine Nguyen
2014-10-25 21:12:05 +02:00
parent 88d42fa18d
commit e5df4fcc22
4 changed files with 15 additions and 12 deletions
@@ -79,7 +79,7 @@ def get_static_content(caller, st_type, user):
if st_type == "css":
return ["""<style>
.resource {
margin: 5px 0;
padding: 10px 15px;
}
.resource .progress {
@@ -1,10 +1,12 @@
{% load i18n lib_tags %}
<div class="well">
<ul class="nav nav-pills nav-stacked">
<li class="nav-header">{% trans "Resources usage" %}</li>{% for l in limits %}
<li class="resource">
{{ l.label }} ({{ l }})
<div rel="tooltip" title="{{ l.curvalue }}/{{ l.maxvalue }}" class="progress"><div class="{% progress_color l.usage %}" style="width: {{ l }}"></div></div>
</li>{% endfor %}
</ul>
</div>
<ul class="nav nav-sidebar">
<li class="nav-header">{% trans "Resources usage" %}</li>
{% for l in limits %}
<li class="resource">
{{ l.label }} ({{ l }})
<div rel="tooltip" title="{{ l.curvalue }}/{{ l.maxvalue }}" class="progress">
<div class="{% progress_color l.usage %}" style="width: {{ l }}" aria-valuemin="0" aria-valuemax="100"></div>
</div>
</li>
{% endfor %}
</ul>
+1 -1
View File
@@ -50,7 +50,7 @@ class="{{ mdclass }}{% if link.class %} {{ link.class }}{% endif %}"
def progress_color(value):
value = int(value)
if value < 50:
return "progress-bar progress-bar-primary"
return "progress-bar progress-bar-info"
if value < 80:
return "progress-bar progress-bar-warning"
return "progress-bar-danger"
+2 -1
View File
@@ -220,7 +220,8 @@ html body div.navbar div.container-fluid div#navigate-navbar-collapse.collapse u
font-weight: 700;
letter-spacing: 1px;
text-transform: uppercase;
padding-left: 20px;
padding-left: 10px;
margin-top: 10px;
margin-bottom: 5px;
}