From e5df4fcc22e83c2521c99025dcf98efeee11081f Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 25 Oct 2014 21:12:05 +0200
Subject: [PATCH] Fix resource usage display.

see #585
---
 .../extensions/limits/general_callbacks.py    |  2 +-
 .../limits/templates/limits/poolusage.html    | 20 ++++++++++---------
 modoboa/lib/templatetags/lib_tags.py          |  2 +-
 modoboa/static/css/custom.css                 |  3 ++-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/modoboa/extensions/limits/general_callbacks.py b/modoboa/extensions/limits/general_callbacks.py
index 8831dfe87..d06fea86b 100644
--- a/modoboa/extensions/limits/general_callbacks.py
+++ b/modoboa/extensions/limits/general_callbacks.py
@@ -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 {
diff --git a/modoboa/extensions/limits/templates/limits/poolusage.html b/modoboa/extensions/limits/templates/limits/poolusage.html
index f53e46a36..1665b6d31 100644
--- a/modoboa/extensions/limits/templates/limits/poolusage.html
+++ b/modoboa/extensions/limits/templates/limits/poolusage.html
@@ -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>
diff --git a/modoboa/lib/templatetags/lib_tags.py b/modoboa/lib/templatetags/lib_tags.py
index 359d99a50..e6924afac 100644
--- a/modoboa/lib/templatetags/lib_tags.py
+++ b/modoboa/lib/templatetags/lib_tags.py
@@ -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"
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index aa6cd5f7e..9dcdd6743 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -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;
 }