From f4b46cacfbaf7624d706d1913f8c44e9d7c65907 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 9 Oct 2013 15:29:04 +0200 Subject: [PATCH] libextras renamed to lib_tags. --- modoboa/core/templates/core/information.html | 2 +- modoboa/core/templates/core/parameters.html | 2 +- modoboa/core/templates/core/settings_header.html | 2 +- modoboa/core/templates/core/user_index.html | 2 +- modoboa/core/templates/core/user_profile.html | 2 +- modoboa/core/templatetags/core_tags.py | 12 +++++++----- modoboa/core/views/admin.py | 2 +- .../extensions/admin/templates/admin/dlistform.html | 2 +- .../admin/templates/admin/domain_general_form.html | 2 +- .../admin/templates/admin/domain_options_form.html | 2 +- .../extensions/admin/templates/admin/domains.html | 2 +- .../admin/templates/admin/editdomainform.html | 2 +- .../extensions/admin/templates/admin/forward.html | 2 +- .../extensions/admin/templates/admin/identities.html | 2 +- .../admin/templates/admin/identities_table.html | 2 +- .../extensions/admin/templates/admin/importform.html | 2 +- .../extensions/admin/templates/admin/listing.html | 2 +- .../extensions/admin/templates/admin/mailform.html | 2 +- .../admin/templates/admin/newdomainform.html | 2 +- .../extensions/admin/templates/admin/permsform.html | 2 +- modoboa/extensions/admin/templates/admin/quotas.html | 2 +- modoboa/extensions/admin/templatetags/admin_tags.py | 2 +- modoboa/extensions/admin/views/domain.py | 4 ++-- modoboa/extensions/admin/views/identity.py | 4 ++-- .../templates/amavis/domain_content_filter.html | 2 +- .../amavis/notifications/pending_requests.html | 2 +- .../templates/amavis/viewmail_selfservice.html | 2 +- .../limits/templates/limits/poolusage.html | 2 +- .../templates/postfix_autoreply/autoreply.html | 2 +- .../sievefilters/templates/sievefilters/filter.html | 2 +- modoboa/extensions/webmail/lib.py | 2 +- .../webmail/templates/webmail/compose.html | 2 +- .../extensions/webmail/templates/webmail/index.html | 2 +- modoboa/lib/tables.py | 2 +- .../lib/templatetags/{libextras.py => lib_tags.py} | 0 modoboa/lib/webutils.py | 2 +- modoboa/templates/common/buttons_list.html | 2 +- modoboa/templates/common/generic_field.html | 2 +- modoboa/templates/common/generic_modal_form.html | 2 +- modoboa/templates/common/menulist.html | 2 +- modoboa/templates/common/parameters.html | 2 +- modoboa/templates/common/tabforms.html | 2 +- modoboa/templates/common/wizard_forms.html | 2 +- modoboa/templates/nlayout.html | 2 +- modoboa/templates/registration/login.html | 2 +- modoboa/templates/twocols.html | 2 +- 46 files changed, 53 insertions(+), 51 deletions(-) rename modoboa/lib/templatetags/{libextras.py => lib_tags.py} (100%) diff --git a/modoboa/core/templates/core/information.html b/modoboa/core/templates/core/information.html index 8dcdf1a52..f74c13139 100644 --- a/modoboa/core/templates/core/information.html +++ b/modoboa/core/templates/core/information.html @@ -1,4 +1,4 @@ -{% load i18n core_tags libextras %} +{% load i18n core_tags lib_tags %}

{% trans "Information" %} {% trans "Various information about Modoboa" %}

Modoboa {% get_version %} {% trans "is currently in use." %}
diff --git a/modoboa/core/templates/core/parameters.html b/modoboa/core/templates/core/parameters.html index 02e5e792d..7a8130925 100644 --- a/modoboa/core/templates/core/parameters.html +++ b/modoboa/core/templates/core/parameters.html @@ -1,4 +1,4 @@ -{% load i18n libextras %}{% load url from future %} +{% load i18n lib_tags %}{% load url from future %}

{% trans "Parameters" %} {% trans "Configure Modoboa" %}

{% csrf_token %} {% include "common/parameters.html" %} diff --git a/modoboa/core/templates/core/settings_header.html b/modoboa/core/templates/core/settings_header.html index b9fc504ec..590ad50da 100644 --- a/modoboa/core/templates/core/settings_header.html +++ b/modoboa/core/templates/core/settings_header.html @@ -1,5 +1,5 @@ {% extends "twocols.html" %} -{% load i18n libextras core_tags %} +{% load i18n lib_tags core_tags %} {% block pagetitle %}{% trans "Modoboa settings" %}{% endblock %} {% block html_head %} diff --git a/modoboa/core/templates/core/user_index.html b/modoboa/core/templates/core/user_index.html index 993dc9163..9128e65b6 100644 --- a/modoboa/core/templates/core/user_index.html +++ b/modoboa/core/templates/core/user_index.html @@ -1,4 +1,4 @@ -{% extends "twocols.html" %}{% load i18n core_tags libextras %} +{% extends "twocols.html" %}{% load i18n core_tags lib_tags %} {% block pagetitle %}{% trans "Settings" %}{% endblock %} {% block html_head %} diff --git a/modoboa/core/templates/core/user_profile.html b/modoboa/core/templates/core/user_profile.html index 462892b52..0572e45e5 100644 --- a/modoboa/core/templates/core/user_profile.html +++ b/modoboa/core/templates/core/user_profile.html @@ -1,4 +1,4 @@ -{% load i18n libextras %}{% load url from future %} +{% load i18n lib_tags %}{% load url from future %}

{% trans "Profile" %} {% trans "Update your personal information" %}

{% trans "Administrators" %} diff --git a/modoboa/extensions/admin/templates/admin/forward.html b/modoboa/extensions/admin/templates/admin/forward.html index 35e332ed0..1fc8559e2 100644 --- a/modoboa/extensions/admin/templates/admin/forward.html +++ b/modoboa/extensions/admin/templates/admin/forward.html @@ -1,4 +1,4 @@ -{% load i18n libextras %}{% load url from future %} +{% load i18n lib_tags %}{% load url from future %}

{% trans "Forward" %} {% trans "Automatically forward emails to another address" %}

diff --git a/modoboa/extensions/admin/templates/admin/importform.html b/modoboa/extensions/admin/templates/admin/importform.html index 78eaea2f4..d54380f00 100644 --- a/modoboa/extensions/admin/templates/admin/importform.html +++ b/modoboa/extensions/admin/templates/admin/importform.html @@ -1,5 +1,5 @@ {% extends "common/generic_modal_form.html" %} -{% load libextras i18n %} +{% load lib_tags i18n %} {% block formbody %}

{% trans "Help" %}

diff --git a/modoboa/extensions/admin/templates/admin/listing.html b/modoboa/extensions/admin/templates/admin/listing.html index a1eef1c0a..513512d17 100644 --- a/modoboa/extensions/admin/templates/admin/listing.html +++ b/modoboa/extensions/admin/templates/admin/listing.html @@ -1,4 +1,4 @@ -{% extends "admin/header.html" %}{% load i18n admin_tags libextras %} +{% extends "admin/header.html" %}{% load i18n admin_tags lib_tags %} {% block html_head %} {{ block.super }} diff --git a/modoboa/extensions/admin/templates/admin/mailform.html b/modoboa/extensions/admin/templates/admin/mailform.html index 57655ad28..1b9374782 100644 --- a/modoboa/extensions/admin/templates/admin/mailform.html +++ b/modoboa/extensions/admin/templates/admin/mailform.html @@ -1,4 +1,4 @@ -{% load libextras %} +{% load lib_tags %} {% render_field form.email %} {% include "common/generic_field.html" with field=form.quota help_display_mode="tooltip" appended_text=_("MB") activator=True activator_value=form.quota_act.value deactivate_if_empty=False activator_label=_("Use domain default value") %} {% render_fields_group form "aliases" %} diff --git a/modoboa/extensions/admin/templates/admin/newdomainform.html b/modoboa/extensions/admin/templates/admin/newdomainform.html index 89ba7a09b..31021f1dc 100644 --- a/modoboa/extensions/admin/templates/admin/newdomainform.html +++ b/modoboa/extensions/admin/templates/admin/newdomainform.html @@ -1,4 +1,4 @@ -{% extends "common/generic_modal_form.html" %}{% load libextras %}{% block formbody %} +{% extends "common/generic_modal_form.html" %}{% load lib_tags %}{% block formbody %} {% render_field form.name %} {% render_field_appended form.quota _("MB") %} {% render_fields_group form "aliases" %} diff --git a/modoboa/extensions/admin/templates/admin/permsform.html b/modoboa/extensions/admin/templates/admin/permsform.html index 01c32e2f3..e0f6954e9 100644 --- a/modoboa/extensions/admin/templates/admin/permsform.html +++ b/modoboa/extensions/admin/templates/admin/permsform.html @@ -1,2 +1,2 @@ -{% load libextras %} +{% load lib_tags %} {% render_fields_group form "domains" %} diff --git a/modoboa/extensions/admin/templates/admin/quotas.html b/modoboa/extensions/admin/templates/admin/quotas.html index 9b0903584..01fbd76cf 100644 --- a/modoboa/extensions/admin/templates/admin/quotas.html +++ b/modoboa/extensions/admin/templates/admin/quotas.html @@ -1,4 +1,4 @@ -{% load i18n libextras admin_tags %} +{% load i18n lib_tags admin_tags %} diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py index ed2747e22..16010ef81 100644 --- a/modoboa/extensions/admin/templatetags/admin_tags.py +++ b/modoboa/extensions/admin/templatetags/admin_tags.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _, ugettext_lazy from django.core.urlresolvers import reverse from modoboa.lib import events from modoboa.lib.webutils import static_url, render_actions -from modoboa.lib.templatetags.libextras import render_link +from modoboa.lib.templatetags.lib_tags import render_link register = template.Library() diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py index 7989ebcb3..bedeb89fb 100644 --- a/modoboa/extensions/admin/views/domain.py +++ b/modoboa/extensions/admin/views/domain.py @@ -14,7 +14,7 @@ from modoboa.lib.webutils import ( ) from modoboa.lib.formutils import CreationWizard from modoboa.lib.exceptions import PermDeniedException -from modoboa.lib.templatetags.libextras import pagination_bar +from modoboa.lib.templatetags.lib_tags import pagination_bar from modoboa.extensions.admin.tables import DomainsTable from modoboa.extensions.admin.lib import get_sort_order, get_listing_page from modoboa.extensions.admin.exceptions import AdminError @@ -111,7 +111,7 @@ def newdomain(request, tplname="common/wizard_forms.html"): dict(status="ok", respmsg=_("Domain created")) ) - from modoboa.lib.templatetags.libextras import render_form + from modoboa.lib.templatetags.lib_tags import render_form return ajax_simple_response(dict( status="ko", stepid=data, form=render_form(cwizard.steps[data]["form"]) diff --git a/modoboa/extensions/admin/views/identity.py b/modoboa/extensions/admin/views/identity.py index 3ca9a9a8a..4f67990be 100644 --- a/modoboa/extensions/admin/views/identity.py +++ b/modoboa/extensions/admin/views/identity.py @@ -10,7 +10,7 @@ from modoboa.lib import parameters, events from modoboa.lib.exceptions import PermDeniedException from modoboa.lib.webutils import ajax_simple_response, _render_to_string from modoboa.lib.formutils import CreationWizard -from modoboa.lib.templatetags.libextras import pagination_bar +from modoboa.lib.templatetags.lib_tags import pagination_bar from modoboa.core.models import User from modoboa.extensions.admin.models import Mailbox from modoboa.extensions.admin.lib import ( @@ -160,7 +160,7 @@ def newaccount(request, tplname='common/wizard_forms.html'): status="ok", respmsg=_("Account created") )) - from modoboa.lib.templatetags.libextras import render_form + from modoboa.lib.templatetags.lib_tags import render_form return ajax_simple_response(dict( status="ko", stepid=data, form=render_form(cwizard.steps[data]["form"]) diff --git a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html index 8dcd6e78e..025181e07 100644 --- a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html +++ b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html @@ -1,4 +1,4 @@ -{% load i18n libextras %} +{% load i18n lib_tags %} {% render_field form.bypass_virus_checks %} {% render_field form.bypass_spam_checks %}
diff --git a/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html b/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html index e8ac3536b..8e3adc206 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 %}{% load url from future %}{% blocktrans count counter=total %} +{% load i18n lib_tags %}{% 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 f55cc202a..184bb2039 100644 --- a/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html +++ b/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html @@ -1,4 +1,4 @@ -{% load i18n libextras amextras %}{% load url from future %} +{% load i18n lib_tags amextras %}{% load url from future %} diff --git a/modoboa/extensions/limits/templates/limits/poolusage.html b/modoboa/extensions/limits/templates/limits/poolusage.html index 5fb8a2626..2a3e774b8 100644 --- a/modoboa/extensions/limits/templates/limits/poolusage.html +++ b/modoboa/extensions/limits/templates/limits/poolusage.html @@ -1,4 +1,4 @@ -{% load i18n libextras %} +{% load i18n lib_tags %}
  • {% trans "Resources usage" %}
    • {% for l in limits %} diff --git a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html index 96a96b5af..fdebce5b1 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 url from future %} +{% load i18n lib_tags %}{% load url from future %}

    {% trans "Auto-reply message" %} {% trans "Define a message to automatically send when you are off" %}

    {% endif %} {% render_field form.name %} diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py index 62ea9c038..bd59b19dd 100644 --- a/modoboa/extensions/webmail/lib.py +++ b/modoboa/extensions/webmail/lib.py @@ -270,7 +270,7 @@ class ImapEmail(Email): @property def headers_as_text(self): - return " ".join(self.headers_as_list()) + return " ".join(self.headers_as_list) def _find_content_charset(self, part): for pos, elem in enumerate(part["params"]): diff --git a/modoboa/extensions/webmail/templates/webmail/compose.html b/modoboa/extensions/webmail/templates/webmail/compose.html index 39e473603..a05a47d3b 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 url from future %} +{% load i18n lib_tags %}{% load url from future %} {% csrf_token %}
    diff --git a/modoboa/extensions/webmail/templates/webmail/index.html b/modoboa/extensions/webmail/templates/webmail/index.html index 96c5b588f..da02b3830 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 %}{% load url from future %} +{% extends "fixed.html" %}{% load i18n lib_tags %}{% load url from future %} {% block pagetitle %}Webmail{% endblock %} {% block html_head %} diff --git a/modoboa/lib/tables.py b/modoboa/lib/tables.py index 5ea8814a7..ada681a11 100644 --- a/modoboa/lib/tables.py +++ b/modoboa/lib/tables.py @@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _ from django.template import Template, RequestContext, Context from django.template.loader import render_to_string -from templatetags.libextras import render_link +from templatetags.lib_tags import render_link class Column(object): diff --git a/modoboa/lib/templatetags/libextras.py b/modoboa/lib/templatetags/lib_tags.py similarity index 100% rename from modoboa/lib/templatetags/libextras.py rename to modoboa/lib/templatetags/lib_tags.py diff --git a/modoboa/lib/webutils.py b/modoboa/lib/webutils.py index a8eb58180..0179e0cfc 100644 --- a/modoboa/lib/webutils.py +++ b/modoboa/lib/webutils.py @@ -35,7 +35,7 @@ def _render_error(request, errortpl="error", user_context=None): def render_actions(actions): - t = template.Template("""{% load libextras %} + t = template.Template("""{% load lib_tags %} {% for a in actions %}{% render_link a %}{% endfor %} """) return t.render(template.Context(dict(actions=actions))) diff --git a/modoboa/templates/common/buttons_list.html b/modoboa/templates/common/buttons_list.html index cf74dc79c..ea5af9b28 100644 --- a/modoboa/templates/common/buttons_list.html +++ b/modoboa/templates/common/buttons_list.html @@ -1,4 +1,4 @@ -{% load libextras %} +{% load lib_tags %}
    {% for entry in entries %}
    {% if entry.menu %} {% if entry.img %}{% endif %}{{ entry.label }} diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html index 82acbf87b..c7cca54d3 100644 --- a/modoboa/templates/common/generic_field.html +++ b/modoboa/templates/common/generic_field.html @@ -1,4 +1,4 @@ -{% load i18n core_tags libextras %} +{% load i18n core_tags lib_tags %}