From 045be630e13bc9b951b850759c41f4a1b9a3953c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Wed, 16 Aug 2023 01:53:09 +0200
Subject: [PATCH] richtext descriptions
---
Makefile | 2 +-
...e_academic_council_description_and_more.py | 43 +++++++++++++++++++
home/models.py | 14 +++---
home/templates/home/home_page.html | 12 +++---
4 files changed, 56 insertions(+), 15 deletions(-)
create mode 100644 home/migrations/0024_alter_homepage_academic_council_description_and_more.py
diff --git a/Makefile b/Makefile
index 6d534b2..caf452f 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ build: venv
${VENV}/bin/python manage.py collectstatic --noinput --settings=${SETTINGS}
run: venv
- ${VENV}/bin/python manage.py runserver z1.local:${PORT} --settings=${SETTINGS}
+ ${VENV}/bin/python manage.py runserver ${PORT} --settings=${SETTINGS}
shell: venv
${VENV}/bin/python manage.py shell --settings=${SETTINGS}
diff --git a/home/migrations/0024_alter_homepage_academic_council_description_and_more.py b/home/migrations/0024_alter_homepage_academic_council_description_and_more.py
new file mode 100644
index 0000000..9b6087a
--- /dev/null
+++ b/home/migrations/0024_alter_homepage_academic_council_description_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 4.2.2 on 2023-08-15 23:51
+
+import wagtail.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("home", "0023_homepage_academic_council"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="homepage",
+ name="academic_council_description",
+ field=wagtail.fields.RichTextField(verbose_name="Akademická rada - popis"),
+ ),
+ migrations.AlterField(
+ model_name="homepage",
+ name="controller_description",
+ field=wagtail.fields.RichTextField(verbose_name="Kontrolor - popis"),
+ ),
+ migrations.AlterField(
+ model_name="homepage",
+ name="council_members_description",
+ field=wagtail.fields.RichTextField(verbose_name="Správní rada - popis"),
+ ),
+ migrations.AlterField(
+ model_name="homepage",
+ name="director_description",
+ field=wagtail.fields.RichTextField(verbose_name="Ředitel - popis"),
+ ),
+ migrations.AlterField(
+ model_name="homepage",
+ name="employees_description",
+ field=wagtail.fields.RichTextField(verbose_name="Zaměstnanci - popis"),
+ ),
+ migrations.AlterField(
+ model_name="homepage",
+ name="volunteers_description",
+ field=wagtail.fields.RichTextField(verbose_name="Dobrovolníci - popis"),
+ ),
+ ]
diff --git a/home/models.py b/home/models.py
index a63771e..fff5354 100644
--- a/home/models.py
+++ b/home/models.py
@@ -46,7 +46,7 @@ class HomePage(RoutablePageMixin, Page):
blank=True,
null=True,
)
- director_description = models.TextField(verbose_name="Ředitel - popis")
+ director_description = RichTextField(verbose_name="Ředitel - popis")
academic_council = StreamField(
[
@@ -63,9 +63,7 @@ class HomePage(RoutablePageMixin, Page):
blank=True,
null=True,
)
- academic_council_description = models.TextField(
- verbose_name="Akademická rada - popis"
- )
+ academic_council_description = RichTextField(verbose_name="Akademická rada - popis")
controller = StreamField(
[
@@ -82,7 +80,7 @@ class HomePage(RoutablePageMixin, Page):
blank=True,
null=True,
)
- controller_description = models.TextField(verbose_name="Kontrolor - popis")
+ controller_description = RichTextField(verbose_name="Kontrolor - popis")
council_members = StreamField(
[
@@ -99,7 +97,7 @@ class HomePage(RoutablePageMixin, Page):
blank=True,
null=True,
)
- council_members_description = models.TextField(verbose_name="Správní rada - popis")
+ council_members_description = RichTextField(verbose_name="Správní rada - popis")
volunteers = StreamField(
[
@@ -116,7 +114,7 @@ class HomePage(RoutablePageMixin, Page):
blank=True,
null=True,
)
- volunteers_description = models.TextField(verbose_name="Dobrovolníci - popis")
+ volunteers_description = RichTextField(verbose_name="Dobrovolníci - popis")
employees = StreamField(
[
@@ -133,7 +131,7 @@ class HomePage(RoutablePageMixin, Page):
blank=True,
null=True,
)
- employees_description = models.TextField(verbose_name="Zaměstnanci - popis")
+ employees_description = RichTextField(verbose_name="Zaměstnanci - popis")
subpage_types = [
"home.HomeArticlesPage",
diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html
index 03e0aad..e08b525 100644
--- a/home/templates/home/home_page.html
+++ b/home/templates/home/home_page.html
@@ -224,7 +224,7 @@
<section class="flex flex-col gap-4">
<h3 class="text-2xl font-bold">Ředitel</h3>
<p>
- {{ page.director_description }}
+ {{ page.director_description|richtext }}
</p>
<ul class="flex flex-col gap-3">
@@ -241,7 +241,7 @@
<section class="flex flex-col gap-4">
<h3 class="text-2xl font-bold">Akademická rada</h3>
<p>
- {{ page.academic_council_description }}
+ {{ page.academic_council_description|richtext }}
</p>
<ul class="flex flex-col gap-3">
@@ -260,7 +260,7 @@
<section class="flex flex-col gap-4">
<h3 class="text-2xl font-bold">Kontrolor</h3>
<p>
- {{ page.controller_description }}
+ {{ page.controller_description|richtext }}
</p>
<ul class="flex flex-col gap-3">
@@ -277,7 +277,7 @@
<h3 class="text-2xl font-bold">Správní rada</h3>
<p>
- {{ page.council_members_description }}
+ {{ page.council_members_description|richtext }}
</p>
<ul class="flex flex-col gap-3">
@@ -295,7 +295,7 @@
<section class="flex flex-col gap-4">
<h3 class="text-2xl font-bold">Dobrovolnický kruh</h3>
<p>
- {{ page.volunteers_description }}
+ {{ page.volunteers_description|richtext }}
</p>
<h4>
<strong>Členové dobrovolnického kruhu</strong>
@@ -318,7 +318,7 @@
<ul class="flex flex-col lg:grid lg:grid-cols-3 lg:grid-rows-3 gap-y-2 gap-x-4 grid-flow-col font-serif">
<p class="leading-5">
- {{ page.employees_description }}
+ {{ page.employees_description|richtext }}
</p>
{% for block in page.employees %}
--
GitLab