From aed69d43629d416267842b445c1078d7f0e97640 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 10 Nov 2014 14:49:58 +0100
Subject: [PATCH] Amavis fixes.

---
 modoboa/extensions/amavis/sql_connector.py                    | 1 -
 modoboa/extensions/amavis/static/amavis/js/quarantine.js      | 2 +-
 modoboa/extensions/amavis/templates/amavis/emails_page.html   | 4 ++--
 .../extensions/amavis/templates/amavis/main_action_bar.html   | 4 ++--
 modoboa/extensions/amavis/templatetags/amavis_tags.py         | 2 +-
 modoboa/extensions/amavis/views.py                            | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modoboa/extensions/amavis/sql_connector.py b/modoboa/extensions/amavis/sql_connector.py
index 700ae1f52..46f0075ae 100644
--- a/modoboa/extensions/amavis/sql_connector.py
+++ b/modoboa/extensions/amavis/sql_connector.py
@@ -7,7 +7,6 @@ from django.db.models import Q
 
 from modoboa.extensions.admin.models import Domain
 from modoboa.lib.dbutils import db_type
-from modoboa.lib.webutils import static_url
 
 from .models import Quarantine, Msgrcpt, Maddr
 
diff --git a/modoboa/extensions/amavis/static/amavis/js/quarantine.js b/modoboa/extensions/amavis/static/amavis/js/quarantine.js
index b44445486..2885c28cb 100644
--- a/modoboa/extensions/amavis/static/amavis/js/quarantine.js
+++ b/modoboa/extensions/amavis/static/amavis/js/quarantine.js
@@ -294,7 +294,7 @@ Quarantine.prototype = {
                 simple_ajax_form_post(evt, {
                     formid: "learning_recipient_form",
                     reload_on_success: false,
-                    success_cb: $this.action_cb
+                    success_cb: $.proxy($this.action_cb, $this)
                 });
             });
         });
diff --git a/modoboa/extensions/amavis/templates/amavis/emails_page.html b/modoboa/extensions/amavis/templates/amavis/emails_page.html
index 0f7c3268e..4cf4c70fd 100644
--- a/modoboa/extensions/amavis/templates/amavis/emails_page.html
+++ b/modoboa/extensions/amavis/templates/amavis/emails_page.html
@@ -12,9 +12,9 @@
   <td width="25px" name="rstatus">
     {% if email.status == 'R' %}
     <img src="{% static 'pics/release.png' %}" />
-    {% else if email.status == 'S' %}
+    {% elif email.status == 'S' %}
     <span class="fa fa-thumbs-ip"></span>
-    {% else if email.status == 'H' %}
+    {% elif email.status == 'H' %}
     <span class="fa fa-thumbs-down"></span>
     {% endif %}
   </td>
diff --git a/modoboa/extensions/amavis/templates/amavis/main_action_bar.html b/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
index 11313e87e..4c44c54c5 100644
--- a/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
+++ b/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
@@ -1,7 +1,7 @@
 {% load lib_tags i18n %}
 <div class="row">
 
-  <div class="col-xs-3">
+  <div class="col-xs-4">
     <div class="btn-group" title="{% trans 'Select' %}">
       <a class="btn btn-default"><input type="checkbox" id="selectall" /></a>
       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -45,7 +45,7 @@
     {% include "common/email_searchbar.html" with extraopts=extraopts %}
   </div>
 
-  <div class="col-sm-5">
+  <div class="col-sm-4">
     <div class="btn-group">
       <div id="filters_bar" class="navbar-nav navbar-right">
         <span class="label label-default">{% trans "Display" %}</span>
diff --git a/modoboa/extensions/amavis/templatetags/amavis_tags.py b/modoboa/extensions/amavis/templatetags/amavis_tags.py
index c6e6c81f9..53fb087ac 100644
--- a/modoboa/extensions/amavis/templatetags/amavis_tags.py
+++ b/modoboa/extensions/amavis/templatetags/amavis_tags.py
@@ -43,7 +43,7 @@ def viewm_menu(user, mail_id, rcpt):
     if manual_learning_enabled(user):
         entries.insert(2, {
             "name": "process",
-            "img": "icon-cog",
+            "img": "fa fa-cog",
             "menu": [
                 {"name": "mark-as-spam",
                  "label": _("Mark as spam"),
diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index e6cc1c29f..d220fec6a 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -393,7 +393,7 @@ def learning_recipient(request):
     return render(request, "common/generic_modal_form.html", {
         "title": _("Select a database"),
         "formid": "learning_recipient_form",
-        "action": reverse("modoboa.extensions.amavis.views.learning_recipient"),
+        "action": reverse("amavis:learning_recipient_set"),
         "action_classes": "submit",
         "action_label": _("Validate"),
         "form": form