github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Django 1.5 compatibility.

Browse Source 
see #384
This commit is contained in:
Antoine Nguyen
2013-03-02 17:06:23 +01:00
parent be3136a14d
commit eeab8c1233
21 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/templates/admin/extensions.html
+1 -1
View File
@@ -1,6 +1,6 @@
{% load i18n %}
<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 %}">
<form id="settings_form" method="POST" action="{% url 'modoboa.admin.views.saveextensions' %}">
{{ extensions|safe }}
</form>
<a href="#" class="btn btn-primary" id="update" name="update">{% trans 'Save' %}</a>
modoboa/admin/templates/admin/identities.html
+3 -3
View File
@@ -6,19 +6,19 @@
<script type="text/javascript" src="{{ STATIC_URL }}js/autocompleter.js"></script>
<script type="text/javascript">
function get_domains_list(container) {
$.getJSON("{% url modoboa.admin.views.domains_list %}", function(data) {
$.getJSON("{% url 'modoboa.admin.views.domains_list' %}", function(data) {
container.value = data;
});
}
function get_account_list(container) {
$.getJSON("{% url modoboa.admin.views.accounts_list %}", function(data) {
$.getJSON("{% url 'modoboa.admin.views.accounts_list' %}", function(data) {
container.value = data;
});
}
function get_mboxes_list(container) {
$.getJSON("{% url modoboa.admin.views.mboxes_list %}", function(data) {
$.getJSON("{% url 'modoboa.admin.views.mboxes_list' %}", function(data) {
container.value = data;
});
}
modoboa/admin/templates/admin/parameters.html
+1 -1
View File
@@ -1,5 +1,5 @@
{% load i18n %}
{% url modoboa.admin.views.saveparameters as action %}
{% url "modoboa.admin.views.saveparameters" as action %}
<h2>{% trans "Parameters" %} <small>{% trans "Configure Modoboa" %}</small></h2><hr />
<form id="settings_form" method="POST" action="{{ action }}" class="form-horizontal">
{% include "common/parameters.html" %}
modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html
+1 -1
View File
@@ -9,6 +9,6 @@
{% trans "To:" %} {{ msg.rid.email }}
{% trans "Date:" %} {{ msg.mail.time_num|fromunix|date:"DATETIME_FORMAT" }}
{% trans "Subject:" %} {{ msg.mail.subject }}
{% trans "Act on this message:" %} {{ baseurl }}{% url modoboa.extensions.amavis.views.index %}#{{ msg.mail.mail_id }}/?rcpt={{ msg.rid.email }}
{% trans "Act on this message:" %} {{ baseurl }}{% url "modoboa.extensions.amavis.views.index" %}#{{ msg.mail.mail_id }}/?rcpt={{ msg.rid.email }}
{% endfor %}
{% blocktrans %}Please visit {{ listingurl }} for a full listing.{% endblocktrans %}
modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
+1 -1
View File
@@ -12,7 +12,7 @@
<script src="{{ STATIC_URL }}js/global.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}js/notify.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}amavis/js/selfservice.js" type="text/javascript"></script>
{% url django.views.i18n.javascript_catalog as catalog_url %}
{% url "django.views.i18n.javascript_catalog" as catalog_url %}
<script type="text/javascript" src="{{ catalog_url }}"></script>
<script type="text/javascript">
set_media_url("{{ STATIC_URL }}");
modoboa/extensions/amavis/views.py
+1 -1
View File
@@ -139,7 +139,7 @@ def viewmail_selfservice(request, mail_id,
if rcpt is None:
raise Http404
content = Template("""
<iframe src="{% url modoboa.extensions.amavis.views.getmailcontent mail_id %}" id="mailcontent"></iframe>
<iframe src="{% url 'modoboa.extensions.amavis.views.getmailcontent' mail_id %}" id="mailcontent"></iframe>
""").render(Context(dict(mail_id=mail_id)))
return _render(request, tplname, dict(
modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
+1 -1
View File
@@ -2,7 +2,7 @@
<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"
action="{% url modoboa.extensions.postfix_autoreply.views.autoreply %}"
action="{% url 'modoboa.extensions.postfix_autoreply.views.autoreply' %}"
id="uprefs_form">
{% render_form form %}
<div class="form-actions">
modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html
+1 -1
View File
@@ -13,7 +13,7 @@
<td>
<a name="togglestate"
class={% if filter.enabled %}"green"{% else %}"red"{% endif %}
href="{% url modoboa.extensions.sievefilters.views.toggle_filter_state fs.name filter.name %}">
href="{% url 'modoboa.extensions.sievefilters.views.toggle_filter_state' fs.name filter.name %}">
{{ filter.enabled|yesno }}
</a>
</td>
modoboa/extensions/sievefilters/templates/sievefilters/index.html
+2 -2
View File
@@ -15,8 +15,8 @@ var cond_templates = null;
var action_templates = null;
function filterform_cb() {
cond_templates = fetch_templates("{% url modoboa.extensions.sievefilters.views.get_templates 'condition' %}", cond_templates);
action_templates = fetch_templates("{% url modoboa.extensions.sievefilters.views.get_templates 'action' %}", action_templates);
cond_templates = fetch_templates("{% url 'modoboa.extensions.sievefilters.views.get_templates' 'condition' %}", cond_templates);
action_templates = fetch_templates("{% url 'modoboa.extensions.sievefilters.views.get_templates' 'action' %}", action_templates);
var $dc = $("#condition_0").dyncondition({
templates: cond_templates
modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html
+1 -1
View File
@@ -1,4 +1,4 @@
<form action="{% url modoboa.extensions.sievefilters.views.savefs name %}"
<form action="{% url 'modoboa.extensions.sievefilters.views.savefs' name %}"
method="POST" id="feditor" name="feditor">
<textarea id="scriptcontent" name="scriptcontent">{{ scriptcontent }}</textarea>
</form>
modoboa/extensions/stats/templates/stats/index.html
+2 -2
View File
@@ -7,14 +7,14 @@
<script type="text/javascript" src="{{ STATIC_URL }}stats/js/stats.js"></script>
<script type="text/javascript">
function get_domains_list(container) {
$.getJSON("{% url modoboa.admin.views.domains_list %}", function(data) {
$.getJSON("{% url 'modoboa.admin.views.domains_list' %}", function(data) {
container.value = data;
});
}
$(document).ready(function() {
var stats = new Stats({
graphurl: "{% url modoboa.extensions.stats.views.graphs %}",
graphurl: "{% url 'modoboa.extensions.stats.views.graphs' %}",
deflocation: "{{ deflocation|safe }}",
language: "{{ LANGUAGE_CODE }}"
});
modoboa/extensions/webmail/templates/webmail/attachments.html
+1 -1
View File
@@ -13,7 +13,7 @@
<div class="well" id="attachment_list">
{% for att in attachments %}
<div class="row-fluid">
<a href="{% url modoboa.extensions.webmail.views.delattachment %}?name={{ att.tmpname }}"
<a href="{% url 'modoboa.extensions.webmail.views.delattachment' %}?name={{ att.tmpname }}"
name="delattachment">
<i class="icon-remove"></i>
</a>
modoboa/extensions/webmail/templates/webmail/compose.html
+1 -1
View File
@@ -10,7 +10,7 @@
{% if form.cc.value %}{% render_field form.cc %}{% else %}{% render_and_hide_field form.cc %}{% endif %}
{% render_and_hide_field form.cci %}
{% render_field form.subject %}
<div id="attachments" name="{% url modoboa.extensions.webmail.views.attachments %}">
<div id="attachments" name="{% url 'modoboa.extensions.webmail.views.attachments' %}">
<div>
<img src="{{ STATIC_URL }}pics/attachment.png" />
{% trans "Attachments" %}
modoboa/extensions/webmail/templates/webmail/headers.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% block extraheaders %}{% if attachments %}
<div class="row">
<div class="header">{% trans "Attachments" %}</div>
<div class="value">{% url modoboa.extensions.webmail.views.getattachment as url %}
<div class="value">{% url "modoboa.extensions.webmail.views.getattachment" as url %}
{% for key, fname in attachments.items %}
<a href="{{ url }}?mbox={{ folder }}&mailid={{ mail_id }}&fname={{ fname }}&partnumber={{ key }}">{{ fname }}</a>
{% endfor %}
modoboa/extensions/webmail/templates/webmail/index.html
+3 -3
View File
@@ -14,9 +14,9 @@ var webmail = undefined;
$(document).ready(function() {
webmail = new Webmail({
poller_interval: {{ refreshrate }},
poller_url: "{% url modoboa.extensions.webmail.views.check_unseen_messages %}",
move_url: "{% url modoboa.extensions.webmail.views.move %}",
submboxes_url: "{% url modoboa.extensions.webmail.views.submailboxes %}",
poller_url: "{% url 'modoboa.extensions.webmail.views.check_unseen_messages' %}",
move_url: "{% url 'modoboa.extensions.webmail.views.move' %}",
submboxes_url: "{% url 'modoboa.extensions.webmail.views.submailboxes' %}",
deflocation: "{{ deflocation }}",
defcallback: "{{ defcallback }}",
ro_mboxes: {% tolist ro_mboxes %}
modoboa/templates/layout_simple.html
+1 -1
View File
@@ -8,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap-responsive.css" />
<script src="{{ STATIC_URL }}js/bootstrap.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}js/bootstrap-datepicker.js" type="text/javascript"></script>
{% url django.views.i18n.javascript_catalog as catalog_url %}
{% url "django.views.i18n.javascript_catalog" as catalog_url %}
<script type="text/javascript" src="{{ catalog_url }}"></script>
<style>
body {
modoboa/templates/nlayout.html
+1 -1
View File
@@ -16,7 +16,7 @@
<script src="{{ STATIC_URL }}js/confirmation.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}js/notify.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}js/poller.js" type="text/javascript"></script>
{% url django.views.i18n.javascript_catalog as catalog_url %}
{% url "django.views.i18n.javascript_catalog" as catalog_url %}
<script type="text/javascript" src="{{ catalog_url }}"></script>
<script type="text/javascript">
set_static_url("{{ STATIC_URL }}");
modoboa/templates/registration/login.html
+2 -2
View File
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/login.css" />
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap.js"></script>
{% url django.views.i18n.javascript_catalog as catalog_url %}
{% url "django.views.i18n.javascript_catalog" as catalog_url %}
<script type="text/javascript" src="{{ catalog_url }}"></script>
<script type="text/javascript">
$(document).ready(function() {
@@ -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 %}
modoboa/userprefs/templates/userprefs/forward.html
+1 -1
View File
@@ -1,7 +1,7 @@
{% load i18n libextras %}
<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 %}"
<form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.forward' %}"
id="uprefs_form">
{% render_form form %}
<div class="form-actions">
modoboa/userprefs/templates/userprefs/preferences.html
+1 -1
View File
@@ -1,7 +1,7 @@
{% load i18n %}
<h2>{% trans "Preferences" %} <small>{% trans "Customize Modoboa" %}</small></h2>
<hr>
<form class="form-horizontal" method="POST" action="{% url modoboa.userprefs.views.preferences %}"
<form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.preferences' %}"
id="uprefs_form">
{% include "common/parameters.html" %}
<hr>
modoboa/userprefs/templates/userprefs/profile.html
+1 -1
View File
@@ -1,7 +1,7 @@
{% load i18n libextras %}
<h2>{% trans "Profile" %} <small>{% trans "Update your personal information" %}</small></h2>
<hr>
<form class="form-horizontal" method="POST" action="{% url modoboa.userprefs.views.profile %}"
<form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.profile' %}"
id="uprefs_form">
{% render_form form %}
<div class="form-actions">