Code

Ticket #10990: extrahead.diff

File extrahead.diff, 4.1 KB (added by kit1980, 5 years ago)
Line 
1Index: django/contrib/admin/templates/admin/change_list.html
2===================================================================
3--- django/contrib/admin/templates/admin/change_list.html       (revision 10673)
4+++ django/contrib/admin/templates/admin/change_list.html       (working copy)
5@@ -2,7 +2,6 @@
6 {% load adminmedia admin_list i18n %}
7 
8 {% block extrastyle %}
9-  {{ block.super }}
10   <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
11   {% if cl.formset %}
12     <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
13@@ -14,6 +13,7 @@
14       #changelist table thead th:first-child {width: inherit}
15     </style>
16   {% endif %}
17+  {{ block.super }}
18 {% endblock %}
19 
20 {% block bodyclass %}change-list{% endblock %}
21Index: django/contrib/admin/templates/admin/auth/user/change_password.html
22===================================================================
23--- django/contrib/admin/templates/admin/auth/user/change_password.html (revision 10673)
24+++ django/contrib/admin/templates/admin/auth/user/change_password.html (working copy)
25@@ -1,9 +1,10 @@
26 {% extends "admin/base_site.html" %}
27 {% load i18n admin_modify adminmedia %}
28-{% block extrahead %}{{ block.super }}
29+{% block extrahead %}
30 <script type="text/javascript" src="../../../../jsi18n/"></script>
31+{{ block.super }}
32 {% endblock %}
33-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
34+{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{{ block.super }}{% endblock %}
35 {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
36 {% block breadcrumbs %}{% if not is_popup %}
37 <div class="breadcrumbs">
38Index: django/contrib/admin/templates/admin/index.html
39===================================================================
40--- django/contrib/admin/templates/admin/index.html     (revision 10673)
41+++ django/contrib/admin/templates/admin/index.html     (working copy)
42@@ -1,7 +1,7 @@
43 {% extends "admin/base_site.html" %}
44 {% load i18n %}
45 
46-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css" />{% endblock %}
47+{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css" />{{ block.super }}{% endblock %}
48 
49 {% block coltype %}colMS{% endblock %}
50 
51Index: django/contrib/admin/templates/admin/change_form.html
52===================================================================
53--- django/contrib/admin/templates/admin/change_form.html       (revision 10673)
54+++ django/contrib/admin/templates/admin/change_form.html       (working copy)
55@@ -1,12 +1,13 @@
56 {% extends "admin/base_site.html" %}
57 {% load i18n admin_modify adminmedia %}
58 
59-{% block extrahead %}{{ block.super }}
60+{% block extrahead %}
61 <script type="text/javascript" src="../../../jsi18n/"></script>
62 {{ media }}
63+{{ block.super }}
64 {% endblock %}
65 
66-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
67+{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{{ block.super }}{% endblock %}
68 
69 {% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
70 
71Index: django/contrib/admin/templates/admin/login.html
72===================================================================
73--- django/contrib/admin/templates/admin/login.html     (revision 10673)
74+++ django/contrib/admin/templates/admin/login.html     (working copy)
75@@ -1,7 +1,7 @@
76 {% extends "admin/base_site.html" %}
77 {% load i18n %}
78 
79-{% block extrastyle %}{% load adminmedia %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/login.css" />{% endblock %}
80+{% block extrastyle %}{% load adminmedia %}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/login.css" />{{ block.super }}{% endblock %}
81 
82 {% block bodyclass %}login{% endblock %}
83