entrouvert
/
debian-django-admin-tools
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #5 from shtalinberg/master 

#3 - fix import and cleanup  RemovedInDjango19Warning
This commit is contained in:
Andy Baker 2015-07-04 10:57:16 +01:00
parent 27575a3191 6f4ee9e016
commit fdc48da9d4
5 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin_tools/dashboard/modules.py
View File

@ -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

3
admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html
View File

@ -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 %}
{% endblock %}

1
admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html
View File

@ -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">

1
admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html
View File

@ -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">

1
admin_tools/theming/templates/admin/base.html
View File

@ -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 %}>