From f1395ea911365bf829d54490cd8c0547b8ba77d6 Mon Sep 17 00:00:00 2001 From: Tyler Denton Date: Wed, 31 May 2023 13:59:21 -0500 Subject: [PATCH 01/14] Added new fields, updated template, styling --- .../migrations/0003_auto_20230531_1729.py | 28 ++++++++++++++++++ donate/core/models.py | 17 ++++++++++- .../fragments/donate_form_fundraise_up.html | 9 ++++++ .../templates/pages/core/campaign_page.html | 29 +++++++++++++------ source/sass/base/_layout--fundraiseup.scss | 25 ++++++++++++++++ 5 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 donate/core/migrations/0003_auto_20230531_1729.py diff --git a/donate/core/migrations/0003_auto_20230531_1729.py b/donate/core/migrations/0003_auto_20230531_1729.py new file mode 100644 index 000000000..3d5d0a963 --- /dev/null +++ b/donate/core/migrations/0003_auto_20230531_1729.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.14 on 2023-05-31 17:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0002_featureflags'), + ] + + operations = [ + migrations.AddField( + model_name='campaignpage', + name='cta_first', + field=models.BooleanField(default=False, help_text='Check this to shift the CTA to the left on desktop and to the top on mobile.'), + ), + migrations.AddField( + model_name='campaignpage', + name='donate_form_header', + field=models.CharField(blank=True, default='', max_length=50), + ), + migrations.AddField( + model_name='campaignpage', + name='intro_header', + field=models.CharField(blank=True, default='Donate now', max_length=200), + ), + ] diff --git a/donate/core/models.py b/donate/core/models.py index 862f2f701..aea8abd75 100644 --- a/donate/core/models.py +++ b/donate/core/models.py @@ -241,17 +241,32 @@ class CampaignPage(DonationPage): models.PROTECT, related_name='+', ) + lead_text = models.CharField(max_length=800) + donate_form_header = models.CharField(max_length=50, blank=True, default="") + intro_header = models.CharField(max_length=200, blank=True, default="Donate now") intro = RichTextField() content_panels = Page.content_panels + [ + FieldPanel('lead_text'), FieldPanel('project'), ImageChooserPanel('hero_image'), - FieldPanel('lead_text'), + FieldPanel('donate_form_header'), + FieldPanel('intro_header'), FieldPanel('intro'), InlinePanel('donation_amounts', label='Donation amount overrides'), ] + cta_first = models.BooleanField( + default=False, + help_text="Check this to shift the CTA to the left on desktop and to the top on mobile.", + ) + + settings_panels = Page.settings_panels + [ + FieldPanel('campaign_id'), + FieldPanel('cta_first') + ] + @classmethod def amount_stream_to_list(cls, stream): return [Decimal(child.value) for child in stream] diff --git a/donate/templates/fragments/donate_form_fundraise_up.html b/donate/templates/fragments/donate_form_fundraise_up.html index e9562bb34..0fe66a024 100644 --- a/donate/templates/fragments/donate_form_fundraise_up.html +++ b/donate/templates/fragments/donate_form_fundraise_up.html @@ -1,3 +1,12 @@ +{% load static i18n %} + +{% if page.donate_form_header != "" %} +

+ {% if page.donate_form_header != "" %} + {% trans page.donate_form_header context "Header" %} + {% endif %} +

+{% endif %} diff --git a/donate/templates/pages/core/campaign_page.html b/donate/templates/pages/core/campaign_page.html index 78b642f8f..fb389e132 100644 --- a/donate/templates/pages/core/campaign_page.html +++ b/donate/templates/pages/core/campaign_page.html @@ -36,22 +36,33 @@

{{ page.title }}

-
+ {% if page.cta_first == True %} +
+ +
+ {% endif %} +
-

- {% trans "Donate now" context "Header" %} -

+ {% if page.intro_header != "" %} +

+ {% trans page.intro_header context "Header" %} +

+ {% endif %}
{{ page.intro|richtext }}
-
- -
+ {% endif %} +
{% include "fragments/donate_form_disclaimer_fundraise_up.html" %}
diff --git a/source/sass/base/_layout--fundraiseup.scss b/source/sass/base/_layout--fundraiseup.scss index 41e2c0b8f..f070e27f6 100644 --- a/source/sass/base/_layout--fundraiseup.scss +++ b/source/sass/base/_layout--fundraiseup.scss @@ -180,6 +180,11 @@ align-items: baseline; } } + + .heading { + padding: 0 30px; + text-align: center; + } } .introduction { @@ -192,5 +197,25 @@ padding-bottom: $gutter; } } + + .order { + &__1 { + @include media-query(tablet-fundraiseup) { + order: 1; + } + } + + &__2 { + @include media-query(tablet-fundraiseup) { + order: 2; + } + } + + &__3 { + @include media-query(tablet-fundraiseup) { + order: 3; + } + } + } } } From f049d1a5f4028e16748e41cab118b32ec224aca5 Mon Sep 17 00:00:00 2001 From: Tyler Denton Date: Wed, 31 May 2023 14:21:46 -0500 Subject: [PATCH 02/14] Removed redundant check for donate_form_header --- donate/templates/fragments/donate_form_fundraise_up.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/donate/templates/fragments/donate_form_fundraise_up.html b/donate/templates/fragments/donate_form_fundraise_up.html index 0fe66a024..e0f4307d3 100644 --- a/donate/templates/fragments/donate_form_fundraise_up.html +++ b/donate/templates/fragments/donate_form_fundraise_up.html @@ -2,9 +2,7 @@ {% if page.donate_form_header != "" %}

- {% if page.donate_form_header != "" %} - {% trans page.donate_form_header context "Header" %} - {% endif %} + {% trans page.donate_form_header context "Header" %}

{% endif %}