Permalink
Browse files

Fixed #18037 -- Changed behaviour of url and ssi template tags to the…

… new syntax, as per official deprecation timeline. Thanks Ramiro Morales and Jannis Leidel for the review.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent c4e62ef commit eb351ac9cba2d6b2750aecb4353ba482d6dca87f @claudep claudep committed Apr 24, 2012
Showing with 132 additions and 439 deletions.
  1. +0 −1 django/contrib/admin/templates/admin/500.html
  2. +0 −1 django/contrib/admin/templates/admin/app_index.html
  3. +0 −1 django/contrib/admin/templates/admin/auth/user/change_password.html
  4. +1 −1 django/contrib/admin/templates/admin/base.html
  5. +0 −1 django/contrib/admin/templates/admin/change_form.html
  6. +0 −1 django/contrib/admin/templates/admin/change_list.html
  7. +0 −1 django/contrib/admin/templates/admin/delete_confirmation.html
  8. +0 −1 django/contrib/admin/templates/admin/delete_selected_confirmation.html
  9. +0 −1 django/contrib/admin/templates/admin/invalid_setup.html
  10. +0 −1 django/contrib/admin/templates/admin/login.html
  11. +0 −1 django/contrib/admin/templates/admin/object_history.html
  12. +0 −1 django/contrib/admin/templates/registration/logged_out.html
  13. +0 −1 django/contrib/admin/templates/registration/password_change_done.html
  14. +0 −1 django/contrib/admin/templates/registration/password_change_form.html
  15. +0 −1 django/contrib/admin/templates/registration/password_reset_complete.html
  16. +0 −1 django/contrib/admin/templates/registration/password_reset_confirm.html
  17. +0 −1 django/contrib/admin/templates/registration/password_reset_done.html
  18. +1 −1 django/contrib/admin/templates/registration/password_reset_email.html
  19. +0 −1 django/contrib/admin/templates/registration/password_reset_form.html
  20. +0 −1 django/contrib/admindocs/templates/admin_doc/bookmarklets.html
  21. +0 −1 django/contrib/admindocs/templates/admin_doc/index.html
  22. +0 −1 django/contrib/admindocs/templates/admin_doc/missing_docutils.html
  23. +0 −1 django/contrib/admindocs/templates/admin_doc/model_detail.html
  24. +0 −1 django/contrib/admindocs/templates/admin_doc/model_index.html
  25. +0 −1 django/contrib/admindocs/templates/admin_doc/template_detail.html
  26. +0 −1 django/contrib/admindocs/templates/admin_doc/template_filter_index.html
  27. +0 −1 django/contrib/admindocs/templates/admin_doc/template_tag_index.html
  28. +0 −1 django/contrib/admindocs/templates/admin_doc/view_detail.html
  29. +0 −1 django/contrib/admindocs/templates/admin_doc/view_index.html
  30. +1 −1 django/contrib/auth/tests/templates/context_processors/auth_attrs_user.html
  31. +45 −64 django/template/defaulttags.py
  32. +6 −116 django/templatetags/future.py
  33. +3 −0 docs/internals/deprecation.txt
  34. +0 −1 docs/ref/contrib/admin/index.txt
  35. +13 −86 docs/ref/templates/builtins.txt
  36. +0 −2 docs/topics/auth.txt
  37. +1 −1 docs/topics/i18n/timezones.txt
  38. +6 −21 tests/regressiontests/i18n/patterns/tests.py
  39. +2 −2 tests/regressiontests/templates/templates/response.html
  40. +51 −113 tests/regressiontests/templates/tests.py
  41. +2 −3 tests/regressiontests/urlpatterns_reverse/urlconf_inner.py
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/index.html" %}
{% load i18n %}
-{% load url from future %}
{% if not is_popup %}
{% block breadcrumbs %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_static admin_modify %}
-{% load url from future %}
{% load admin_urls %}
{% block extrahead %}{{ block.super }}
@@ -1,4 +1,4 @@
-{% load admin_static %}{% load url from future %}<!DOCTYPE html>
+{% load admin_static %}<!DOCTYPE html>
<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
<head>
<title>{% block title %}{% endblock %}</title>
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_static admin_modify %}
-{% load url from future %}
{% load admin_urls %}
{% block extrahead %}{{ block.super }}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_static admin_list %}
-{% load url from future %}
{% load admin_urls %}
{% block extrastyle %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% load admin_urls %}
{% block breadcrumbs %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n l10n %}
-{% load url from future %}
{% load admin_urls %}
{% block breadcrumbs %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_static %}
-{% load url from future %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}" />{% endblock %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% load admin_urls %}
{% block breadcrumbs %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}<div class="breadcrumbs"><a href="{% url 'admin:index' %}">{% trans 'Home' %}</a></div>{% endblock %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>{% endblock %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n static %}
-{% load url from future %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}
{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>{% endblock %}
{% block breadcrumbs %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,4 +1,4 @@
-{% load i18n %}{% load url from future %}{% autoescape off %}
+{% load i18n %}{% autoescape off %}
{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
{% trans "Please go to the following page and choose a new password:" %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block extrahead %}
{{ block.super }}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block coltype %}colSM{% endblock %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block coltype %}colSM{% endblock %}
{% block breadcrumbs %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block coltype %}colSM{% endblock %}
{% block breadcrumbs %}
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block breadcrumbs %}
<div class="breadcrumbs">
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
-{% load url from future %}
{% block coltype %}colSM{% endblock %}
{% block breadcrumbs %}
@@ -1,4 +1,4 @@
-{% load url from future %}unicode: {{ user }}
+unicode: {{ user }}
id: {{ user.id }}
username: {{ user.username }}
url: {% url 'userpage' user %}
Oops, something went wrong.

0 comments on commit eb351ac

Please sign in to comment.