diff --git a/main/blocks.py b/main/blocks.py index 006adbde585646d1c77ee18e14a6a3d6583fa5c7..89919f94323247e08881fb7d2a5e44232ecc268c 100644 --- a/main/blocks.py +++ b/main/blocks.py @@ -359,7 +359,7 @@ class TwoTextColumnBlock(StructBlock): text_column_2 = RichTextBlock(label="Druhý sloupec textu") class Meta: - icon = "text" + icon = "doc-full" label = "Text ve dvou sloupcích" @@ -376,11 +376,11 @@ class HoaxBlock(StructBlock): title = CharBlock(label="Titulek") hoax = RichTextBlock(label="Hoax") image = ImageChooserBlock(label="Obrázek") - image_explanation = RichTextBlock(label="Popis obrázku", required=False) + image_explanation = CharBlock(label="Popis obrázku", required=False) reality = RichTextBlock(label="Realita") class Meta: - icon = "text" + icon = "view" label = "Hoax" template = "main/blocks/hoax_block.html" diff --git a/main/migrations/0047_alter_mainhoaxpage_content.py b/main/migrations/0047_alter_mainhoaxpage_content.py new file mode 100644 index 0000000000000000000000000000000000000000..630f00253877cdcec277a64004698ec8262690be --- /dev/null +++ b/main/migrations/0047_alter_mainhoaxpage_content.py @@ -0,0 +1,21 @@ +# Generated by Django 4.1.6 on 2023-02-28 10:03 + +from django.db import migrations +import wagtail.blocks +import wagtail.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0046_alter_mainpeoplepage_options_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='mainhoaxpage', + name='content', + field=wagtail.fields.StreamField([('hoax', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek')), ('hoax', wagtail.blocks.RichTextBlock(label='Hoax')), ('image', wagtail.images.blocks.ImageChooserBlock(label='Obrázek')), ('image_explanation', wagtail.blocks.CharBlock(label='Popis obrázku', required=False)), ('reality', wagtail.blocks.RichTextBlock(label='Realita'))]))], blank=True, use_json_field=True, verbose_name='Hoaxy a jejich vysvětlení'), + ), + ] diff --git a/main/templates/main/blocks/hoax_block.html b/main/templates/main/blocks/hoax_block.html index a063a9f8008e07ecb44262477be6595d3446aefe..51c465b0d7026bf1c39c6ad202a42dd9bdce7274 100644 --- a/main/templates/main/blocks/hoax_block.html +++ b/main/templates/main/blocks/hoax_block.html @@ -1,4 +1,4 @@ -{% load wagtailimages_tags static %} +{% load wagtailimages_tags wagtailcore_tags static %} {% image self.image width-800 as img %} <ui-popout> @@ -9,7 +9,7 @@ <div class="flex flex-wrap gap-4 lg:flex-nowrap"> <div class="grow lg:grow-0 lg:basis-2/3 max-w-screen-lg"> <div class="prose max-w-none"> - {{ self.hoax }} + {{ self.hoax|richtext }} </div> <img class="mt-10" @@ -18,7 +18,7 @@ > <h3 class="head-2xl mt-10">Jak to je?</h3> <div class="prose max-w-none"> - {{ self.reality }} + {{ self.reality|richtext }} </div> </div> <div class="lg:basis-1/3">