From 429ad4da37663283d9bd34a3569b8eb894504e76 Mon Sep 17 00:00:00 2001 From: Felix Rindt Date: Mon, 21 Sep 2020 17:44:43 +0200 Subject: [PATCH] Refactor primary color to settings variable (#1775) --- src/pretix/base/email.py | 2 +- src/pretix/base/services/notifications.py | 2 +- src/pretix/base/settings.py | 2 +- src/pretix/settings.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/email.py b/src/pretix/base/email.py index e3fa0497ef..963d45a507 100644 --- a/src/pretix/base/email.py +++ b/src/pretix/base/email.py @@ -114,7 +114,7 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer): 'site_url': settings.SITE_URL, 'body': body_md, 'subject': str(subject), - 'color': '#8E44B3', + 'color': settings.PRETIX_PRIMARY_COLOR, 'rtl': get_language() in settings.LANGUAGES_RTL } if self.event: diff --git a/src/pretix/base/services/notifications.py b/src/pretix/base/services/notifications.py index ae3f5c1413..256c30263d 100644 --- a/src/pretix/base/services/notifications.py +++ b/src/pretix/base/services/notifications.py @@ -91,7 +91,7 @@ def send_notification_mail(notification: Notification, user: User): ctx = { 'site': settings.PRETIX_INSTANCE_NAME, 'site_url': settings.SITE_URL, - 'color': '#8E44B3', + 'color': settings.PRETIX_PRIMARY_COLOR, 'notification': notification, 'settings_url': build_absolute_uri( 'control:user.settings.notifications', diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 6ee146f1da..b11ec45427 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -1580,7 +1580,7 @@ Your {event} team""")) 'type': bool }, 'primary_color': { - 'default': '#8E44B3', + 'default': settings.PRETIX_PRIMARY_COLOR, 'type': str, }, 'theme_color_success': { diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 6e7919e788..8fff1d0ea7 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -126,6 +126,7 @@ PRETIX_ADMIN_AUDIT_COMMENTS = config.getboolean('pretix', 'audit_comments', fall PRETIX_OBLIGATORY_2FA = config.getboolean('pretix', 'obligatory_2fa', fallback=False) PRETIX_SESSION_TIMEOUT_RELATIVE = 3600 * 3 PRETIX_SESSION_TIMEOUT_ABSOLUTE = 3600 * 12 +PRETIX_PRIMARY_COLOR = '#8E44B3' SITE_URL = config.get('pretix', 'url', fallback='http://localhost') if SITE_URL.endswith('/'):