Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
claudep committed Apr 24, 2012
1 parent c4e62ef commit eb351ac
Show file tree
Hide file tree
Showing 41 changed files with 132 additions and 439 deletions.
1 change: 0 additions & 1 deletion django/contrib/admin/templates/admin/500.html
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
1 change: 0 additions & 1 deletion django/contrib/admin/templates/admin/app_index.html
@@ -1,6 +1,5 @@
{% extends "admin/index.html" %}
{% load i18n %}
{% load url from future %}

{% if not is_popup %}
{% block breadcrumbs %}
Expand Down
@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion django/contrib/admin/templates/admin/base.html
@@ -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>
Expand Down
1 change: 0 additions & 1 deletion django/contrib/admin/templates/admin/change_form.html
@@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion django/contrib/admin/templates/admin/change_list.html
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_static admin_list %}
{% load url from future %}
{% load admin_urls %}

{% block extrastyle %}
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}
{% load admin_urls %}

{% block breadcrumbs %}
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n l10n %}
{% load url from future %}
{% load admin_urls %}

{% block breadcrumbs %}
Expand Down
1 change: 0 additions & 1 deletion django/contrib/admin/templates/admin/invalid_setup.html
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
1 change: 0 additions & 1 deletion django/contrib/admin/templates/admin/login.html
@@ -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 %}

Expand Down
1 change: 0 additions & 1 deletion django/contrib/admin/templates/admin/object_history.html
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}
{% load admin_urls %}

{% block breadcrumbs %}
Expand Down
@@ -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 %}

Expand Down
@@ -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">
Expand Down
@@ -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 %}
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
@@ -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:" %}
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
1 change: 0 additions & 1 deletion django/contrib/admindocs/templates/admin_doc/index.html
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block extrahead %}
{{ block.super }}
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block coltype %}colSM{% endblock %}

Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block coltype %}colSM{% endblock %}
{% block breadcrumbs %}
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block coltype %}colSM{% endblock %}
{% block breadcrumbs %}
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block breadcrumbs %}
<div class="breadcrumbs">
Expand Down
@@ -1,6 +1,5 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{% block coltype %}colSM{% endblock %}
{% block breadcrumbs %}
Expand Down
@@ -1,4 +1,4 @@
{% load url from future %}unicode: {{ user }}
unicode: {{ user }}
id: {{ user.id }}
username: {{ user.username }}
url: {% url 'userpage' user %}

0 comments on commit eb351ac

Please sign in to comment.