From 967ad834883818c7a921110b4891f059a963a110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1?= <git@imaniti.org>
Date: Wed, 7 Dec 2022 11:02:51 +0100
Subject: [PATCH] nice text defaults for people page & people, rich text for
people page perex
---
.../0034_alter_mainpeoplepage_perex.py | 19 +++++++++++++++++++
main/models.py | 2 +-
main/templates/main/main_people_page.html | 6 +++---
main/templates/main/main_program_page.html | 4 ++--
4 files changed, 25 insertions(+), 6 deletions(-)
create mode 100644 main/migrations/0034_alter_mainpeoplepage_perex.py
diff --git a/main/migrations/0034_alter_mainpeoplepage_perex.py b/main/migrations/0034_alter_mainpeoplepage_perex.py
new file mode 100644
index 00000000..711e4e98
--- /dev/null
+++ b/main/migrations/0034_alter_mainpeoplepage_perex.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.0.7 on 2022-12-07 09:59
+
+from django.db import migrations
+import wagtail.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main', '0033_alter_mainpersonpage_position'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='mainpeoplepage',
+ name='perex',
+ field=wagtail.fields.RichTextField(),
+ ),
+ ]
diff --git a/main/models.py b/main/models.py
index 32e455d4..cf8cdcd8 100644
--- a/main/models.py
+++ b/main/models.py
@@ -563,7 +563,7 @@ class MainProgramPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin
class MainPeoplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page):
### FIELDS
- perex = models.TextField()
+ perex = RichTextField()
people = StreamField(
[("people_group", blocks.PeopleGroupBlock(label="Seznam osob"))],
verbose_name="Lidé",
diff --git a/main/templates/main/main_people_page.html b/main/templates/main/main_people_page.html
index 2fad86be..51153351 100644
--- a/main/templates/main/main_people_page.html
+++ b/main/templates/main/main_people_page.html
@@ -8,9 +8,9 @@
<main role="main" class="mb-4 xl:mb-20">
<div class="grid-container">
<div class="grid-content">
- <p class="font-condensed text-xl leading-7 mb-5">
- {{ page.perex }}
- </p>
+ <div class="prose font-condensed text-xl leading-7 mb-5">
+ {{ page.perex|richtext }}
+ </div>
</div>
</div>
<div class="container--medium">
diff --git a/main/templates/main/main_program_page.html b/main/templates/main/main_program_page.html
index fd06e656..3ff18274 100644
--- a/main/templates/main/main_program_page.html
+++ b/main/templates/main/main_program_page.html
@@ -42,9 +42,9 @@
<h3 class="font-alt mb-4 text-4xl">
{{ item.title }}
</h3>
- <p class="leading-6">
+ <div class="prose leading-6">
{{ item.text|richtext }}
- </p>
+ </div>
</div>
</div>
{% endfor %}
--
GitLab