summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshtalinberg <O.Shtalinberg@gmail.com>2015-07-03 10:25:15 (GMT)
committershtalinberg <O.Shtalinberg@gmail.com>2015-07-03 10:25:15 (GMT)
commit6f4ee9e016a6b3383bda6b846980eabdd36df519 (patch)
treed06bdbe610489629ca302fea23da4bfe1c8b396d
parent2a88e979fdfade8aa419188c460b3306b3b0cf8d (diff)
downloaddjango-admin-tools-6f4ee9e016a6b3383bda6b846980eabdd36df519.zip
django-admin-tools-6f4ee9e016a6b3383bda6b846980eabdd36df519.tar.gz
django-admin-tools-6f4ee9e016a6b3383bda6b846980eabdd36df519.tar.bz2
#3 - fix import and cleanup RemovedInDjango19Warning: Loading the `url` tag from the `future` library is deprecated
-rw-r--r--admin_tools/dashboard/modules.py2
-rw-r--r--admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html3
-rw-r--r--admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html1
-rw-r--r--admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html1
-rw-r--r--admin_tools/theming/templates/admin/base.html1
5 files changed, 2 insertions, 6 deletions
diff --git a/admin_tools/dashboard/modules.py b/admin_tools/dashboard/modules.py
index d740376..eaad20b 100644
--- a/admin_tools/dashboard/modules.py
+++ b/admin_tools/dashboard/modules.py
@@ -5,7 +5,7 @@ Module where admin tools dashboard modules classes are defined.
from django.utils.text import capfirst
from django.core.urlresolvers import reverse
from django.contrib.contenttypes.models import ContentType
-from django.forms.util import flatatt
+from django.forms.utils import flatatt
from django.utils.translation import ugettext_lazy as _
from django.utils.itercompat import is_iterable
diff --git a/admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html b/admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html
index b1c5727..88831ae 100644
--- a/admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html
+++ b/admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html
@@ -1,5 +1,4 @@
{% load i18n admin_tools_dashboard_tags %}
-{% load url from future %}
{% block dashboard_scripts %}
<script type="text/javascript" src="{{ media_url }}/admin_tools/js/utils.js"></script>
@@ -79,4 +78,4 @@
{% for module in dashboard.children %}
{% admin_tools_render_dashboard_module module %}{% endfor %}
</div>
-{% endblock %} \ No newline at end of file
+{% endblock %}
diff --git a/admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html b/admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html
index 93972ef..8b84606 100644
--- a/admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html
+++ b/admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html
@@ -1,4 +1,3 @@
-{% load url from future %}
{% url 'admin-tools-menu-add-bookmark' as form_url %}
{% if form_url %}
<form id="bookmark-form" action="{{ form_url }}" method="POST">
diff --git a/admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html b/admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html
index b0cad55..671f4b2 100644
--- a/admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html
+++ b/admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html
@@ -1,4 +1,3 @@
-{% load url from future %}
{% url 'admin-tools-menu-remove-bookmark' bookmark.id as form_url%}
{% if form_url %}
<form id="bookmark-form" action="{{ form_url }}" method="POST">
diff --git a/admin_tools/theming/templates/admin/base.html b/admin_tools/theming/templates/admin/base.html
index c6ea5fe..1d38d7e 100644
--- a/admin_tools/theming/templates/admin/base.html
+++ b/admin_tools/theming/templates/admin/base.html
@@ -1,4 +1,3 @@
-{% load url from future %}
{% load theming_tags %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>