From 31fa537f02e83787db29edd31329fcd53bdc2398 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 25 Nov 2016 17:48:17 +0100
Subject: [PATCH] Cleanup.

---
 modoboa/admin/signals.py                      |  1 -
 .../templates/admin/import_domains_form.html  | 16 ++++++++++
 .../admin/import_identities_form.html         | 15 ++++++++++
 modoboa/admin/templates/admin/importform.html |  2 +-
 modoboa/admin/views/import_.py                | 29 ++-----------------
 modoboa/relaydomains/handlers.py              |  8 -----
 6 files changed, 35 insertions(+), 36 deletions(-)
 create mode 100644 modoboa/admin/templates/admin/import_domains_form.html
 create mode 100644 modoboa/admin/templates/admin/import_identities_form.html

diff --git a/modoboa/admin/signals.py b/modoboa/admin/signals.py
index f145c5bd6..c915f0c18 100644
--- a/modoboa/admin/signals.py
+++ b/modoboa/admin/signals.py
@@ -16,7 +16,6 @@ extra_domain_dashboard_widgets = django.dispatch.Signal(
     providing_args=["user", "domain"])
 extra_domain_filters = django.dispatch.Signal()
 extra_domain_forms = django.dispatch.Signal(providing_args=["user", "domain"])
-extra_domain_import_help = django.dispatch.Signal()
 extra_domain_menu_entries = django.dispatch.Signal(providing_args=["user"])
 extra_domain_qset_filters = django.dispatch.Signal(
     providing_args=["domfilter", "extrafilters"])
diff --git a/modoboa/admin/templates/admin/import_domains_form.html b/modoboa/admin/templates/admin/import_domains_form.html
new file mode 100644
index 000000000..ef729b4a9
--- /dev/null
+++ b/modoboa/admin/templates/admin/import_domains_form.html
@@ -0,0 +1,16 @@
+{% extends "admin/importform.html" %}
+
+{% load i18n %}
+
+{% block helptext %}
+  {% blocktrans trimmed %}
+    Provide a CSV file where lines respect one of the following formats:
+    <ul>
+      <li><em>domain; name; quota; enabled</em></li>
+      <li><em>domainalias; name; targeted domain; enabled</em></li>
+      <li><em>relaydomain; name; target host; service; enabled; verify recipients</em></li>
+    </ul>
+    <p>The first element of each line is mandatory and must be equal to one of the previous values.</p>
+    <p>You can use a different character as separator.</p>
+  {% endblocktrans %}
+{% endblock %}
diff --git a/modoboa/admin/templates/admin/import_identities_form.html b/modoboa/admin/templates/admin/import_identities_form.html
new file mode 100644
index 000000000..71bd7a9aa
--- /dev/null
+++ b/modoboa/admin/templates/admin/import_identities_form.html
@@ -0,0 +1,15 @@
+{% extends "admin/importform.html" %}
+
+{% load i18n %}
+
+{% block helptext %}
+  {% blocktrans trimmed %}
+    Provide a CSV file where lines respect one of the following formats:
+    <ul>
+      <li><em>account; loginname; password; first name; last name; enabled; group; address; quota; [, domain, ...]</em></li>
+      <li><em>alias; address; enabled; recipient; recipient; ...</em></li>
+    </ul>
+    <p>The first element of each line is mandatory and must be equal to one of the previous values.</p>
+    <p>You can use a different character as separator.</p>
+  {% endblocktrans %}
+{% endblock %}
diff --git a/modoboa/admin/templates/admin/importform.html b/modoboa/admin/templates/admin/importform.html
index 8e15acf69..f34af0e9e 100644
--- a/modoboa/admin/templates/admin/importform.html
+++ b/modoboa/admin/templates/admin/importform.html
@@ -4,7 +4,7 @@
 {% block formbody %}
 <div class="alert alert-info">
   <h4>{% trans "Help" %}</h4>
-  {{ helptext|safe }}
+  {% block helptext %}{% endblock %}
 </div>
 {% render_form form %}
 <iframe id="import_target" name="import_target" src="#" 
diff --git a/modoboa/admin/views/import_.py b/modoboa/admin/views/import_.py
index f29b72cb9..bf749f78f 100644
--- a/modoboa/admin/views/import_.py
+++ b/modoboa/admin/views/import_.py
@@ -82,18 +82,6 @@ def import_domains(request):
     if request.method == "POST":
         return importdata(request)
 
-    results = signals.extra_domain_import_help.send(sender="import_domains")
-    extra_help = reduce(lambda a, b: a + b, [result[1] for result in results])
-    helptext = _("""Provide a CSV file where lines respect one of the following formats:
-<ul>
-  <li><em>domain; name; quota; enabled</em></li>
-  <li><em>domainalias; name; targeted domain; enabled</em></li>
-  %s
-</ul>
-<p>The first element of each line is mandatory and must be equal to one of the previous values.</p>
-<p>You can use a different character as separator.</p>
-""") % "".join(extra_help)
-
     ctx = dict(
         title=_("Import domains"),
         action_label=_("Import"),
@@ -102,10 +90,9 @@ def import_domains(request):
         formid="importform",
         enctype="multipart/form-data",
         target="import_target",
-        helptext=helptext,
         form=ImportDataForm()
     )
-    return render(request, "admin/importform.html", ctx)
+    return render(request, "admin/import_domains_form.html", ctx)
 
 
 @login_required
@@ -117,15 +104,6 @@ def import_identities(request):
     if request.method == "POST":
         return importdata(request, ImportIdentitiesForm)
 
-    helptext = _("""Provide a CSV file where lines respect one of the following formats:
-<ul>
-<li><em>account; loginname; password; first name; last name; enabled; group; address; quota; [, domain, ...]</em></li>
-<li><em>alias; address; enabled; recipient; recipient; ...</em></li>
-</ul>
-<p>The first element of each line is mandatory and must be equal to one of the previous values.</p>
-
-<p>You can use a different character as separator.</p>
-""")
     ctx = dict(
         title=_("Import identities"),
         action_label=_("Import"),
@@ -134,7 +112,6 @@ def import_identities(request):
         formid="importform",
         enctype="multipart/form-data",
         target="import_target",
-        form=ImportIdentitiesForm(),
-        helptext=helptext
+        form=ImportIdentitiesForm()
     )
-    return render(request, "admin/importform.html", ctx)
+    return render(request, "admin/import_identities_form.html", ctx)
diff --git a/modoboa/relaydomains/handlers.py b/modoboa/relaydomains/handlers.py
index badc45634..54894ffcb 100644
--- a/modoboa/relaydomains/handlers.py
+++ b/modoboa/relaydomains/handlers.py
@@ -116,14 +116,6 @@ def fill_domain_instances(sender, user, domain, **kwargs):
     return {"relaydomain": domain.relaydomain}
 
 
-@receiver(admin_signals.extra_domain_import_help)
-def extra_domain_import_help(sender, **kwargs):
-    """Add extra help lines."""
-    return [_("""
-<li><em>relaydomain; name; target host; service; enabled; verify recipients</em></li>
-""")]
-
-
 @receiver(admin_signals.extra_domain_qset_filters)
 def extra_domain_entries(sender, domfilter, extrafilters, **kwargs):
     """Return extra queryset filters."""