diff --git a/district/migrations/0307_alter_districthomepage_content.py b/district/migrations/0307_alter_districthomepage_content.py new file mode 100644 index 0000000000000000000000000000000000000000..2146096b23e2170d4bc35280f59353aeb7d68bb8 --- /dev/null +++ b/district/migrations/0307_alter_districthomepage_content.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0.7 on 2025-02-10 11:09 + +import shared.blocks.children.misc +import wagtail.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('district', '0306_remove_districthomepage_menu_button_name_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='districthomepage', + name='content', + field=wagtail.fields.StreamField([('fullscreen_header_block', 11), ('news_block', 14), ('elections_block', 23), ('people_block', 27), ('calendar_block', 30), ('carousel_program', 41), ('newsletter_block', 42)], blank=True, block_lookup={0: ('wagtail.images.blocks.ImageChooserBlock', (), {'help_text': 'Pokud nenĂ vybráno video, ukáže se na desktopu.', 'label': 'Obrázek na pozadĂ (desktop)', 'required': False}), 1: ('wagtail.images.blocks.ImageChooserBlock', (), {'help_text': 'Pokud nenĂ vybráno video, ukáže se na mobilu.', 'label': 'Obrázek na pozadĂ (mobil)', 'required': False}), 2: ('wagtail.blocks.URLBlock', (), {'help_text': 'Pokud je vybráno, ukáže se na desktopech s povolenĂ˝m autoplayem mĂsto obrázku.', 'label': 'Video (desktop)', 'required': False}), 3: ('wagtail.blocks.URLBlock', (), {'help_text': 'Pokud je vybráno, ukáže se na mobilech s povolenĂ˝m autoplayem mĂsto obrázku.', 'label': 'Video (mobil)', 'required': False}), 4: ('wagtail.blocks.TextBlock', (), {'label': 'Desktop prvnà řádek', 'required': False}), 5: ('wagtail.blocks.TextBlock', (), {'label': 'Desktop druhĂ˝ řádek', 'required': False}), 6: ('wagtail.blocks.TextBlock', (), {'label': 'PrvnĂ mobilnà řádek', 'required': False}), 7: ('wagtail.blocks.TextBlock', (), {'label': 'DruhĂ˝ mobilnà řádek', 'required': False}), 8: ('wagtail.blocks.TextBlock', (), {'label': 'TĹ™etĂ mobilnà řádek', 'required': False}), 9: ('wagtail.blocks.URLBlock', (), {'help_text': 'Bez odkazu tlaÄŤĂtko nebude viditelnĂ©.', 'label': 'Odkaz tlaÄŤĂtka', 'required': False}), 10: ('wagtail.blocks.CharBlock', (), {'help_text': 'Odkaz funguje i bez tlaÄŤĂtka. Pokud chceš tlaÄŤĂtko skrĂ˝t, nevyplĹuj text.', 'label': 'Text tlaÄŤĂtka', 'required': False}), 11: ('wagtail.blocks.StructBlock', [[('desktop_image', 0), ('mobile_image', 1), ('desktop_video_url', 2), ('mobile_video_url', 3), ('desktop_line_1', 4), ('desktop_line_2', 5), ('mobile_line_1', 6), ('mobile_line_2', 7), ('mobile_line_3', 8), ('button_url', 9), ('button_text', 10)]], {}), 12: ('wagtail.blocks.CharBlock', (), {'help_text': 'NejnovÄ›jšà články se naÄŤtou automaticky', 'label': 'Titulek'}), 13: ('wagtail.blocks.TextBlock', (), {'label': 'Popis', 'required': False}), 14: ('wagtail.blocks.StructBlock', [[('title', 12), ('description', 13)]], {'template': 'styleguide2/includes/organisms/articles/district/articles_section.html'}), 15: ('wagtail.blocks.CharBlock', (), {'label': 'Titulek', 'required': True}), 16: ('wagtail.blocks.CharBlock', (), {'default': 'AktuálnÄ› zbĂ˝vá', 'label': 'Text pĹ™ed odpoÄŤtem', 'required': True}), 17: ('wagtail.blocks.DateTimeBlock', (), {'label': 'Datum & ÄŤas voleb', 'required': True}), 18: ('wagtail.blocks.CharBlock', (), {'label': 'Titulek', 'max_length': 128, 'required': True}), 19: ('wagtail.blocks.PageChooserBlock', (), {'label': 'Stránka', 'required': False}), 20: ('wagtail.blocks.URLBlock', (), {'label': 'Odkaz', 'required': False}), 21: ('wagtail.blocks.StructBlock', [[('title', 18), ('page', 19), ('link', 20)]], {}), 22: ('wagtail.blocks.ListBlock', (21,), {'label': 'TlaÄŤĂtka', 'required': False}), 23: ('wagtail.blocks.StructBlock', [[('title', 15), ('text_before_countdown', 16), ('countdown_timestamp', 17), ('buttons', 22)]], {}), 24: ('wagtail.blocks.CharBlock', (), {'label': 'Prvnà řádek titulku'}), 25: ('wagtail.blocks.CharBlock', (), {'label': 'DruhĂ˝ řádek titulku', 'required': False}), 26: ('wagtail.blocks.ListBlock', (shared.blocks.children.misc.PersonBoxBlock,), {'label': 'BoxĂky'}), 27: ('wagtail.blocks.StructBlock', [[('title_line_1', 24), ('title_line_2', 25), ('description', 13), ('list', 26)]], {'template': 'styleguide2/includes/organisms/main_section/district/representatives_section.html'}), 28: ('wagtail.blocks.CharBlock', (), {'label': 'Titulek', 'required': False}), 29: ('wagtail.blocks.static_block.StaticBlock', (), {'admin_text': 'Adresa kalendáře se zadává v nastavenĂ hlavnĂ stránky webu', 'label': 'Volba kalendáře'}), 30: ('wagtail.blocks.StructBlock', [[('title', 28), ('info', 29)]], {}), 31: ('wagtail.blocks.CharBlock', (), {'default': 'Program', 'help_text': "NapĹ™. 'Program'", 'label': 'Nadpis'}), 32: ('wagtail.blocks.IntegerBlock', (), {'label': 'ÄŚĂslo'}), 33: ('wagtail.blocks.CharBlock', (), {'label': 'Název'}), 34: ('wagtail.blocks.TextBlock', (), {'label': 'Obsah'}), 35: ('wagtail.blocks.StructBlock', [[('content', 34)]], {}), 36: ('wagtail.blocks.ListBlock', (35,), {'label': 'Body'}), 37: ('wagtail.blocks.StructBlock', [[('number', 32), ('name', 33), ('points', 36)]], {}), 38: ('wagtail.blocks.ListBlock', (37,), {'label': 'Kategorie'}), 39: ('wagtail.blocks.URLBlock', (), {'help_text': 'Pro zobrazenĂ odkazu na celou verzi programu musĂ bĂ˝t obÄ› následujĂcĂ pole vyplnÄ›ná.', 'label': 'Odkaz na celou verzi programu', 'required': False}), 40: ('wagtail.blocks.CharBlock', (), {'label': 'Nadpis odkazu na celou verzi programu', 'required': False}), 41: ('wagtail.blocks.StructBlock', [[('label', 31), ('categories', 38), ('long_version_url', 39), ('long_version_text', 40)]], {}), 42: ('wagtail.blocks.StructBlock', [[]], {})}, verbose_name='Obsah'), + ), + ] diff --git a/district/static/district/css/district_custom_admin.css b/district/static/district/css/district_custom_admin.css index 129b728be8918e40f11a6916a49407fea4530409..4289cff9fca84e679825652aacdf873724889202 100644 --- a/district/static/district/css/district_custom_admin.css +++ b/district/static/district/css/district_custom_admin.css @@ -1,4 +1,4 @@ div:not(:first-child) > .c-sf-add-button[title="Insert a block"][aria-expanded="false"] { margin-top: 50px!important; margin-bottom: 50px!important; -} \ No newline at end of file +} diff --git a/main/migrations/0145_alter_mainhomepage_content.py b/main/migrations/0145_alter_mainhomepage_content.py new file mode 100644 index 0000000000000000000000000000000000000000..d248c9362cbfb084e724d182f93ca16396b44cc1 --- /dev/null +++ b/main/migrations/0145_alter_mainhomepage_content.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0.7 on 2025-02-10 11:09 + +import shared.blocks.children.misc +import wagtail.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0144_alter_maincareerpage_employment_relationship'), + ] + + operations = [ + migrations.AlterField( + model_name='mainhomepage', + name='content', + field=wagtail.fields.StreamField([('carousel', 9), ('news', 12), ('people', 16), ('regions', 18), ('boxes', 26)], blank=True, block_lookup={0: ('wagtail.blocks.TextBlock', (), {'label': 'Desktop prvnà řádek'}), 1: ('wagtail.blocks.TextBlock', (), {'label': 'Desktop druhĂ˝ řádek'}), 2: ('wagtail.blocks.TextBlock', (), {'label': 'PrvnĂ mobilnà řádek'}), 3: ('wagtail.blocks.TextBlock', (), {'label': 'DruhĂ˝ mobilnà řádek'}), 4: ('wagtail.blocks.TextBlock', (), {'label': 'TĹ™etĂ mobilnà řádek'}), 5: ('wagtail.images.blocks.ImageChooserBlock', (), {'label': 'Obrázek nahrazujĂcĂ animaci (desktop)', 'required': False}), 6: ('wagtail.images.blocks.ImageChooserBlock', (), {'label': 'Obrázek nahrazujĂcĂ animaci (mobil / tablet)', 'required': False}), 7: ('wagtail.blocks.URLBlock', (), {'help_text': 'Bez odkazu tlaÄŤĂtko nebude viditelnĂ©.', 'label': 'Odkaz tlaÄŤĂtka', 'required': False}), 8: ('wagtail.blocks.CharBlock', (), {'help_text': 'Odkaz funguje i bez tlaÄŤĂtka. Pokud chceš tlaÄŤĂtko skrĂ˝t, nevyplĹuj text.', 'label': 'Text tlaÄŤĂtka', 'required': False}), 9: ('wagtail.blocks.StructBlock', [[('desktop_line_1', 0), ('desktop_line_2', 1), ('mobile_line_1', 2), ('mobile_line_2', 3), ('mobile_line_3', 4), ('desktop_image', 5), ('mobile_image', 6), ('button_url', 7), ('button_text', 8)]], {}), 10: ('wagtail.blocks.CharBlock', (), {'help_text': 'NejnovÄ›jšà články se naÄŤtou automaticky', 'label': 'Titulek'}), 11: ('wagtail.blocks.TextBlock', (), {'label': 'Popis', 'required': False}), 12: ('wagtail.blocks.StructBlock', [[('title', 10), ('description', 11)]], {'template': 'styleguide2/includes/organisms/articles/articles_section.html'}), 13: ('wagtail.blocks.CharBlock', (), {'label': 'Prvnà řádek titulku'}), 14: ('wagtail.blocks.CharBlock', (), {'label': 'DruhĂ˝ řádek titulku', 'required': False}), 15: ('wagtail.blocks.ListBlock', (shared.blocks.children.misc.PersonBoxBlock,), {'label': 'BoxĂky'}), 16: ('wagtail.blocks.StructBlock', [[('title_line_1', 13), ('title_line_2', 14), ('description', 11), ('list', 15)]], {}), 17: ('wagtail.blocks.CharBlock', (), {'help_text': 'ÄŚlánky pro regiony se naÄŤtou automaticky', 'label': 'Titulek'}), 18: ('wagtail.blocks.StructBlock', [[('title', 17)]], {}), 19: ('wagtail.blocks.CharBlock', (), {'label': 'Nadpis'}), 20: ('wagtail.blocks.URLBlock', (), {'label': 'Odkaz tlaÄŤĂtka'}), 21: ('wagtail.blocks.CharBlock', (), {'label': 'Text tlaÄŤĂtka'}), 22: ('wagtail.images.blocks.ImageChooserBlock', (), {'label': 'Logo/obrázek'}), 23: ('wagtail.blocks.StructBlock', [[('button_link', 20), ('button_text', 21), ('title', 19), ('image', 22)]], {}), 24: ('wagtail.blocks.ListBlock', (23,), {'label': 'BoxĂky'}), 25: ('wagtail.images.blocks.ImageChooserBlock', (), {'label': 'Obrázek pozadĂ', 'required': False}), 26: ('wagtail.blocks.StructBlock', [[('title', 19), ('list', 24), ('image', 25)]], {})}, verbose_name='HlavnĂ obsah'), + ), + ] diff --git a/shared/blocks/parents/struct.py b/shared/blocks/parents/struct.py index 6641177b260118d49438a6f825217bcb392119af..a2d15d8be9aff9dda51b9099227c6a8f8682f8e3 100644 --- a/shared/blocks/parents/struct.py +++ b/shared/blocks/parents/struct.py @@ -75,9 +75,9 @@ class FlipCardsBlock(StructBlock): class PeopleOverviewBlock(StructBlock): title_line_1 = CharBlock(label="Prvnà řádek titulku") - title_line_2 = CharBlock(label="DruhĂ˝ řádek titulku") + title_line_2 = CharBlock(label="DruhĂ˝ řádek titulku", required=False) - description = TextBlock(label="Popis") + description = TextBlock(label="Popis", required=False) list = ListBlock(PersonBoxBlock, label="BoxĂky") diff --git a/shared/templates/styleguide2/includes/organisms/main_section/representatives_section.html b/shared/templates/styleguide2/includes/organisms/main_section/representatives_section.html index 8079141510c029b413e6c305f6317b8a3ce0ccaf..90e27f930617f07f3b0f1675329eacf38a770ded 100644 --- a/shared/templates/styleguide2/includes/organisms/main_section/representatives_section.html +++ b/shared/templates/styleguide2/includes/organisms/main_section/representatives_section.html @@ -26,12 +26,16 @@ <div class="xl:hidden block pt-24 pb-12"> <h2 class="head-14xl"> {{ self.title_line_1 }} - {{ self.title_line_2 }} + {% if self.title_line_2 %} + {{ self.title_line_2 }} + {% endif %} </h2> - <p> - {{ self.description }} - </p> + {% if self.description %} + <p> + {{ self.description }} + </p> + {% endif %} </div> <ui-horizontal-scrollable