From ec9aadea5abcb78261a49a0e5c5728447bc389f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Solard?= <mael.solard@laposte.net>
Date: Tue, 12 Aug 2014 16:08:15 +0200
Subject: [PATCH] Change the way to create labels as label-info

---
 modoboa/core/models.py                    | 4 ++--
 modoboa/extensions/admin/models/alias.py  | 2 +-
 modoboa/extensions/admin/models/domain.py | 2 +-
 modoboa/lib/templatetags/lib_tags.py      | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modoboa/core/models.py b/modoboa/core/models.py
index 56bdcbe35..250edb5a8 100644
--- a/modoboa/core/models.py
+++ b/modoboa/core/models.py
@@ -167,9 +167,9 @@ class User(PermissionsMixin):
 
     @property
     def tags(self):
-        return [{"name": "account", "label": _("account"), "type": "idt"},
+        return [{"name": "account", "label": _("account"), "type": "label label-default idt"},
                 {"name": self.group, "label": self.group,
-                 "type": "grp", "color": "info"}]
+                 "type": "grp label label-info"}]
 
     @property
     def fullname(self):
diff --git a/modoboa/extensions/admin/models/alias.py b/modoboa/extensions/admin/models/alias.py
index 64d587b9f..7eef37b0e 100644
--- a/modoboa/extensions/admin/models/alias.py
+++ b/modoboa/extensions/admin/models/alias.py
@@ -83,7 +83,7 @@ class Alias(AdminObject):
             "alias": _("alias")
         }
         altype = self.type
-        return [{"name": altype, "label": labels[altype], "type": "idt"}]
+        return [{"name": altype, "label": labels[altype], "type": "idt label label-default"}]
 
     def post_create(self, creator):
         from modoboa.lib.permissions import grant_access_to_object
diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py
index c0a13d459..63c55a98c 100644
--- a/modoboa/extensions/admin/models/domain.py
+++ b/modoboa/extensions/admin/models/domain.py
@@ -58,7 +58,7 @@ class Domain(AdminObject):
 
     @property
     def tags(self):
-        return [{"name": "domain", "label": _("Domain"), "type": "dom"}]
+        return [{"name": "domain", "label": _("Domain"), "type": "label label-default dom"}]
 
     @property
     def admins(self):
diff --git a/modoboa/lib/templatetags/lib_tags.py b/modoboa/lib/templatetags/lib_tags.py
index 69eb77ef0..572b5a276 100644
--- a/modoboa/lib/templatetags/lib_tags.py
+++ b/modoboa/lib/templatetags/lib_tags.py
@@ -151,9 +151,7 @@ def fromunix(value):
 @register.simple_tag
 def render_tags(tags):
     t = Template("""{% for tag in tags %}
-<span class="label{% if tag.color %} label-{{ tag.color }}{% endif %}">
   <a href="#" class="filter {{ tag.type }}" name="{{ tag.name }}">{{ tag.label }}</a>
-</span>
 {% endfor %}
 """)
     return t.render(Context({"tags": tags}))