Merge branch '999-no-favicon-for-the-admin-site' into 'master'

Resolve "No favicon for the admin site"

Closes #999

See merge request !1481

website/thaliawebsite/settings/settings.py

@@ -45,8 +45,8 @@ DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000  # Useful for managing members
 
 # Application definition
 
+# Load django.contrib.admin after thaliawebsite so the admin page gets modified
 INSTALLED_APPS = [
-    "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
@@ -64,6 +64,7 @@ INSTALLED_APPS = [
     # Directly link to the app config when applicable as recommended
     # by the docs: https://docs.djangoproject.com/en/2.0/ref/applications/
     "thaliawebsite",  # include for admin settings
+    "django.contrib.admin",
     "pushnotifications.apps.PushNotificationsConfig",
     "members.apps.MembersConfig",
     "documents.apps.DocumentsConfig",

website/thaliawebsite/templates/admin/base_site.html

+{% extends "admin/base_site.html" %}
+{% load static %}
+
+{% block extrahead %}
+    {% if debug %}
+        <link rel="icon" href="{% static "img/browser/icon-debug.png" %}">
+    {% else %}
+        <link rel="icon" href="{% static "img/browser/icon.png" %}">
+    {% endif %}
+{% endblock %}