diff --git a/main/migrations/0034_alter_mainpeoplepage_perex.py b/main/migrations/0034_alter_mainpeoplepage_perex.py new file mode 100644 index 0000000000000000000000000000000000000000..711e4e98970655211e29b67ecc4bdd1de1283364 --- /dev/null +++ b/main/migrations/0034_alter_mainpeoplepage_perex.py @@ -0,0 +1,19 @@ +# Generated by Django 4.0.7 on 2022-12-07 09:59 + +from django.db import migrations +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0033_alter_mainpersonpage_position'), + ] + + operations = [ + migrations.AlterField( + model_name='mainpeoplepage', + name='perex', + field=wagtail.fields.RichTextField(), + ), + ] diff --git a/main/models.py b/main/models.py index 32e455d405253029f670c8890a45dc384a8fb50e..cf8cdcd8e5794b72a7dd3eb911e7106a769bbe79 100644 --- a/main/models.py +++ b/main/models.py @@ -563,7 +563,7 @@ class MainProgramPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin class MainPeoplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page): ### FIELDS - perex = models.TextField() + perex = RichTextField() people = StreamField( [("people_group", blocks.PeopleGroupBlock(label="Seznam osob"))], verbose_name="Lidé", diff --git a/main/templates/main/main_people_page.html b/main/templates/main/main_people_page.html index 2fad86bef0ddb60eef935095b10e0cbc134a3c03..51153351438b2ec1d51397f6bb792dc3b2f9a9e7 100644 --- a/main/templates/main/main_people_page.html +++ b/main/templates/main/main_people_page.html @@ -8,9 +8,9 @@ <main role="main" class="mb-4 xl:mb-20"> <div class="grid-container"> <div class="grid-content"> - <p class="font-condensed text-xl leading-7 mb-5"> - {{ page.perex }} - </p> + <div class="prose font-condensed text-xl leading-7 mb-5"> + {{ page.perex|richtext }} + </div> </div> </div> <div class="container--medium"> diff --git a/main/templates/main/main_program_page.html b/main/templates/main/main_program_page.html index fd06e656eb24b23512b8019fc6ce3c2595aaa012..3ff182742a11cfbbffdd08dd46e49f7c042c1bce 100644 --- a/main/templates/main/main_program_page.html +++ b/main/templates/main/main_program_page.html @@ -42,9 +42,9 @@ <h3 class="font-alt mb-4 text-4xl"> {{ item.title }} </h3> - <p class="leading-6"> + <div class="prose leading-6"> {{ item.text|richtext }} - </p> + </div> </div> </div> {% endfor %}