From bebbb9010798a5031d1b4283677a9c10c8500fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Thu, 18 Jan 2024 12:32:40 +0100
Subject: [PATCH] add description to candidates
---
...0011_electionscandidatepage_description.py | 19 +++++++++++++++++++
elections/models.py | 2 ++
.../elections/elections_candidate_page.html | 2 +-
.../molecules/blocks/inline_contact.html | 14 ++++++++------
.../header/elections/candidate_header.html | 5 +++++
5 files changed, 35 insertions(+), 7 deletions(-)
create mode 100644 elections/migrations/0011_electionscandidatepage_description.py
diff --git a/elections/migrations/0011_electionscandidatepage_description.py b/elections/migrations/0011_electionscandidatepage_description.py
new file mode 100644
index 00000000..92368217
--- /dev/null
+++ b/elections/migrations/0011_electionscandidatepage_description.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.1.10 on 2024-01-18 11:26
+
+from django.db import migrations
+import wagtail.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('elections', '0010_alter_electionshomepage_content'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='electionscandidatepage',
+ name='description',
+ field=wagtail.fields.RichTextField(blank=True, null=True, verbose_name='Popis'),
+ ),
+ ]
diff --git a/elections/models.py b/elections/models.py
index ee923ab6..179572f6 100644
--- a/elections/models.py
+++ b/elections/models.py
@@ -207,6 +207,7 @@ class ElectionsCandidatePage(
position = models.CharField("Pozice/povolání", max_length=64, blank=True, null=True)
perex = RichTextField()
+ description = RichTextField("Popis", blank=True, null=True)
email = models.CharField("E-mail", max_length=128, blank=True, null=True)
phone = models.CharField("Telefonní kontakt", max_length=16, blank=True, null=True)
@@ -232,6 +233,7 @@ class ElectionsCandidatePage(
FieldPanel("image"),
FieldPanel("position"),
FieldPanel("perex"),
+ FieldPanel("description"),
FieldPanel("email"),
FieldPanel("phone"),
FieldPanel("social_links"),
diff --git a/elections/templates/elections/elections_candidate_page.html b/elections/templates/elections/elections_candidate_page.html
index 28dfdfae..3d433f24 100644
--- a/elections/templates/elections/elections_candidate_page.html
+++ b/elections/templates/elections/elections_candidate_page.html
@@ -4,7 +4,7 @@
{% include 'styleguide2/includes/organisms/layout/elections/navbar.html' with selected_item=page.get_menu_title %}
<main role="main">
- {% include 'styleguide2/includes/organisms/header/elections/candidate_header.html' with title=page.title position=page.position perex=page.perex image=page.image email=page.email phone=page.phone social_links=page.social_links %}
+ {% include 'styleguide2/includes/organisms/header/elections/candidate_header.html' with title=page.title position=page.position perex=page.perex description=page.description image=page.image email=page.email phone=page.phone social_links=page.social_links %}
{% if article_data_list %}
{% include 'styleguide2/includes/organisms/articles/elections/candidate_articles_section.html' with title=page.articles_heading %}
diff --git a/shared/templates/styleguide2/includes/molecules/blocks/inline_contact.html b/shared/templates/styleguide2/includes/molecules/blocks/inline_contact.html
index fd292c4f..0e5fe83e 100644
--- a/shared/templates/styleguide2/includes/molecules/blocks/inline_contact.html
+++ b/shared/templates/styleguide2/includes/molecules/blocks/inline_contact.html
@@ -1,10 +1,12 @@
<div>
- <h3
- class="
- hidden font-alt text-[3.5rem] mb-3
- xl:block
- "
- >Kontakty</h3>
+ {% if phone or email or social_links %}
+ <h3
+ class="
+ hidden font-alt text-[3.5rem] mb-3
+ xl:block
+ "
+ >Kontakty</h3>
+ {% endif %}
</div>
<div class="flex flex-col gap-2 text-lg">
diff --git a/shared/templates/styleguide2/includes/organisms/header/elections/candidate_header.html b/shared/templates/styleguide2/includes/organisms/header/elections/candidate_header.html
index ede045aa..1f6beeec 100644
--- a/shared/templates/styleguide2/includes/organisms/header/elections/candidate_header.html
+++ b/shared/templates/styleguide2/includes/organisms/header/elections/candidate_header.html
@@ -57,6 +57,11 @@
"
>
{{ perex|richtext }}
+
+ {% if description %}
+ <br>
+ {{ description|richtext }}
+ {% endif %}
</div>
{% endblock %}
--
GitLab