From cb37e7435d09f1a66ee60794931032da930dd8c4 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 7 Oct 2019 09:03:46 +0200 Subject: [PATCH] Use a different-colored favicon in development mode --- src/pretix/base/context.py | 13 +++++++++++++ src/pretix/control/context.py | 5 ----- .../templates/pretixcontrol/auth/base.html | 12 ++++++++---- .../control/templates/pretixcontrol/base.html | 12 ++++++++---- .../presale/templates/pretixpresale/base.html | 2 ++ src/pretix/settings.py | 1 + .../static/pretixbase/img/favicon-debug.ico | Bin 0 -> 1150 bytes 7 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 src/pretix/base/context.py create mode 100644 src/pretix/static/pretixbase/img/favicon-debug.ico diff --git a/src/pretix/base/context.py b/src/pretix/base/context.py new file mode 100644 index 0000000000..1b89dd6b32 --- /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 8be6703bec..6a48d7a940 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 6f27cf29e7..4bd6019559 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 dace6fb910..e65e0b0674 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 ceaf7e73c7..2d1ad3083c 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 0a36d806fc..9cf5985094 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 0000000000000000000000000000000000000000..0d293474285ad39747125b688f4ff169db5a6ac0 GIT binary patch literal 1150 zcmcIkI}XAy41EZYC@^$^xxm8A1(=xW!T}hNI6>!L4GD25{&t;E*Gi#MMXS`Q^Pb;} z6$R+f8^@q;f@2Su0$9?Z6lEk&A^fD-3;!Pv(m)HHdkZe_@AgHXz1bdEuOSR`9+{X sLb$rzv!TyAzU_aB<69wdR|7@5K9J9VOBXmTXiz*;%saF|>&2tu8(blg00000 literal 0 HcmV?d00001