p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #11478 - Use namespacing for URLs to i18n JavaScript in admin. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2010-01-09 20:03:11 +00:00
parent b7236b8576
commit 1e955e0143
3 changed files with 6 additions and 3 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

@ -1,7 +1,8 @@
{% extends "admin/base_site.html" %} {% extends "admin/base_site.html" %}
{% load i18n admin_modify adminmedia %} {% load i18n admin_modify adminmedia %}
{% block extrahead %}{{ block.super }} {% block extrahead %}{{ block.super }}
<script type="text/javascript" src="../../../../jsi18n/"></script> {% url admin:jsi18n as jsi18nurl %}
<script type="text/javascript" src="{{ jsi18nurl|default:"../../../../jsi18n/" }}"></script>
{% endblock %} {% endblock %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}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

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

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

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