Commit 7ff5580d authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #14389, #9666 -- Started the migration path to make the first argument... 

Fixed #14389, #9666 -- Started the migration path to make the first argument to url and ssi template tags syntactically consistent with other tags. Thanks to Sean Brant for the draft patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 591ad8af

django/contrib/admin/templates/admin/auth/user/change_password.html

+2 −1
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load i18n admin_modify adminmedia %}

{% load url from future %}

{% block extrahead %}{{ block.super }}

{% url admin:jsi18n as jsi18nurl %}

{% url 'admin:jsi18n' as jsi18nurl %}

<script type="text/javascript" src="{{ jsi18nurl|default:"../../../../jsi18n/" }}"></script>

{% endblock %}

{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}

django/contrib/admin/templates/admin/base.html

+4 −4
Original line number Diff line number Diff line 
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

{% load url from future %}<!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|default:"en-us" }}" xml:lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

<head>

<title>{% block title %}{% endblock %}</title>
@@ -28,18 +28,18 @@ 
            {% trans 'Welcome,' %}

            <strong>{% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</strong>.

            {% block userlinks %}

                {% url django-admindocs-docroot as docsroot %}

                {% url 'django-admindocs-docroot' as docsroot %}

                {% if docsroot %}

                    <a href="{{ docsroot }}">{% trans 'Documentation' %}</a> /

                {% endif %}

                {% url admin:password_change as password_change_url %}

                {% url 'admin:password_change' as password_change_url %}

                {% if password_change_url %}

                    <a href="{{ password_change_url }}">

                {% else %}

                    <a href="{{ root_path }}password_change/">

                {% endif %}

                {% trans 'Change password' %}</a> /

                {% url admin:logout as logout_url %}

                {% url 'admin:logout' as logout_url %}

                {% if logout_url %}

                    <a href="{{ logout_url }}">

                {% else %}

django/contrib/admin/templates/admin/change_list.html

+5 −5
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load adminmedia admin_list i18n %}



{% load url from future %}

{% block extrastyle %}

  {{ block.super }}

  <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
@@ -8,7 +8,7 @@ 
    <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />

  {% endif %}

  {% if cl.formset or action_form %}

    {% url admin:jsi18n as jsi18nurl %}

    {% url 'admin:jsi18n' as jsi18nurl %}

    <script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script>

  {% endif %}

  {{ media.css }}

django/contrib/admin/templates/registration/password_change_done.html

+2 −1
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load i18n %}

{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}

{% 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="../../logout/">{% trans 'Log out' %}</a>{% endblock %}

{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %}



{% block title %}{% trans 'Password change successful' %}{% endblock %}

django/contrib/admin/templates/registration/password_change_form.html

+2 −1
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load i18n adminmedia %}

{% load url from future %}

{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}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="../logout/">{% trans 'Log out' %}</a>{% endblock %}

{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}

{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %}



{% block title %}{% trans 'Password change' %}{% endblock %}