From cc5538db54dd538690bbf1f049260662dbee9ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Fri, 25 Jun 2021 15:48:08 +0200
Subject: [PATCH] donate: Choose project form title
---
.../0015_donateprojectpage_form_title.py | 22 ++++
...0016_alter_donateprojectpage_form_title.py | 23 ++++
donate/models.py | 17 ++-
.../templates/donate/donate_project_page.html | 6 +-
.../donate/donate_project_page_coalition.html | 2 +-
.../migrations/0032_auto_20210625_1540.py | 113 ++++++++++++++++++
6 files changed, 178 insertions(+), 5 deletions(-)
create mode 100644 donate/migrations/0015_donateprojectpage_form_title.py
create mode 100644 donate/migrations/0016_alter_donateprojectpage_form_title.py
create mode 100644 elections2021/migrations/0032_auto_20210625_1540.py
diff --git a/donate/migrations/0015_donateprojectpage_form_title.py b/donate/migrations/0015_donateprojectpage_form_title.py
new file mode 100644
index 00000000..4d020ea6
--- /dev/null
+++ b/donate/migrations/0015_donateprojectpage_form_title.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.4 on 2021-06-25 13:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("donate", "0014_donateprojectpage_coalition_design"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="donateprojectpage",
+ name="form_title",
+ field=models.TextField(
+ choices=[("project", "Podpoř projekt"), ("camapign", "Podpoř kampaň")],
+ default="project",
+ verbose_name="titulek formuláře",
+ ),
+ ),
+ ]
diff --git a/donate/migrations/0016_alter_donateprojectpage_form_title.py b/donate/migrations/0016_alter_donateprojectpage_form_title.py
new file mode 100644
index 00000000..26064aa0
--- /dev/null
+++ b/donate/migrations/0016_alter_donateprojectpage_form_title.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.4 on 2021-06-25 13:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("donate", "0015_donateprojectpage_form_title"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="donateprojectpage",
+ name="form_title",
+ field=models.CharField(
+ choices=[("project", "Podpoř projekt"), ("camapign", "Podpoř kampaň")],
+ default="project",
+ max_length=10,
+ verbose_name="titulek formuláře",
+ ),
+ ),
+ ]
diff --git a/donate/models.py b/donate/models.py
index 29923c9a..60b3c21c 100644
--- a/donate/models.py
+++ b/donate/models.py
@@ -392,6 +392,14 @@ class DonateProjectIndexPage(Page, SubpageMixin, MetadataPageMixin):
class DonateProjectPage(
DonateFormMixin, DonateFormAmountsMixin, Page, SubpageMixin, MetadataPageMixin
):
+ TITLE_PROJECT = "project"
+ TITLE_CAMPAIGN = "camapign"
+
+ FORM_TITLE_CHOICES = (
+ (TITLE_PROJECT, "Podpoř projekt"),
+ (TITLE_CAMPAIGN, "Podpoř kampaň"),
+ )
+
### FIELDS
date = models.DateField("běží od")
@@ -413,6 +421,12 @@ class DonateProjectPage(
verbose_name="galerie fotek",
blank=True,
)
+ form_title = models.CharField(
+ "titulek formuláře",
+ max_length=10,
+ choices=FORM_TITLE_CHOICES,
+ default=TITLE_PROJECT,
+ )
expected_amount = models.IntegerField("očekávaná částka", blank=True, null=True)
donated_amount = models.IntegerField("vybraná částka", blank=True, null=True)
coalition_design = models.BooleanField("koaliční design", default=False)
@@ -427,7 +441,6 @@ class DonateProjectPage(
"info do přehledu projektů",
),
FieldPanel("date"),
- FieldPanel("expected_amount"),
FieldPanel("body", classname="full"),
StreamFieldPanel("gallery"),
]
@@ -454,6 +467,8 @@ class DonateProjectPage(
PublishingPanel(),
MultiFieldPanel(
[
+ FieldPanel("form_title"),
+ FieldPanel("expected_amount"),
FieldPanel("portal_project_id"),
FieldPanel("allow_periodic_donations"),
FieldPanel("form_amount_1"),
diff --git a/donate/templates/donate/donate_project_page.html b/donate/templates/donate/donate_project_page.html
index c433e892..1308c899 100644
--- a/donate/templates/donate/donate_project_page.html
+++ b/donate/templates/donate/donate_project_page.html
@@ -53,7 +53,7 @@
</div>
<div class="sharing-buttons">
<a href="https://www.facebook.com/sharer/sharer.php?u={{ page.full_url|urlencode }}" target="_blank" class="btn btn-facebook"><i class="icon-facebook-f"></i></a>
- <a href="https://twitter.com/intent/tweet?text=Podpoř projekt {{ page.title|urlencode }}&url={{ page.full_url|urlencode }}" target="_blank" class="btn btn-twitter"><i class="icon-twitter"></i></a>
+ <a href="https://twitter.com/intent/tweet?text={{ page.get_form_title_display }} {{ page.title|urlencode }}&url={{ page.full_url|urlencode }}" target="_blank" class="btn btn-twitter"><i class="icon-twitter"></i></a>
<a href="https://www.linkedin.com/sharing/share-offsite/?url={{ page.full_url|urlencode }}" target="_blank" class="btn btn-linkedin"><i class="icon-linkedin"></i></a>
</div>
</div>
@@ -67,7 +67,7 @@
<div class="project-donate-form__left">
<div class="project-donate-form__left-content">
- <h2 class="lead mb-0">Podpoř projekt</h2>
+ <h2 class="lead mb-0">{{ page.get_form_title_display }}</h2>
</div><!-- /project-donate-form__left-content -->
</div><!-- /project-donate-form__left -->
@@ -146,7 +146,7 @@
</div>
<div class="sharing-buttons">
<a href="https://www.facebook.com/sharer/sharer.php?u={{ page.full_url|urlencode }}" target="_blank" class="btn btn-facebook"><i class="icon-facebook-f"></i></a>
- <a href="https://twitter.com/intent/tweet?text=Podpoř projekt {{ page.title|urlencode }}&url={{ page.full_url|urlencode }}" target="_blank" class="btn btn-twitter"><i class="icon-twitter"></i></a>
+ <a href="https://twitter.com/intent/tweet?text={{ page.get_form_title_display }} {{ page.title|urlencode }}&url={{ page.full_url|urlencode }}" target="_blank" class="btn btn-twitter"><i class="icon-twitter"></i></a>
<a href="https://www.linkedin.com/sharing/share-offsite/?url={{ page.full_url|urlencode }}" target="_blank" class="btn btn-linkedin"><i class="icon-linkedin"></i></a>
</div>
</div>
diff --git a/donate/templates/donate/donate_project_page_coalition.html b/donate/templates/donate/donate_project_page_coalition.html
index d8eb87d3..952c62dc 100644
--- a/donate/templates/donate/donate_project_page_coalition.html
+++ b/donate/templates/donate/donate_project_page_coalition.html
@@ -69,7 +69,7 @@
<div class="project-donate-form__left">
<div class="project-donate-form__left-content">
- <h2 class="lead mb-0">Podpoř kampaň</h2>
+ <h2 class="lead mb-0">{{ page.get_form_title_display }}</h2>
</div><!-- /project-donate-form__left-content -->
</div><!-- /project-donate-form__left -->
diff --git a/elections2021/migrations/0032_auto_20210625_1540.py b/elections2021/migrations/0032_auto_20210625_1540.py
new file mode 100644
index 00000000..95254700
--- /dev/null
+++ b/elections2021/migrations/0032_auto_20210625_1540.py
@@ -0,0 +1,113 @@
+# Generated by Django 3.2.4 on 2021-06-25 13:40
+
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("elections2021", "0031_elections2021downloadspage"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="elections2021homepage",
+ name="carousel",
+ field=wagtail.core.fields.StreamField(
+ [
+ (
+ "slide",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(label="titulek"),
+ ),
+ (
+ "photo",
+ wagtail.images.blocks.ImageChooserBlock(
+ label="fotka"
+ ),
+ ),
+ (
+ "button_label",
+ wagtail.core.blocks.CharBlock(
+ label="text tlačítka"
+ ),
+ ),
+ (
+ "page",
+ wagtail.core.blocks.PageChooserBlock(
+ label="stránka do tlačítka",
+ page_type=[
+ "elections2021.Elections2021ArticlesPage",
+ "elections2021.Elections2021CandidatesListPage",
+ "elections2021.Elections2021CandidatesMapPage",
+ "elections2021.Elections2021ProgramPage",
+ "elections2021.Elections2021QuestionsPage",
+ "elections2021.Elections2021ProgramAppPage",
+ "elections2021.Elections2021TextPage",
+ "elections2021.Elections2021StrategicListPage",
+ "elections2021.Elections2021StrategicPage",
+ "elections2021.Elections2021MythsPage",
+ "elections2021.Elections2021DownloadsPage",
+ ],
+ required=False,
+ ),
+ ),
+ (
+ "raw_url",
+ wagtail.core.blocks.CharBlock(
+ label="ručně zadaný odkaz do tlačítka (místo stránky)",
+ required=False,
+ ),
+ ),
+ ]
+ ),
+ )
+ ],
+ blank=True,
+ verbose_name="obsah slideru",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="elections2021homepage",
+ name="footer_menu",
+ field=wagtail.core.fields.StreamField(
+ [
+ (
+ "item",
+ wagtail.core.blocks.StructBlock(
+ [
+ ("name", wagtail.core.blocks.CharBlock(label="název")),
+ (
+ "page",
+ wagtail.core.blocks.PageChooserBlock(
+ label="stránka",
+ page_type=[
+ "elections2021.Elections2021ArticlesPage",
+ "elections2021.Elections2021CandidatesListPage",
+ "elections2021.Elections2021CandidatesMapPage",
+ "elections2021.Elections2021ProgramPage",
+ "elections2021.Elections2021QuestionsPage",
+ "elections2021.Elections2021ProgramAppPage",
+ "elections2021.Elections2021TextPage",
+ "elections2021.Elections2021StrategicListPage",
+ "elections2021.Elections2021StrategicPage",
+ "elections2021.Elections2021MythsPage",
+ "elections2021.Elections2021DownloadsPage",
+ ],
+ ),
+ ),
+ ]
+ ),
+ )
+ ],
+ blank=True,
+ verbose_name="menu projděte si v zápatí",
+ ),
+ ),
+ ]
--
GitLab