Commit f5123c72 authored by julien 'pouete' Godin's avatar julien 'pouete' Godin Committed by Tim Graham
Browse files

Fixed #21371 -- Added the block.super to admin bodyclass blocks. 

Thanks Keryn Knight for the report.
parent 59d9b264

django/contrib/admin/templates/admin/app_index.html

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

{% load i18n %}



{% block bodyclass %}app-{{ app_label }} {{ block.super }}{% endblock %}

{% block bodyclass %}{{ block.super }} app-{{ app_label }}{% endblock %}



{% if not is_popup %}

{% block breadcrumbs %}

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

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>

{% endblock %}

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

{% block bodyclass %}{{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %}

{% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %}

{% if not is_popup %}

{% block breadcrumbs %}

<div class="breadcrumbs">

django/contrib/admin/templates/admin/change_form.html

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


{% block coltype %}colM{% endblock %}



{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %}

{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %}



{% if not is_popup %}

{% block breadcrumbs %}

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
{% endif %}{% endif %}

{% endblock %}



{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.model_name }} change-list{% endblock %}

{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-list{% endblock %}



{% if not is_popup %}

{% block breadcrumbs %}

django/contrib/admin/templates/admin/delete_confirmation.html

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

{% load i18n admin_urls %}



{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %}

{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %}



{% block breadcrumbs %}

<div class="breadcrumbs">