UI fixes

district/blocks.py

@@ -24,6 +24,7 @@ from shared.blocks import (
 from shared.blocks import (
     CardLinkBlockMixin,
     CardLinkWithHeadlineBlockMixin,
+    CarouselProgramBlock,
     PersonContactBlockMixin,
     ProgramGroupBlock,
     ProgramGroupBlockMixin,
@@ -574,6 +575,12 @@ class ProgramGroupWithCandidatesBlock(StructBlock):
             ("program_group", ProgramGroupBlock()),
             ("program_group_crossroad", ProgramGroupBlockCrossroad()),
             ("program_group_popout", ProgramGroupBlockPopout()),
+            (
+                "carousel_program",
+                CarouselProgramBlock(
+                    template="styleguide2/includes/molecules/program/program_block.html"
+                ),
+            ),
         ]
     )
 

district/migrations/0220_alter_districthomepage_content.py

+# Generated by Django 5.0.6 on 2024-06-11 08:39
+
+import shared.blocks.main
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('district', '0219_alter_districtelectioncampaignpage_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='districthomepage',
+            name='content',
+            field=wagtail.fields.StreamField([('fullscreen_header_block', wagtail.blocks.StructBlock([('desktop_image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybráno video, ukáže se na desktopu.', label='Obrázek na pozadí (desktop)', required=False)), ('mobile_image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybráno video, ukáže se na mobilu.', label='Obrázek na pozadí (mobil)', required=False)), ('desktop_video_url', 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)), ('mobile_video_url', 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)), ('desktop_line_1', wagtail.blocks.TextBlock(label='Desktop první řádek')), ('desktop_line_2', wagtail.blocks.TextBlock(label='Desktop druhý řádek', required=False)), ('mobile_line_1', wagtail.blocks.TextBlock(label='První mobilní řádek')), ('mobile_line_2', wagtail.blocks.TextBlock(label='Druhý mobilní řádek', required=False)), ('mobile_line_3', wagtail.blocks.TextBlock(label='Třetí mobilní řádek', required=False)), ('button_url', wagtail.blocks.URLBlock(help_text='Bez odkazu tlačítko nebude viditelné.', label='Odkaz tlačítka', required=False)), ('button_text', wagtail.blocks.CharBlock(label='Text tlačítka', required=False))])), ('news_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text='Nejnovější články se načtou automaticky', label='Titulek')), ('description', wagtail.blocks.TextBlock(label='Popis', required=False))], template='styleguide2/includes/organisms/articles/district/articles_section.html')), ('elections_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', required=True)), ('text_before_countdown', wagtail.blocks.CharBlock(default='Aktuálně zbývá', label='Text před odpočtem', required=True)), ('countdown_timestamp', wagtail.blocks.DateTimeBlock(label='Datum & čas voleb', required=True)), ('buttons', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', max_length=128, required=True)), ('page', wagtail.blocks.PageChooserBlock(label='Stránka', required=False)), ('link', wagtail.blocks.URLBlock(label='Odkaz', required=False))]), label='Tlačítka', required=False))])), ('people_block', wagtail.blocks.StructBlock([('title_line_1', wagtail.blocks.CharBlock(label='První řádek titulku')), ('title_line_2', wagtail.blocks.CharBlock(label='Druhý řádek titulku')), ('description', wagtail.blocks.TextBlock(label='Popis')), ('list', wagtail.blocks.ListBlock(shared.blocks.main.BoxBlock, label='Boxíky'))], template='styleguide2/includes/organisms/main_section/district/representatives_section.html')), ('calendar_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', required=False))])), ('newsletter_block', wagtail.blocks.StructBlock([]))], blank=True, verbose_name='Obsah'),
+        ),
+    ]

district/migrations/0221_alter_districthomepage_content_and_more.py

+# Generated by Django 5.0.6 on 2024-06-11 08:50
+
+import shared.blocks.main
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('district', '0220_alter_districthomepage_content'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='districthomepage',
+            name='content',
+            field=wagtail.fields.StreamField([('fullscreen_header_block', wagtail.blocks.StructBlock([('desktop_image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybráno video, ukáže se na desktopu.', label='Obrázek na pozadí (desktop)', required=False)), ('mobile_image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybráno video, ukáže se na mobilu.', label='Obrázek na pozadí (mobil)', required=False)), ('desktop_video_url', 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)), ('mobile_video_url', 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)), ('desktop_line_1', wagtail.blocks.TextBlock(label='Desktop první řádek')), ('desktop_line_2', wagtail.blocks.TextBlock(label='Desktop druhý řádek', required=False)), ('mobile_line_1', wagtail.blocks.TextBlock(label='První mobilní řádek')), ('mobile_line_2', wagtail.blocks.TextBlock(label='Druhý mobilní řádek', required=False)), ('mobile_line_3', wagtail.blocks.TextBlock(label='Třetí mobilní řádek', required=False)), ('button_url', wagtail.blocks.URLBlock(help_text='Bez odkazu tlačítko nebude viditelné.', label='Odkaz tlačítka', required=False)), ('button_text', wagtail.blocks.CharBlock(label='Text tlačítka', required=False))])), ('news_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text='Nejnovější články se načtou automaticky', label='Titulek')), ('description', wagtail.blocks.TextBlock(label='Popis', required=False))], template='styleguide2/includes/organisms/articles/district/articles_section.html')), ('elections_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', required=True)), ('text_before_countdown', wagtail.blocks.CharBlock(default='Aktuálně zbývá', label='Text před odpočtem', required=True)), ('countdown_timestamp', wagtail.blocks.DateTimeBlock(label='Datum & čas voleb', required=True)), ('buttons', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', max_length=128, required=True)), ('page', wagtail.blocks.PageChooserBlock(label='Stránka', required=False)), ('link', wagtail.blocks.URLBlock(label='Odkaz', required=False))]), label='Tlačítka', required=False))])), ('people_block', wagtail.blocks.StructBlock([('title_line_1', wagtail.blocks.CharBlock(label='První řádek titulku')), ('title_line_2', wagtail.blocks.CharBlock(label='Druhý řádek titulku')), ('description', wagtail.blocks.TextBlock(label='Popis')), ('list', wagtail.blocks.ListBlock(shared.blocks.main.BoxBlock, label='Boxíky'))], template='styleguide2/includes/organisms/main_section/district/representatives_section.html')), ('calendar_block', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek', required=False))])), ('carousel_program', wagtail.blocks.StructBlock([('label', wagtail.blocks.CharBlock(default='Program', help_text="Např. 'Program'", label='Nadpis')), ('categories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('number', wagtail.blocks.IntegerBlock(label='Číslo')), ('name', wagtail.blocks.CharBlock(label='Název')), ('points', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('content', wagtail.blocks.TextBlock(label='Obsah'))]), label='Body'))]), label='Kategorie')), ('long_version_url', 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)), ('long_version_text', wagtail.blocks.CharBlock(label='Nadpis odkazu na celou verzi programu', required=False))])), ('newsletter_block', wagtail.blocks.StructBlock([]))], blank=True, verbose_name='Obsah'),
+        ),
+        migrations.AlterField(
+            model_name='districtnewprogrampage',
+            name='program',
+            field=wagtail.fields.StreamField([('program_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text="Např. 'Krajské volby 2024', 'Evropské volby 2024', ...", label='Název programu')), ('point_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock(label='Odkaz pokrývající celou tuto část', required=False)), ('icon', wagtail.images.blocks.ImageChooserBlock(label='Ikona', required=False)), ('title', wagtail.blocks.CharBlock(label='Titulek článku programu')), ('text', wagtail.blocks.RichTextBlock(features=['h3', 'h4', 'h5', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'superscript', 'subscript', 'strikethrough', 'blockquote', 'embed'], label='Obsah'))]), label='Jednotlivé články programu'))])), ('program_group_crossroad', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text="Např. 'Krajské volby 2024', 'Evropské volby 2024', ...", label='Název programu')), ('point_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(label='Obrázek')), ('title', wagtail.blocks.CharBlock(label='Titulek', required=True)), ('text', wagtail.blocks.RichTextBlock(label='Krátký text pod nadpisem', required=False)), ('page', wagtail.blocks.PageChooserBlock(label='Stránka', page_type=['district.DistrictArticlePage', 'district.DistrictArticlesPage', 'district.DistrictCenterPage', 'district.DistrictContactPage', 'district.DistrictCrossroadPage', 'district.DistrictCustomPage', 'district.DistrictElectionCampaignPage', 'district.DistrictElectionProgramPage', 'district.DistrictPeoplePage', 'district.DistrictPersonPage', 'district.DistrictPostElectionStrategyPage', 'district.DistrictProgramPage'], required=False)), ('link', wagtail.blocks.URLBlock(label='Odkaz', required=False))]), label='Karty programu'))])), ('program_group_popout', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text="Např. 'Krajské volby 2024', 'Evropské volby 2024', ...", label='Název programu')), ('categories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock(label='Název')), ('icon', wagtail.images.blocks.ImageChooserBlock(label='Ikona', required=False)), ('description', wagtail.blocks.RichTextBlock(label='Popis', required=False)), ('point_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek vyskakovacího bloku')), ('content', wagtail.blocks.RichTextBlock(features=['h3', 'h4', 'h5', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'superscript', 'subscript', 'strikethrough', 'blockquote', 'embed'], label='Obsah')), ('guarantor', wagtail.blocks.PageChooserBlock(label='Garant', page_type=['district.DistrictPersonPage'], required=False))]), label='Jednotlivé bloky programu'))]), label='Kategorie programu'))])), ('program_group_with_candidates', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text="Např. 'Krajské volby 2024', 'Evropské volby 2024', ...", label='Název programu')), ('preamble_content', wagtail.blocks.RichTextBlock(help_text='Text, který se zobrazí před přepínačem mezi kandidáty a programem.', label='Preambule', required=False)), ('primary_candidates', wagtail.blocks.StructBlock([('candidates', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('page', wagtail.blocks.PageChooserBlock(label='Stránka', page_type=['district.DistrictPersonPage'])), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybrán, použije se obrázek ze stránky kandidáta', label='Obrázek', required=False)), ('description', wagtail.blocks.TextBlock(label='Popis'))]), label=' '))], help_text='Zobrazí se ve velkých blocích na začátku stránky.', label='Osoby na čele kandidátky')), ('secondary_candidates', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(default='Ostatní kandidátky', label='Nadpis zbytku kandidátky')), ('candidates', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('number', wagtail.blocks.CharBlock(label='Číslo')), ('page', wagtail.blocks.PageChooserBlock(label='Stránka', page_type=['district.DistrictPersonPage'])), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Pokud není vybrán, použije se obrázek ze stránky kandidáta', label='Obrázek', required=False))]), label='Zbylí kandidáti na listině'))], help_text='Zobrazí se v kompaktním seznamu pod čelem kandidátky.', label='Ostatní osoby na kandidátce')), ('program', wagtail.blocks.StreamBlock([('program_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text="Např. 'Krajské volby 2024', 'Evropské volby 2024', ...", label='Název programu')), ('point_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock(label='Odkaz pokrývající celou tuto část', required=False)), ('icon', wagtail.images.blocks.ImageChooserBlock(label='Ikona', required=False)), ('title', wagtail.blocks.CharBlock(label='Titulek článku programu')), ('text', wagtail.blocks.RichTextBlock(features=['h3', 'h4', 'h5', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'superscript', 'subscript', 'strikethrough', 'blockquote', 'embed'], label='Obsah'))]), label='Jednotlivé články programu'))])), ('program_group_crossroad', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text="Např. 'Krajské volby 2024', 'Evropské volby 2024', ...", label='Název programu')), ('point_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(label='Obrázek')), ('title', wagtail.blocks.CharBlock(label='Titulek', required=True)), ('text', wagtail.blocks.RichTextBlock(label='Krátký text pod nadpisem', required=False)), ('page', wagtail.blocks.PageChooserBlock(label='Stránka', page_type=['district.DistrictArticlePage', 'district.DistrictArticlesPage', 'district.DistrictCenterPage', 'district.DistrictContactPage', 'district.DistrictCrossroadPage', 'district.DistrictCustomPage', 'district.DistrictElectionCampaignPage', 'district.DistrictElectionProgramPage', 'district.DistrictPeoplePage', 'district.DistrictPersonPage', 'district.DistrictPostElectionStrategyPage', 'district.DistrictProgramPage'], required=False)), ('link', wagtail.blocks.URLBlock(label='Odkaz', required=False))]), label='Karty programu'))])), ('program_group_popout', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(help_text="Např. 'Krajské volby 2024', 'Evropské volby 2024', ...", label='Název programu')), ('categories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock(label='Název')), ('icon', wagtail.images.blocks.ImageChooserBlock(label='Ikona', required=False)), ('description', wagtail.blocks.RichTextBlock(label='Popis', required=False)), ('point_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek vyskakovacího bloku')), ('content', wagtail.blocks.RichTextBlock(features=['h3', 'h4', 'h5', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'superscript', 'subscript', 'strikethrough', 'blockquote', 'embed'], label='Obsah')), ('guarantor', wagtail.blocks.PageChooserBlock(label='Garant', page_type=['district.DistrictPersonPage'], required=False))]), label='Jednotlivé bloky programu'))]), label='Kategorie programu'))])), ('carousel_program', wagtail.blocks.StructBlock([('label', wagtail.blocks.CharBlock(default='Program', help_text="Např. 'Program'", label='Nadpis')), ('categories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('number', wagtail.blocks.IntegerBlock(label='Číslo')), ('name', wagtail.blocks.CharBlock(label='Název')), ('points', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('content', wagtail.blocks.TextBlock(label='Obsah'))]), label='Body'))]), label='Kategorie')), ('long_version_url', 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)), ('long_version_text', wagtail.blocks.CharBlock(label='Nadpis odkazu na celou verzi programu', required=False))], template='styleguide2/includes/molecules/program/program_block.html'))]))]))], blank=True, verbose_name='Programy'),
+        ),
+    ]

district/migrations/0222_districtsearchpage.py

+# Generated by Django 5.0.6 on 2024-06-11 09:23
+
+import django.db.models.deletion
+import shared.models.main
+import wagtailmetadata.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('district', '0221_alter_districthomepage_content_and_more'),
+        ('wagtailcore', '0093_uploadedfile'),
+        ('wagtailimages', '0026_delete_uploadedimage'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DistrictSearchPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                ('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Search image')),
+            ],
+            options={
+                'verbose_name': 'Vyhledávací stránka',
+                'abstract': False,
+            },
+            bases=(shared.models.main.SubpageMixin, wagtailmetadata.models.WagtailImageMetadataMixin, 'wagtailcore.page', models.Model),
+        ),
+    ]

district/models.py

@@ -30,6 +30,7 @@ from maps_utils.validation import validators as maps_validators
 from shared.blocks import (
     DEFAULT_CONTENT_BLOCKS,
     ButtonGroupBlock,
+    CarouselProgramBlock,
     ChartBlock,
     NewsBlock,
     NewsletterSubscriptionBlock,
@@ -47,6 +48,7 @@ from shared.models import (
     MainPersonPageMixin,
     MainProgramPageMixin,
     MainSimplePageMixin,
+    MainSearchPageMixin,
     PageInMenuMixin,
     PdfPageMixin,
     SharedTaggedDistrictArticle,
@@ -64,9 +66,6 @@ CONTENT_BLOCKS = DEFAULT_CONTENT_BLOCKS + [
 ]
 
 
-# --- BEGIN Migrated models ---
-
-
 class DistrictHomePage(CalendarMixin, MainHomePageMixin):
     ### FIELDS
 
@@ -90,6 +89,7 @@ class DistrictHomePage(CalendarMixin, MainHomePageMixin):
                 ),
             ),
             ("calendar_block", blocks.CalendarBlock()),
+            ("carousel_program", CarouselProgramBlock()),
             ("newsletter_block", blocks.NewsletterBlock()),
         ],
         verbose_name="Obsah",
@@ -192,6 +192,7 @@ class DistrictHomePage(CalendarMixin, MainHomePageMixin):
         "district.DistrictCalendarPage",
         "district.DistrictPdfPage",
         "district.DistrictNewProgramPage",
+        "district.DistrictSearchPage",
     ]
 
     ### OTHERS
@@ -209,7 +210,7 @@ class DistrictHomePage(CalendarMixin, MainHomePageMixin):
 
     @property
     def search_page_model(self):
-        return DistrictArticlePage
+        return DistrictSearchPage
 
     @property
     def people_page_model(self):
@@ -627,6 +628,12 @@ class DistrictCrossroadPage(
         verbose_name = "Rozcestník s kartami"
 
 
+class DistrictSearchPage(MainSearchPageMixin):
+    ### RELATIONS
+
+    parent_page_types = ["district.DistrictHomePage"]
+
+
 class DistrictCustomPage(MainSimplePageMixin):
     ### FIELDS
 
@@ -664,9 +671,6 @@ class DistrictCustomPage(MainSimplePageMixin):
     subpage_types = []
 
 
-# --- END Migrated models ---
-
-
 class DistrictGeoFeatureCollectionPage(
     ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page
 ):

district/templates/district/district_new_program_page.html

 {% extends "styleguide2/program_page.html" %}
+
+{% block navbar %}
+  {% include 'styleguide2/includes/organisms/layout/district/navbar.html' with selected_item=page.get_menu_title %}
+{% endblock %}
\ No newline at end of file

district/templates/district/district_search_page.html

+{% extends "styleguide2/search_page.html" %}
+
+{% block navbar %}
+  {% include 'styleguide2/includes/organisms/layout/district/navbar.html' with selected_item=page.get_menu_title %}
+{% endblock %}
\ No newline at end of file

elections/blocks.py

 from wagtail.blocks import (
     CharBlock,
-    IntegerBlock,
     ListBlock,
     PageChooserBlock,
     StructBlock,
@@ -82,46 +81,6 @@ class CalendarBlock(StructBlock):
         label = "Kalendář"
 
 
-class ProgramCategoryItemBlock(StructBlock):
-    content = TextBlock(label="Obsah")
-
-    class Meta:
-        icon = "form"
-        label = "Bod"
-
-
-class ProgramCategoryBlock(StructBlock):
-    number = IntegerBlock(label="Číslo")
-
-    name = CharBlock(label="Název")
-
-    points = ListBlock(ProgramCategoryItemBlock(), label="Body")
-
-    class Meta:
-        icon = "form"
-        label = "Kategorie"
-
-
-class ProgramBlock(StructBlock):
-    label = CharBlock(label="Nadpis", help_text="Např. 'Program'", default="Program")
-
-    categories = ListBlock(ProgramCategoryBlock(), label="Kategorie")
-
-    long_version_url = URLBlock(
-        label="Odkaz na celou verzi programu",
-        help_text="Pro zobrazení odkazu na celou verzi programu musí být obě následující pole vyplněná.",
-        required=False,
-    )
-    long_version_text = CharBlock(
-        label="Nadpis odkazu na celou verzi programu", required=False
-    )
-
-    class Meta:
-        icon = "form"
-        label = "Vyskakovací program"
-        template = "styleguide2/includes/molecules/program/card_program.html"
-
-
 class PersonFaqAnswerBlock(StructBlock):
     question = CharBlock(label="Otázka")
 

elections/models.py

@@ -40,7 +40,7 @@ class ElectionsHomePage(MainHomePageMixin, CalendarMixin):
             ("carousel", blocks.ElectionsCarouselBlock()),
             ("candidates", blocks.CandidateListBlock()),
             ("secondary_candidates", blocks.CandidateSecondaryListBlock()),
-            ("program", blocks.ProgramBlock()),
+            ("program", shared_blocks.CarouselProgramBlock()),
             (
                 "news",
                 shared_blocks.NewsBlock(

shared/blocks/main.py

 from django.utils.text import slugify
 from wagtail.blocks import (
     CharBlock,
+    IntegerBlock,
     ListBlock,
     PageChooserBlock,
     RichTextBlock,
@@ -371,3 +372,43 @@ class CandidateSecondaryListBlock(StructBlock):
         )
         icon = "form"
         label = "Sekundární seznam kandidátů"
+
+
+class CarouselProgramCategoryItemBlock(StructBlock):
+    content = TextBlock(label="Obsah")
+
+    class Meta:
+        icon = "form"
+        label = "Bod"
+
+
+class CarouselProgramCategoryBlock(StructBlock):
+    number = IntegerBlock(label="Číslo")
+
+    name = CharBlock(label="Název")
+
+    points = ListBlock(CarouselProgramCategoryItemBlock(), label="Body")
+
+    class Meta:
+        icon = "form"
+        label = "Kategorie"
+
+
+class CarouselProgramBlock(StructBlock):
+    label = CharBlock(label="Nadpis", help_text="Např. 'Program'", default="Program")
+
+    categories = ListBlock(CarouselProgramCategoryBlock(), label="Kategorie")
+
+    long_version_url = URLBlock(
+        label="Odkaz na celou verzi programu",
+        help_text="Pro zobrazení odkazu na celou verzi programu musí být obě následující pole vyplněná.",
+        required=False,
+    )
+    long_version_text = CharBlock(
+        label="Nadpis odkazu na celou verzi programu", required=False
+    )
+
+    class Meta:
+        icon = "form"
+        label = "Priority programu, carousel"
+        template = "styleguide2/includes/molecules/program/card_program.html"

shared/models/main.py

@@ -240,22 +240,33 @@ class SocialMixin(Page):
 
 
 class PageInMenuMixin(Page):
-    def get_menu_title(self) -> str:
-        for menu in self.root_page.menu:
+    def get_menu_title(self, parent_instance=None) -> str:
+        instance = (
+            self
+            if parent_instance is None
+            else parent_instance
+        )
+
+        for menu in instance.root_page.menu:
             if menu.block_type == "menu_item":
                 if menu.value["page"] is None:
                     continue
 
-                if menu.value["page"].id == self.id:
+                if menu.value["page"].id == instance.id:
                     return menu.value["title"]
             elif menu.block_type == "menu_parent":
                 for item in menu.value["menu_items"]:
                     if item["page"] is None:
                         continue
 
-                    if item["page"].id == self.id:
+                    if item["page"].id == instance.id:
                         return menu.value["title"]
 
+        parent = instance.get_parent().specific
+
+        if parent:
+            return self.get_menu_title(parent)
+
         return self.title
 
     class Meta:

shared/templates/styleguide2/includes/molecules/program/program_block.html

@@ -38,6 +38,18 @@
   >
     {% include 'styleguide2/includes/organisms/popouts/popout_list.html' with categories=self.categories %}
   </div>
+{% elif block_type == "carousel_program" %}
+  <div
+    class="
+      mb-12 xl:mb-20
+
+      {% if not is_descendant %}
+        mt-20
+      {% endif %}
+    "
+  >
+   {% include 'styleguide2/includes/molecules/program/card_program.html' %}
+  </div>
 {% elif block_type == 'program_group_crossroad' %}
   <div
     class="

shared/templates/styleguide2/includes/organisms/header/elections/simple_header_with_ui_switch.html

@@ -8,7 +8,11 @@
     "
   >
     <ui-horizontal-scrollable
-      classes="switch overflow-x-scroll flex gap-2 w-[calc(100vw_-_3rem)] lg:w-[unset]"
+      classes="
+        switch overflow-x-scroll flex gap-x-2 gap-y-1 w-[calc(100vw_-_3rem)]
+
+        lg:overflow-x-hidden lg:flex-wrap lg:w-[unset]
+      "
       scroller-classes="!text-black"
       arrow-position="bottom"
     >

shared/templates/styleguide2/includes/organisms/header/people_header.html

 {% extends 'styleguide2/includes/organisms/header/simple_header_with_ui_switch.html' %}
 
 {% block classes %}
-  bg-black flex items-center w-full mb-20 pt-28 pb-8
+  bg-black flex items-center w-full pt-28 pb-8 mb-20
 
-  xl:pt-32 xl:pb-16
+  xl:pt-48 xl:pb-10
 {% endblock %}
 
 {% block description %}

shared/templates/styleguide2/includes/organisms/header/simple_header_with_ui_switch.html

@@ -10,7 +10,11 @@
     "
   >
     <ui-horizontal-scrollable
-      classes="switch overflow-x-scroll flex gap-2 w-[calc(100vw_-_3rem)] lg:w-[unset]"
+      classes="
+        switch overflow-x-scroll flex gap-x-2 gap-y-1 w-[calc(100vw_-_3rem)]
+
+        lg:overflow-x-hidden lg:flex-wrap lg:w-[unset]
+      "
       arrow-position="bottom"
     >
       {% block switch %}

shared/templates/styleguide2/program_page.html

@@ -3,7 +3,9 @@
 {% load wagtailcore_tags %}
 
 {% block content %}
+  {% block navbar %}
     {% include 'styleguide2/includes/organisms/layout/navbar.html' with selected_item=page.get_menu_title %}
+  {% endblock %}
 
   <div class="__js-root">
     <ui-view-provider

shared/templates/styleguide2/search_page.html

@@ -3,7 +3,10 @@
 
 {% block content %}
 
+{% block navbar %}
   {% include 'styleguide2/includes/organisms/layout/navbar.html' %}
+{% endblock %}
+
 {% include 'styleguide2/includes/organisms/header/simple_header.html' with title=page.title %}
 
 <main role="main" class="mb-10 xl:mb-32">