innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #18450 -- Removed default values for i18n JavaScript URLs in Admin templates

This commit is contained in:
Daniel Hepper 2012-06-08 15:28:07 +02:00 committed by Florian Apolloner
parent ac1b9ae630
commit 108f8dddea
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/admin/templates/admin/auth/user/change_password.html
View File

@ -3,8 +3,7 @@
{% load admin_urls %} {% load admin_urls %}
{% block extrahead %}{{ block.super }} {% block extrahead %}{{ block.super }}
{% url 'admin:jsi18n' as jsi18nurl %} <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
<script type="text/javascript" src="{{ jsi18nurl|default:"../../../../jsi18n/" }}"></script>
{% endblock %} {% endblock %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}
{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}

3
django/contrib/admin/templates/admin/change_form.html
View File

@ -3,8 +3,7 @@
{% load admin_urls %} {% load admin_urls %}
{% block extrahead %}{{ block.super }} {% block extrahead %}{{ block.super }}
{% url 'admin:jsi18n' as jsi18nurl %} <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
<script type="text/javascript" src="{{ jsi18nurl|default:"../../../jsi18n/" }}"></script>
{{ media }} {{ media }}
{% endblock %} {% endblock %}

3
django/contrib/admin/templates/admin/change_list.html
View File

@ -9,8 +9,7 @@
<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" /> <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
{% endif %} {% endif %}
{% if cl.formset or action_form %} {% if cl.formset or action_form %}
{% url 'admin:jsi18n' as jsi18nurl %} <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
<script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script>
{% endif %} {% endif %}
{{ media.css }} {{ media.css }}
{% if not actions_on_top and not actions_on_bottom %} {% if not actions_on_top and not actions_on_bottom %}