From bf82c73355261c7d3eded1e93fd3abdefba410a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Solard?= <mael.solard@laposte.net>
Date: Mon, 28 Jul 2014 18:30:00 +0200
Subject: [PATCH] Substitute icon with glyphicon

---
 .../general_callbacks.py                      |  4 ++--
 .../templatetags/sfilters_tags.py             | 20 +++++++++----------
 modoboa/extensions/webmail/lib/imaputils.py   | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/modoboa/extensions/postfix_relay_domains/general_callbacks.py b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
index 34e0b7630..2dc4daebd 100644
--- a/modoboa/extensions/postfix_relay_domains/general_callbacks.py
+++ b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
@@ -33,7 +33,7 @@ def extra_domain_menu_entries(user):
     return [
         {"name": "newrelaydomain",
          "label": ugettext_lazy("Add relay domain"),
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "modal": True,
          "modalcb": "rdomain.domainform_cb",
          "url": reverse(
@@ -82,7 +82,7 @@ def rdomain_actions(user, domain):
         "url": reverse("modoboa.extensions.postfix_relay_domains.views.delete",
                        args=[domain.id]),
         "title": ugettext_lazy("Delete %s?" % domain.name),
-        "img": "icon-trash"
+        "img": "glyphicon glyphicon-trash"
     }]
 
 
diff --git a/modoboa/extensions/sievefilters/templatetags/sfilters_tags.py b/modoboa/extensions/sievefilters/templatetags/sfilters_tags.py
index fe996658c..b7993c0a8 100644
--- a/modoboa/extensions/sievefilters/templatetags/sfilters_tags.py
+++ b/modoboa/extensions/sievefilters/templatetags/sfilters_tags.py
@@ -11,7 +11,7 @@ register = template.Library()
 def sfilters_menu(user):
     entries = [
         {"name": "newfilterset",
-         "img": "icon-plus",
+         "img": "glyphicon glyphicon-plus",
          "label": _("New filters set"),
          "url": reverse("modoboa.extensions.sievefilters.views.new_filters_set"),
          "modal": True,
@@ -29,7 +29,7 @@ def fset_menu(mode, setname):
     if mode == "gui":
         entries += [
             {"name": "newfilter",
-             "img": "icon-plus",
+             "img": "glyphicon glyphicon-plus",
              "label": _("New filter"),
              "url": reverse("modoboa.extensions.sievefilters.views.newfilter",
                              args=[setname]),
@@ -40,7 +40,7 @@ def fset_menu(mode, setname):
     if mode == "raw":
         entries += [
             {"name": "savefs",
-             "img": "icon-download-alt",
+             "img": "glyphicon glyphicon-download-alt",
              "label": _("Save filters set"),
              "url": reverse("modoboa.extensions.sievefilters.views.savefs",
                              args=[setname])},
@@ -48,17 +48,17 @@ def fset_menu(mode, setname):
 
     entries += [
         {"name": "activatefs",
-         "img": "icon-ok",
+         "img": "glyphicon glyphicon-ok",
          "label": _("Activate filters set"),
          "url": reverse("modoboa.extensions.sievefilters.views.activate_filters_set",
                          args=[setname])},
         {"name": "removefs",
-         "img": "icon-trash",
+         "img": "glyphicon glyphicon-trash",
          "label": _("Remove filters set"),
          "url": reverse("modoboa.extensions.sievefilters.views.remove_filters_set",
                          args=[setname])},
         {"name": "downloadfs",
-         "img": "icon-download",
+         "img": "glyphicon glyphicon-download",
          "label": _("Download"),
          "url": reverse("modoboa.extensions.sievefilters.views.download_filters_set",
                          args=[setname])}
@@ -74,7 +74,7 @@ def filter_actions(setname, f, position, islast):
         {"name": "editfilter",
          "url": reverse("modoboa.extensions.sievefilters.views.editfilter",
                          args=[setname, f["name"]]),
-         "img": "icon-edit",
+         "img": "glyphicon glyphicon-edit",
          "title": _("Edit filter"),
          "modal": True,
          "autowidth": True,
@@ -82,7 +82,7 @@ def filter_actions(setname, f, position, islast):
         {"name": "removefilter",
          "url": reverse("modoboa.extensions.sievefilters.views.removefilter",
                          args=[setname, f["name"]]),
-         "img": "icon-trash",
+         "img": "glyphicon glyphicon-trash",
          "title": _("Remove this filter")}
     ]
     if position != 1:
@@ -90,7 +90,7 @@ def filter_actions(setname, f, position, islast):
             {"name": "movefilter_up",
              "url": reverse("modoboa.extensions.sievefilters.views.move_filter_up",
                              args=[setname, f["name"]]),
-             "img": "icon-arrow-up",
+             "img": "glyphicon glyphicon-arrow-up",
              "title": _("Move this filter up")}
         ]
     if not islast:
@@ -98,7 +98,7 @@ def filter_actions(setname, f, position, islast):
             {"name": "movefilter_down",
              "url": reverse("modoboa.extensions.sievefilters.views.move_filter_down",
                              args=[setname, f["name"]]),
-             "img": "icon-arrow-down",
+             "img": "glyphicon glyphicon-arrow-down",
              "title": _("Move this filter down")},
         ]
     return render_actions(actions)
diff --git a/modoboa/extensions/webmail/lib/imaputils.py b/modoboa/extensions/webmail/lib/imaputils.py
index c32584b13..86b1d4904 100644
--- a/modoboa/extensions/webmail/lib/imaputils.py
+++ b/modoboa/extensions/webmail/lib/imaputils.py
@@ -473,14 +473,14 @@ class IMAPconnector(object):
             md_mailboxes = []
         else:
             md_mailboxes = [
-                {"name": "INBOX", "class": "icon-inbox"},
+                {"name": "INBOX", "class": "glyphicon glyphicon-inbox"},
                 {"name": parameters.get_user(user, "DRAFTS_FOLDER"),
-                 "class": "icon-file"},
-                {"name": 'Junk', "class": "icon-fire"},
+                 "class": "glyphicon glyphicon-file"},
+                {"name": 'Junk', "class": "glyphicon glyphicon-fire"},
                 {"name": parameters.get_user(user, "SENT_FOLDER"),
-                 "class": "icon-envelope"},
+                 "class": "glyphicon glyphicon-envelope"},
                 {"name": parameters.get_user(user, "TRASH_FOLDER"),
-                 "class": "icon-trash"}
+                 "class": "glyphicon glyphicon-trash"}
             ]
         if until_mailbox:
             name, parent = separate_mailbox(until_mailbox, self.hdelimiter)