From a158b28dd486e384cbf0b4138ea893eb3d77933c Mon Sep 17 00:00:00 2001
From: OndraRehounek <ondra.rehounek@seznam.cz>
Date: Thu, 14 Apr 2022 14:31:38 +0200
Subject: [PATCH] district & region: Card links extended by richtext
---
district/blocks.py | 3 +++
district/templates/district/blocks/card_link_block.html | 4 +++-
region/blocks.py | 3 +++
region/templates/region/blocks/card_link_block.html | 4 +++-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/district/blocks.py b/district/blocks.py
index 7789d36b..b885a0a3 100644
--- a/district/blocks.py
+++ b/district/blocks.py
@@ -4,6 +4,7 @@ from wagtail.core.blocks import (
IntegerBlock,
ListBlock,
PageChooserBlock,
+ RichTextBlock,
StructBlock,
TextBlock,
URLBlock,
@@ -66,6 +67,8 @@ class CandidateListBlock(StructBlock):
class CardLinkBlock(StructBlock):
image = ImageChooserBlock(label="Obrázek")
title = CharBlock(label="Titulek", required=True)
+ text = RichTextBlock(label="Krátký text pod nadpisem", required=False)
+
page = PageChooserBlock(
label="Stránka",
page_type=[
diff --git a/district/templates/district/blocks/card_link_block.html b/district/templates/district/blocks/card_link_block.html
index 1694cd92..4ea2cfd8 100644
--- a/district/templates/district/blocks/card_link_block.html
+++ b/district/templates/district/blocks/card_link_block.html
@@ -12,6 +12,8 @@
{{ self.title }}
</a>
</h1>
- <p class="card-body-text"></p>
+ <p class="card-body-text">
+ {{ self.text | default_if_none:'' | richtext }}
+ </p>
</div>
</article>
diff --git a/region/blocks.py b/region/blocks.py
index 95fd1432..a70005f8 100644
--- a/region/blocks.py
+++ b/region/blocks.py
@@ -4,6 +4,7 @@ from wagtail.core.blocks import (
IntegerBlock,
ListBlock,
PageChooserBlock,
+ RichTextBlock,
StructBlock,
TextBlock,
URLBlock,
@@ -66,6 +67,8 @@ class CandidateListBlock(StructBlock):
class CardLinkBlock(StructBlock):
image = ImageChooserBlock(label="Obrázek")
title = CharBlock(label="Titulek", required=True)
+ text = RichTextBlock(label="Krátký text pod nadpisem", required=False)
+
page = PageChooserBlock(
label="Stránka",
page_type=[
diff --git a/region/templates/region/blocks/card_link_block.html b/region/templates/region/blocks/card_link_block.html
index 1694cd92..4ea2cfd8 100644
--- a/region/templates/region/blocks/card_link_block.html
+++ b/region/templates/region/blocks/card_link_block.html
@@ -12,6 +12,8 @@
{{ self.title }}
</a>
</h1>
- <p class="card-body-text"></p>
+ <p class="card-body-text">
+ {{ self.text | default_if_none:'' | richtext }}
+ </p>
</div>
</article>
--
GitLab