Commit 0c513a53 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

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

Resolve "No favicon for the admin site"

Closes #999

See merge request !1481
parents 4f4d1d23 23e5c21b
......@@ -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",
......
{% 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 %}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment