diff --git a/src/pretix/base/context.py b/src/pretix/base/context.py
new file mode 100644
index 000000000..1b89dd6b3
--- /dev/null
+++ b/src/pretix/base/context.py
@@ -0,0 +1,13 @@
+import sys
+
+from django.conf import settings
+
+
+def contextprocessor(request):
+ ctx = {}
+ if settings.DEBUG and 'runserver' not in sys.argv:
+ ctx['debug_warning'] = True
+ elif 'runserver' in sys.argv:
+ ctx['development_warning'] = True
+
+ return ctx
diff --git a/src/pretix/control/context.py b/src/pretix/control/context.py
index 8be6703be..6a48d7a94 100644
--- a/src/pretix/control/context.py
+++ b/src/pretix/control/context.py
@@ -99,11 +99,6 @@ def contextprocessor(request):
ctx['js_locale'] = get_moment_locale()
ctx['select2locale'] = get_language()[:2]
- if settings.DEBUG and 'runserver' not in sys.argv:
- ctx['debug_warning'] = True
- elif 'runserver' in sys.argv:
- ctx['development_warning'] = True
-
ctx['warning_update_available'] = False
ctx['warning_update_check_active'] = False
gs = GlobalSettingsObject()
diff --git a/src/pretix/control/templates/pretixcontrol/auth/base.html b/src/pretix/control/templates/pretixcontrol/auth/base.html
index 6f27cf29e..4bd601955 100644
--- a/src/pretix/control/templates/pretixcontrol/auth/base.html
+++ b/src/pretix/control/templates/pretixcontrol/auth/base.html
@@ -10,12 +10,16 @@
{% endcompress %}
-
+ {% if development_warning or debug_warning %}
+
+ {% else %}
+
+
+
+
+ {% endif %}
-
-
-
diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index dace6fb91..e65e0b067 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -59,12 +59,16 @@
{{ html_head|safe }}
-
+ {% if development_warning or debug_warning %}
+
+ {% else %}
+
+
+
+
+ {% endif %}
-
-
-
diff --git a/src/pretix/presale/templates/pretixpresale/base.html b/src/pretix/presale/templates/pretixpresale/base.html
index ceaf7e73c..2d1ad3083 100644
--- a/src/pretix/presale/templates/pretixpresale/base.html
+++ b/src/pretix/presale/templates/pretixpresale/base.html
@@ -30,6 +30,8 @@
+ {% elif development_warning or debug_warning %}
+
{% else %}
diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index 0a36d806f..9cf598509 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -477,6 +477,7 @@ TEMPLATES = [
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
+ 'pretix.base.context.contextprocessor',
'pretix.control.context.contextprocessor',
'pretix.presale.context.contextprocessor',
],
diff --git a/src/pretix/static/pretixbase/img/favicon-debug.ico b/src/pretix/static/pretixbase/img/favicon-debug.ico
new file mode 100644
index 000000000..0d2934742
Binary files /dev/null and b/src/pretix/static/pretixbase/img/favicon-debug.ico differ