diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 066ae2a89c..cfe2fd9998 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -1,13 +1,19 @@ {% extends "admin/base_site.html" %} {% load i18n admin_modify adminmedia %} + {% block extrahead %}{{ block.super }} {% for js in javascript_imports %}{% include_admin_script js %}{% endfor %} {% endblock %} + {% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %} + {% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %} + {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} + {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} + {% block breadcrumbs %}{% if not is_popup %} {% endif %}{% endblock %} + {% block content %}
{% block object-tools %} {% if change %}{% if not is_popup %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index f50a73c934..693b1f2da8 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -1,10 +1,16 @@ {% extends "admin/base_site.html" %} {% load adminmedia admin_list i18n %} + {% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %} + {% block bodyclass %}change-list{% endblock %} + {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} + {% if not is_popup %}{% block breadcrumbs %}{% endblock %}{% endif %} + {% block coltype %}flex{% endblock %} + {% block content %}
{% block object-tools %} diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index 3921ab69e3..a11e7b3e84 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -1,6 +1,8 @@ {% extends "admin/base_site.html" %} {% load i18n %} + {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} + {% block breadcrumbs %} {% endblock %} + {% block content %} {% if perms_lacking %}

{% blocktrans with object|escape as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

diff --git a/django/contrib/admin/templates/admin/index.html b/django/contrib/admin/templates/admin/index.html index aa63c14fce..0723d969a7 100644 --- a/django/contrib/admin/templates/admin/index.html +++ b/django/contrib/admin/templates/admin/index.html @@ -2,9 +2,13 @@ {% load i18n %} {% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css{% endblock %} + {% block coltype %}colMS{% endblock %} + {% block bodyclass %}dashboard{% endblock %} + {% block breadcrumbs %}{% endblock %} + {% block content %}
diff --git a/django/contrib/admin/templates/admin/invalid_setup.html b/django/contrib/admin/templates/admin/invalid_setup.html index 1d7d61f0d2..4fa41bbaa0 100644 --- a/django/contrib/admin/templates/admin/invalid_setup.html +++ b/django/contrib/admin/templates/admin/invalid_setup.html @@ -4,7 +4,5 @@ {% block breadcrumbs %}{% endblock %} {% block content %} -

{% trans "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user." %}

- {% endblock %} diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html index 0773132cec..5dd953bc23 100644 --- a/django/contrib/admin/templates/admin/login.html +++ b/django/contrib/admin/templates/admin/login.html @@ -2,12 +2,14 @@ {% load i18n %} {% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/login.css{% endblock %} + {% block bodyclass %}login{% endblock %} + {% block content_title %}{% endblock %} + {% block breadcrumbs %}{% endblock %} {% block content %} - {% if error_message %}

{{ error_message }}

{% endif %} diff --git a/django/contrib/admin/templates/admin/object_history.html b/django/contrib/admin/templates/admin/object_history.html index 14a77b8a31..4b1b5564bf 100644 --- a/django/contrib/admin/templates/admin/object_history.html +++ b/django/contrib/admin/templates/admin/object_history.html @@ -1,17 +1,17 @@ {% extends "admin/base_site.html" %} {% load i18n %} + {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} + {% block breadcrumbs %} {% endblock %} {% block content %} -
{% if action_list %} - @@ -30,14 +30,9 @@ {% endfor %}
- {% else %} -

{% trans "This object doesn't have a change history. It probably wasn't added via this admin site." %}

- {% endif %} -
- {% endblock %}