diff --git a/district/blocks.py b/district/blocks.py index 7789d36ba9c734f58e1e7a4b1a48608234c43b54..b885a0a302f198503dd6c9499c2bb6dcc6836c82 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 1694cd92e1a19dcedbefea002679da5e8615ee31..4ea2cfd83933bb5780169d7144ee88c3bd45d69d 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 95fd1432d49a80e2375f18ab58d0d082bea1fc97..a70005f83ecbbb943630e408790b0060dfdc4bd6 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 1694cd92e1a19dcedbefea002679da5e8615ee31..4ea2cfd83933bb5780169d7144ee88c3bd45d69d 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>