From 1138d8e9712b25b425af0add5474c06fba78828f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Farka?= <stepanfarka11@gmail.com>
Date: Wed, 23 Mar 2022 10:48:23 +0100
Subject: [PATCH] [ADD] content to region&district center page
---
.../0046_districtcenterpage_content.py | 31 +++++++++++++++++++
district/models.py | 9 ++++++
.../district/district_center_page.html | 3 ++
.../0021_regioncenterpage_content.py | 28 +++++++++++++++++
region/models.py | 9 ++++++
.../templates/region/region_center_page.html | 3 ++
6 files changed, 83 insertions(+)
create mode 100644 district/migrations/0046_districtcenterpage_content.py
create mode 100644 region/migrations/0021_regioncenterpage_content.py
diff --git a/district/migrations/0046_districtcenterpage_content.py b/district/migrations/0046_districtcenterpage_content.py
new file mode 100644
index 00000000..8ccba89b
--- /dev/null
+++ b/district/migrations/0046_districtcenterpage_content.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.0.3 on 2022-03-23 09:24
+
+import wagtail.contrib.table_block.blocks
+import wagtail.core.blocks
+import wagtail.core.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ (
+ "district",
+ "0045_districthomepage_custom_logo_districthomepage_flickr_and_more",
+ ),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="districtcenterpage",
+ name="content",
+ field=wagtail.core.fields.StreamField(
+ [
+ ("text", wagtail.core.blocks.RichTextBlock()),
+ ("table", wagtail.contrib.table_block.blocks.TableBlock()),
+ ],
+ blank=True,
+ verbose_name="Obsah",
+ ),
+ ),
+ ]
diff --git a/district/models.py b/district/models.py
index f48aa042..a672aaba 100644
--- a/district/models.py
+++ b/district/models.py
@@ -812,6 +812,14 @@ class DistrictCenterPage(CalendarMixin, SubpageMixin, MetadataPageMixin, Page):
null=True,
related_name="+",
)
+ content = StreamField(
+ [
+ ("text", RichTextBlock()),
+ ("table", TableBlock()),
+ ],
+ verbose_name="Obsah",
+ blank=True,
+ )
text = RichTextField("Text", null=True)
sidebar_content = StreamField(
[("address", blocks.AddressBlock()), ("contact", blocks.CenterContactBlock())],
@@ -825,6 +833,7 @@ class DistrictCenterPage(CalendarMixin, SubpageMixin, MetadataPageMixin, Page):
FieldPanel("perex"),
ImageChooserPanel("background_photo"),
FieldPanel("text"),
+ StreamFieldPanel("content"),
FieldPanel("calendar_url"),
StreamFieldPanel("sidebar_content"),
]
diff --git a/district/templates/district/district_center_page.html b/district/templates/district/district_center_page.html
index 788a4f67..920c07d2 100644
--- a/district/templates/district/district_center_page.html
+++ b/district/templates/district/district_center_page.html
@@ -22,6 +22,9 @@
<div class="lg:w-3/5 xl:w-2/3">
<div class="content-block">
{{ page.text | richtext }}
+ {% for block in page.content %}
+ {% include_block block %}
+ {% endfor %}
</div>
{% include "shared/small_calendar_snippet.html" %}
</div>
diff --git a/region/migrations/0021_regioncenterpage_content.py b/region/migrations/0021_regioncenterpage_content.py
new file mode 100644
index 00000000..bc782775
--- /dev/null
+++ b/region/migrations/0021_regioncenterpage_content.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.0.3 on 2022-03-23 09:23
+
+import wagtail.contrib.table_block.blocks
+import wagtail.core.blocks
+import wagtail.core.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("region", "0020_regionhomepage_custom_logo_regionhomepage_flickr_and_more"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="regioncenterpage",
+ name="content",
+ field=wagtail.core.fields.StreamField(
+ [
+ ("text", wagtail.core.blocks.RichTextBlock()),
+ ("table", wagtail.contrib.table_block.blocks.TableBlock()),
+ ],
+ blank=True,
+ verbose_name="Obsah",
+ ),
+ ),
+ ]
diff --git a/region/models.py b/region/models.py
index 8b7ecee3..3bfdb435 100644
--- a/region/models.py
+++ b/region/models.py
@@ -805,6 +805,14 @@ class RegionCenterPage(CalendarMixin, SubpageMixin, MetadataPageMixin, Page):
null=True,
related_name="+",
)
+ content = StreamField(
+ [
+ ("text", RichTextBlock()),
+ ("table", TableBlock()),
+ ],
+ verbose_name="Obsah",
+ blank=True,
+ )
text = RichTextField("Text", null=True)
sidebar_content = StreamField(
[("address", blocks.AddressBlock()), ("contact", blocks.CenterContactBlock())],
@@ -818,6 +826,7 @@ class RegionCenterPage(CalendarMixin, SubpageMixin, MetadataPageMixin, Page):
FieldPanel("perex"),
ImageChooserPanel("background_photo"),
FieldPanel("text"),
+ StreamFieldPanel("content"),
FieldPanel("calendar_url"),
StreamFieldPanel("sidebar_content"),
]
diff --git a/region/templates/region/region_center_page.html b/region/templates/region/region_center_page.html
index 092cee5c..42c05775 100644
--- a/region/templates/region/region_center_page.html
+++ b/region/templates/region/region_center_page.html
@@ -22,6 +22,9 @@
<div class="lg:w-3/5 xl:w-2/3">
<div class="content-block">
{{ page.text | richtext }}
+ {% for block in page.content %}
+ {% include_block block %}
+ {% endfor %}
</div>
{% include "shared/small_calendar_snippet.html" %}
</div>
--
GitLab