From 2954f0e21a4c9adf96bb63c85339e7fa79d78e22 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 6 Dec 2024 09:34:38 +0100 Subject: [PATCH 01/16] remember url on donation step 1 --- src/club/forms.py | 12 ++++++------ src/club/views.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/club/forms.py b/src/club/forms.py index df92524b9..22b0554d9 100644 --- a/src/club/forms.py +++ b/src/club/forms.py @@ -31,7 +31,8 @@ class DonationStep1Form(forms.ModelForm): 'monthly' ] - def __init__(self, *args, **kwargs): + def __init__(self, *args, referer=None, **kwargs): + self.referer = referer super().__init__(*args, **kwargs) club = models.Club.objects.first() if club is not None: @@ -48,6 +49,9 @@ class DonationStep1Form(forms.ModelForm): return state + def save(self, *args, **kwargs): + self.instance.source = self.referer + return super().save(*args, **kwargs) class DonationStep2Form(forms.ModelForm, NewsletterForm): @@ -64,8 +68,7 @@ class DonationStep2Form(forms.ModelForm, NewsletterForm): 'monthly': forms.HiddenInput, } - def __init__(self, referer=None, **kwargs): - self.referer = referer + def __init__(self, **kwargs): super().__init__(**kwargs) self.fields['first_name'].required = True @@ -83,11 +86,8 @@ class DonationStep2Form(forms.ModelForm, NewsletterForm): c, key, (lambda k: lambda: self[k])(key) )) - - def save(self, *args, **kwargs): NewsletterForm.save(self, *args, **kwargs) - self.instance.source = self.referer or '' instance = super().save(*args, **kwargs) consents = [] diff --git a/src/club/views.py b/src/club/views.py index 1ab1eae06..c6136b67f 100644 --- a/src/club/views.py +++ b/src/club/views.py @@ -99,7 +99,7 @@ class JoinView(CreateView): def get_form_kwargs(self): kwargs = super().get_form_kwargs() - #kwargs['referer'] = self.request.META.get('HTTP_REFERER', '') + kwargs['referer'] = self.request.META.get('HTTP_REFERER', '') return kwargs def form_valid(self, form): -- 2.20.1 From 4fb23ed3c3396d23a37a718fc857ecc8b36b0c7f Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 6 Dec 2024 09:55:36 +0100 Subject: [PATCH 02/16] Add banner style. --- src/annoy/models.py | 1 - src/annoy/places.py | 7 +++++-- src/annoy/templates/annoy/banner_crisis.html | 6 ++++-- .../static/2022/styles/layout/_annoy.scss | 20 ++++++++++++++++++- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/annoy/models.py b/src/annoy/models.py index 92b8184dd..f6dd827d1 100644 --- a/src/annoy/models.py +++ b/src/annoy/models.py @@ -13,7 +13,6 @@ class Banner(models.Model): style = models.CharField( 'styl', max_length=255, blank=True, choices=STYLES, - help_text='Dotyczy blackoutu.' ) smallfont = models.BooleanField('mały font', default=False) text_color = models.CharField(max_length=10, blank=True) diff --git a/src/annoy/places.py b/src/annoy/places.py index ca3324223..8fa767bba 100644 --- a/src/annoy/places.py +++ b/src/annoy/places.py @@ -8,7 +8,10 @@ PLACE_DEFINITIONS = [ # ('centre', 'Środek ekranu'), ('upper', 'Górna połowa ekranu'), )), - ('crisis', 'Kryzysowa', False), + ('crisis', 'Kryzysowa', False, ( + ('quiet', 'Spokojny'), + ('loud', 'Ostry'), + )), ] PLACE_CHOICES = [p[:2] for p in PLACE_DEFINITIONS] @@ -23,6 +26,6 @@ STYLES = [] for p in PLACE_DEFINITIONS: if len(p) > 3: STYLES.extend([ - (f'{p[0]}_{s[0]}', s[1]) + (f'{p[0]}_{s[0]}', f'{p[1]} — {s[1]}') for s in p[3] ]) diff --git a/src/annoy/templates/annoy/banner_crisis.html b/src/annoy/templates/annoy/banner_crisis.html index cd39469fb..dbbb34e7a 100644 --- a/src/annoy/templates/annoy/banner_crisis.html +++ b/src/annoy/templates/annoy/banner_crisis.html @@ -2,11 +2,13 @@ {% load time_tags %} {% if banner %} -
+
Date: Fri, 6 Dec 2024 13:03:47 +0100 Subject: [PATCH 03/16] fix dictionary for ptrad --- .../migrations/0018_alter_banner_style.py | 18 ++++++++++++++++++ src/dictionary/constants.py | 1 + src/wolnelektury/templates/header.html | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/annoy/migrations/0018_alter_banner_style.py diff --git a/src/annoy/migrations/0018_alter_banner_style.py b/src/annoy/migrations/0018_alter_banner_style.py new file mode 100644 index 000000000..45ed1e6b1 --- /dev/null +++ b/src/annoy/migrations/0018_alter_banner_style.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0.8 on 2024-12-06 08:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('annoy', '0017_banner_progress_banner_target_alter_banner_place'), + ] + + operations = [ + migrations.AlterField( + model_name='banner', + name='style', + field=models.CharField(blank=True, choices=[('blackout_full', 'Blackout — Cały ekran'), ('blackout_upper', 'Blackout — Górna połowa ekranu'), ('crisis_quiet', 'Kryzysowa — Spokojny'), ('crisis_loud', 'Kryzysowa — Ostry')], max_length=255, verbose_name='styl'), + ), + ] diff --git a/src/dictionary/constants.py b/src/dictionary/constants.py index 2cef90bf9..59c8b910e 100644 --- a/src/dictionary/constants.py +++ b/src/dictionary/constants.py @@ -9,4 +9,5 @@ FN_TYPES = { 'pe': _("przypisy redaktorów Wolnych Lektur"), 'pr': _("przypisy źródła"), 'pt': _("przypisy tłumacza"), + 'ptrad': _("przypisy tradycyjne"), } diff --git a/src/wolnelektury/templates/header.html b/src/wolnelektury/templates/header.html index 17e237948..f763f011a 100644 --- a/src/wolnelektury/templates/header.html +++ b/src/wolnelektury/templates/header.html @@ -8,7 +8,7 @@ {% annoy_banner_crisis %} -{% annoy_banner_blackout %} +{#% annoy_banner_blackout %#}