diff --git a/website/newsletters/services.py b/website/newsletters/services.py index bde2dfb94..85cc0ab42 100644 --- a/website/newsletters/services.py +++ b/website/newsletters/services.py @@ -1,6 +1,5 @@ import base64 import logging -import math from io import BytesIO from django.core.files.base import ContentFile @@ -92,10 +91,12 @@ def send_newsletter(newsletter): def split_local_partners(): - all_local_partners = Partner.objects.filter(is_local_partner=True).order_by("?") + all_local_partners = Partner.objects.filter( + is_local_partner=True, is_active=True + ).order_by("?") local_partner_count = len(all_local_partners) local_partners = [] - for i in range(math.floor(local_partner_count / 2)): + for i in range(local_partner_count // 2): local_partners.append( [all_local_partners[i * 2], all_local_partners[i * 2 + 1]] ) diff --git a/website/newsletters/templates/newsletters/email.html b/website/newsletters/templates/newsletters/email.html index 6b4932e56..e726f1fa3 100644 --- a/website/newsletters/templates/newsletters/email.html +++ b/website/newsletters/templates/newsletters/email.html @@ -206,7 +206,7 @@

{{ item.title.upper }}

- {{ main_partner.name }} + {{ main_partner.name }}
OUR MAIN PARTNER

@@ -232,7 +232,7 @@

{{ item.title.upper }}

- {{ local_partner.name }} + {{ local_partner.name }}
OUR LOCAL PARTNER

diff --git a/website/thaliawebsite/settings.py b/website/thaliawebsite/settings.py index e6ca79ca3..2a1ca20f8 100644 --- a/website/thaliawebsite/settings.py +++ b/website/thaliawebsite/settings.py @@ -1043,6 +1043,16 @@ def show_toolbar(request): }, ], }, + "fit_small_pad": { + "FORMAT": "webp", + "PROCESSORS": [ + { + "PATH": "utils.media.processors.thumbnail", + "size": (360, 150), + "mode": "pad", + }, + ], + }, "fit_large": { "FORMAT": "webp", "PROCESSORS": [