From 98b91e7b60630e59e31b5bd5c805beab9ca7b3c4 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 9 Mar 2013 10:21:58 +0100
Subject: [PATCH] Preserve django 1.4 compatibility.

see #384
---
 modoboa/admin/templates/admin/extensions.html             | 2 +-
 modoboa/admin/templates/admin/identities.html             | 2 +-
 modoboa/admin/views.py                                    | 8 ++++----
 .../templates/amavis/notifications/pending_requests.html  | 2 +-
 .../amavis/templates/amavis/viewmail_selfservice.html     | 2 +-
 modoboa/extensions/amavis/views.py                        | 2 +-
 .../templates/postfix_autoreply/autoreply.html            | 2 +-
 .../sievefilters/templates/sievefilters/guieditor.html    | 2 +-
 .../sievefilters/templates/sievefilters/index.html        | 2 +-
 .../sievefilters/templates/sievefilters/rawfilter.html    | 1 +
 modoboa/extensions/stats/templates/stats/index.html       | 2 +-
 .../extensions/webmail/templates/webmail/attachments.html | 2 +-
 modoboa/extensions/webmail/templates/webmail/compose.html | 2 +-
 modoboa/extensions/webmail/templates/webmail/headers.html | 2 +-
 modoboa/extensions/webmail/templates/webmail/index.html   | 2 +-
 modoboa/templates/layout_simple.html                      | 2 +-
 modoboa/templates/nlayout.html                            | 2 +-
 modoboa/templates/registration/login.html                 | 4 ++--
 modoboa/userprefs/templates/userprefs/forward.html        | 2 +-
 modoboa/userprefs/templates/userprefs/preferences.html    | 2 +-
 modoboa/userprefs/templates/userprefs/profile.html        | 2 +-
 21 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/modoboa/admin/templates/admin/extensions.html b/modoboa/admin/templates/admin/extensions.html
index 2eb7f6fad..141ec8108 100644
--- a/modoboa/admin/templates/admin/extensions.html
+++ b/modoboa/admin/templates/admin/extensions.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n %}{% load url from future %}
 <h2>{% trans "Extensions" %} <small>{% trans "Choose the extension(s) to use" %}</small></h2><hr />
 <form id="settings_form" method="POST" action="{% url 'modoboa.admin.views.saveextensions' %}">
   {{ extensions|safe }}
diff --git a/modoboa/admin/templates/admin/identities.html b/modoboa/admin/templates/admin/identities.html
index be0da8c6b..f12e54b28 100644
--- a/modoboa/admin/templates/admin/identities.html
+++ b/modoboa/admin/templates/admin/identities.html
@@ -1,4 +1,4 @@
-{% extends "admin/listing.html" %}{% load admin_extras libextras i18n %}
+{% extends "admin/listing.html" %}{% load admin_extras libextras i18n %}{% load url from future %}
 {% block pagetitle %}{% trans "Identities" %}{% endblock %}
 {% block html_head %}
 {{ block.super }}
diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py
index 60f705eb9..193a151f0 100644
--- a/modoboa/admin/views.py
+++ b/modoboa/admin/views.py
@@ -479,10 +479,10 @@ def viewsettings(request, tplname='admin/settings_header.html'):
 @user_passes_test(lambda u: u.is_superuser)
 def viewparameters(request, tplname='admin/parameters.html'):
     return ajax_simple_response({
-            "status" : "ok",
-            "left_selection" : "parameters",
-            "content" : render_to_string(tplname, {"gparams" : parameters.get_all_admin_parameters()})
-            })
+        "status" : "ok",
+        "left_selection" : "parameters",
+        "content" : render_to_string(tplname, {"gparams" : parameters.get_all_admin_parameters()})
+    })
 
 @login_required
 @user_passes_test(lambda u: u.is_superuser)
diff --git a/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html b/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html
index 91f0fed20..e8ac3536b 100644
--- a/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html
+++ b/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html
@@ -1,4 +1,4 @@
-{% load i18n libextras %}{% blocktrans count counter=total %}
+{% load i18n libextras %}{% load url from future %}{% blocktrans count counter=total %}
 {{ counter }} release request is pending for action.
 {% plural %}
 {{ counter }} release requests are pending for action.
diff --git a/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html b/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
index 3216566a9..f55cc202a 100644
--- a/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
+++ b/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>{% load i18n libextras amextras %}
+<!DOCTYPE html>{% load i18n libextras amextras %}{% load url from future %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
     <meta charset="utf-8" />
diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index f740d18c3..46f8f4155 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -138,7 +138,7 @@ def viewmail_selfservice(request, mail_id,
     secret_id = request.GET.get("secret_id", "")
     if rcpt is None:
         raise Http404
-    content = Template("""
+    content = Template("""{% load url from future %}
 <iframe src="{% url 'modoboa.extensions.amavis.views.getmailcontent' mail_id %}" id="mailcontent"></iframe>
 """).render(Context(dict(mail_id=mail_id)))
 
diff --git a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
index a67977c43..b1c032f5a 100644
--- a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
+++ b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
@@ -1,4 +1,4 @@
-{% load i18n libextras %}
+{% load i18n libextras %}{% load url from future %}
 <h2>{% trans "Auto-reply message" %} <small>{% trans "Define a message to automatically send when you are off" %}</small></h2>
 <hr>
 <form class="form-horizontal" method="POST" 
diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html b/modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html
index 2fa771b09..f11406768 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html
@@ -1,4 +1,4 @@
-{% load i18n sfilters_tags %}
+{% load i18n sfilters_tags %}{% load url from future %}
 {% if fs.filters %}
 <table class="table table-striped table-bordered">
   <tr>
diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/index.html b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
index b234f3001..dd02dabe0 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/index.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
@@ -1,4 +1,4 @@
-{% extends "twocols.html" %}{% load i18n sfilters_tags %}
+{% extends "twocols.html" %}{% load i18n sfilters_tags %}{% load url from future %}
 {% block pagetitle %}{% trans "Message filters" %}{% endblock %}
 {% block html_head %}
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}sievefilters/css/style.css" />
diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html b/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html
index cf0e28508..5df72b670 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html
@@ -1,3 +1,4 @@
+{% load url from future %}
 <form action="{% url 'modoboa.extensions.sievefilters.views.savefs' name %}" 
       method="POST" id="feditor" name="feditor">
   <textarea id="scriptcontent" name="scriptcontent">{{ scriptcontent }}</textarea>
diff --git a/modoboa/extensions/stats/templates/stats/index.html b/modoboa/extensions/stats/templates/stats/index.html
index c95691a42..325e7b9da 100644
--- a/modoboa/extensions/stats/templates/stats/index.html
+++ b/modoboa/extensions/stats/templates/stats/index.html
@@ -1,4 +1,4 @@
-{% extends "twocols.html" %}{% load i18n %}
+{% extends "twocols.html" %}{% load i18n %}{% load url from future %}
 {% block pagetitle %}{% trans "Graphical statistics" %}{% endblock %}
 {% block html_head %}
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}stats/css/stats.css" />
diff --git a/modoboa/extensions/webmail/templates/webmail/attachments.html b/modoboa/extensions/webmail/templates/webmail/attachments.html
index 86c78e795..9545e20fb 100644
--- a/modoboa/extensions/webmail/templates/webmail/attachments.html
+++ b/modoboa/extensions/webmail/templates/webmail/attachments.html
@@ -1,4 +1,4 @@
-{% extends "common/generic_modal_form.html" %}
+{% extends "common/generic_modal_form.html" %}{% load url from future %}
 {% load i18n %}
 {% block modalbody %}
 {{ block.super }}
diff --git a/modoboa/extensions/webmail/templates/webmail/compose.html b/modoboa/extensions/webmail/templates/webmail/compose.html
index 0fa2a0e37..6b8ff538c 100644
--- a/modoboa/extensions/webmail/templates/webmail/compose.html
+++ b/modoboa/extensions/webmail/templates/webmail/compose.html
@@ -1,4 +1,4 @@
-{% load i18n libextras %}
+{% load i18n libextras %}{% load url from future %}
 <form class="form-horizontal" method="POST" action="{{ posturl }}" id="composemail">
   <div id="compose-container">
     <div id="mailheader" class="well">
diff --git a/modoboa/extensions/webmail/templates/webmail/headers.html b/modoboa/extensions/webmail/templates/webmail/headers.html
index ec5e4f213..d075b19e1 100644
--- a/modoboa/extensions/webmail/templates/webmail/headers.html
+++ b/modoboa/extensions/webmail/templates/webmail/headers.html
@@ -1,4 +1,4 @@
-{% extends "common/mailheaders.html" %}{% load i18n %}
+{% extends "common/mailheaders.html" %}{% load i18n %}{% load url from future %}
 {% block extraheaders %}{% if attachments %}
   <div class="row">
     <div class="header">{% trans "Attachments" %}</div>
diff --git a/modoboa/extensions/webmail/templates/webmail/index.html b/modoboa/extensions/webmail/templates/webmail/index.html
index ed4ebdfe3..b633e35c7 100644
--- a/modoboa/extensions/webmail/templates/webmail/index.html
+++ b/modoboa/extensions/webmail/templates/webmail/index.html
@@ -1,4 +1,4 @@
-{% extends "fixed.html" %}{% load i18n libextras %}
+{% extends "fixed.html" %}{% load i18n libextras %}{% load url from future %}
 {% block pagetitle %}Webmail{% endblock %}
 {% block html_head %}
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}webmail/css/webmail.css" />
diff --git a/modoboa/templates/layout_simple.html b/modoboa/templates/layout_simple.html
index 6369c68e3..a9fdec651 100644
--- a/modoboa/templates/layout_simple.html
+++ b/modoboa/templates/layout_simple.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>{% load url from future %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
     <meta charset="utf-8" />
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 7eabcb6e4..08ce58afc 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>{% load i18n admin_extras uprefs_extras libextras %}
+<!DOCTYPE html>{% load i18n admin_extras uprefs_extras libextras %}{% load url from future %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
     <meta charset="utf-8" />
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index 63e649405..3f62ae8c5 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>{% load i18n libextras %}
+<!DOCTYPE html>{% load i18n libextras %}{% load url from future %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
     <meta charset="utf-8" />
@@ -26,7 +26,7 @@
           </div>
         </div>
         <div class="row">
-          <form method="post" action="{% url 'modoboa.auth.views.dologin' %}" 
+          <form method="post" action="{% url 'modoboa.auth.views.dologin' %}"
                 class="well span3">
             {% render_field form.username %}
             {% render_field form.password %}
diff --git a/modoboa/userprefs/templates/userprefs/forward.html b/modoboa/userprefs/templates/userprefs/forward.html
index 1aecb3f1e..895a2ef52 100644
--- a/modoboa/userprefs/templates/userprefs/forward.html
+++ b/modoboa/userprefs/templates/userprefs/forward.html
@@ -1,4 +1,4 @@
-{% load i18n libextras %}
+{% load i18n libextras %}{% load url from future %}
 <h2>{% trans "Forward" %} <small>{% trans "Automatically forward emails to another address" %}</small></h2>
 <hr>
 <form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.forward' %}" 
diff --git a/modoboa/userprefs/templates/userprefs/preferences.html b/modoboa/userprefs/templates/userprefs/preferences.html
index 1a67a22c5..5eaa5b54a 100644
--- a/modoboa/userprefs/templates/userprefs/preferences.html
+++ b/modoboa/userprefs/templates/userprefs/preferences.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n %}{% load url from future %}
 <h2>{% trans "Preferences" %} <small>{% trans "Customize Modoboa" %}</small></h2>
 <hr>
 <form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.preferences' %}" 
diff --git a/modoboa/userprefs/templates/userprefs/profile.html b/modoboa/userprefs/templates/userprefs/profile.html
index b553b06f8..b4c4bedb9 100644
--- a/modoboa/userprefs/templates/userprefs/profile.html
+++ b/modoboa/userprefs/templates/userprefs/profile.html
@@ -1,4 +1,4 @@
-{% load i18n libextras %}
+{% load i18n libextras %}{% load url from future %}
 <h2>{% trans "Profile" %} <small>{% trans "Update your personal information" %}</small></h2>
 <hr>
 <form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.profile' %}"