diff --git a/base-requirements.txt b/base-requirements.txt index e05960733..149093594 100644 --- a/base-requirements.txt +++ b/base-requirements.txt @@ -1,6 +1,9 @@ dj-database-url==0.5.0 django-pipeline==3.1.0 # 3.0.0 is first version that supports Django 4.2 django-sitetree==1.18.0 # >=1.17.1 is (?) first version that supports Django 4.2 +django-apptemplates==1.5 +django-admin-interface==0.28.9 +django-translation-aliases==0.1.0 Django==4.2.27 docutils==0.21.2 Markdown==3.7 diff --git a/pydotorg/settings/base.py b/pydotorg/settings/base.py index 68f35d527..0fac91eb1 100644 --- a/pydotorg/settings/base.py +++ b/pydotorg/settings/base.py @@ -123,9 +123,15 @@ TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [TEMPLATES_DIR], - 'APP_DIRS': True, + 'DIRS': [ + TEMPLATES_DIR, + ], 'OPTIONS': { + 'loaders': [ + 'apptemplates.Loader', + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + ], 'context_processors': [ 'django.template.context_processors.debug', 'django.template.context_processors.i18n', @@ -184,10 +190,13 @@ 'django.contrib.staticfiles', 'django.contrib.humanize', + 'admin_interface', + 'colorfield', 'django.contrib.admin', 'django.contrib.admindocs', 'django_celery_beat', + 'django_translation_aliases', 'pipeline', 'sitetree', 'imagekit', diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html index 98a5aee5f..ce757a4d2 100644 --- a/templates/admin/base_site.html +++ b/templates/admin/base_site.html @@ -1,10 +1,10 @@ -{% extends "admin/base.html" %} +{% extends "admin_interface:admin/base_site.html" %} {% load i18n %} {% block title %}{{ title }} | {% trans 'python.org' %}{% endblock %} {% block branding %} -

{% trans 'python.org administration' %}

+

{% trans 'python.org administration' %}

{% endblock %} {% block nav-global %}{% endblock %}