diff --git a/district/blocks.py b/district/blocks.py
index 4a84126b2ca32f329c577087a0a0f0bcf6962575..436cc2f07fdd283570a02220e47471e3e47aff87 100644
--- a/district/blocks.py
+++ b/district/blocks.py
@@ -1,3 +1,4 @@
+from django.db import models
from django.forms.utils import ErrorList
from wagtail.core import blocks
from wagtail.core.blocks import (
@@ -16,8 +17,6 @@ from wagtail.images.blocks import ImageChooserBlock
from shared.blocks import ButtonBlock, ProgramItemBlock
-from django.db import models
-
class AddressBlock(StructBlock):
title = CharBlock(label="Titulek", required=True)
@@ -151,7 +150,7 @@ class HomepageHeaderBlock(StructBlock):
class HomepageSimpleHeaderBlock(StructBlock):
- title = CharBlock(label="Titulek", required=True)
+ title = CharBlock(label="Titulek", required=False)
subtitle = CharBlock(label="Podtitulek", required=False)
image = ImageChooserBlock()
@@ -207,34 +206,34 @@ class InteractiveProgramItemBlock(StructBlock):
class InteractiveProgramBlock(StructBlock):
name = CharBlock(label="Název části programu", required=True)
-
+
heading = CharBlock(label="Nadpis", required=True)
description = RichTextBlock(
- label="Krátký popis, BEZ BODŮ",
- required=False,
- blank=True
+ label="Krátký popis, BEZ BODŮ", required=False, blank=True
)
-
+
icon = blocks.ChoiceBlock(
label="Ikona",
required=True,
choices=[
- ("verejne-sluzby", "Veřejné služby"),
- ("zdravotni-pece", "Zdravotní péče"),
- ("sport", "Sport"),
- ("socialni-politika", "Sociální politika"),
- ("aktivni-verejnost", "Aktivní veřejnost"),
- ("priroda", "Příroda"),
- ("vzdelavani", "Vzdělávání"),
- ("kultura", "Kultura"),
- ("otevrena-radnice", "Otevřená radnice"),
- ("cestovni-ruch", "Cestovní ruch"),
- ("doprava", "Doprava"),
- ("bydleni", "Bydlení")
- ]
+ ("verejne-sluzby", "Veřejné služby"),
+ ("zdravotni-pece", "Zdravotní péče"),
+ ("sport", "Sport"),
+ ("socialni-politika", "Sociální politika"),
+ ("aktivni-verejnost", "Aktivní veřejnost"),
+ ("priroda", "Příroda"),
+ ("vzdelavani", "Vzdělávání"),
+ ("kultura", "Kultura"),
+ ("otevrena-radnice", "Otevřená radnice"),
+ ("cestovni-ruch", "Cestovní ruch"),
+ ("doprava", "Doprava"),
+ ("bydleni", "Bydlení"),
+ ],
+ )
+
+ program_items = ListBlock(
+ InteractiveProgramItemBlock(), label="Seznam bodů", required=True
)
-
- program_items = ListBlock(InteractiveProgramItemBlock(), label="Seznam bodů", required=True)
class Meta:
template = "district/blocks/interactive_program_block.html"
diff --git a/district/migrations/0093_alter_districthomepage_subheader.py b/district/migrations/0093_alter_districthomepage_subheader.py
new file mode 100644
index 0000000000000000000000000000000000000000..44c431435b3ea41b09e0b83890f680068c73fda3
--- /dev/null
+++ b/district/migrations/0093_alter_districthomepage_subheader.py
@@ -0,0 +1,191 @@
+# Generated by Django 4.0.4 on 2022-07-13 10:40
+
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("district", "0092_districtinteractiveprogrampage"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="districthomepage",
+ name="subheader",
+ field=wagtail.core.fields.StreamField(
+ [
+ (
+ "header_full_size",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ label="Titulek", required=True
+ ),
+ ),
+ (
+ "image_background",
+ wagtail.images.blocks.ImageChooserBlock(
+ label="Obrázek v pozadí", required=True
+ ),
+ ),
+ (
+ "image_foreground",
+ wagtail.images.blocks.ImageChooserBlock(
+ label="Obrázek v popředí", required=False
+ ),
+ ),
+ (
+ "button_group",
+ wagtail.core.blocks.ListBlock(
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ label="Titulek",
+ max_length=128,
+ required=True,
+ ),
+ ),
+ (
+ "icon",
+ wagtail.core.blocks.CharBlock(
+ help_text="Identifikátor ikonky ze styleguide (https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons), např. ico--key.",
+ label="Ikonka",
+ max_length=128,
+ required=False,
+ ),
+ ),
+ (
+ "size",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("sm", "Malá"),
+ ("base", "Střední"),
+ ("lg", "Velká"),
+ ],
+ label="Velikost",
+ ),
+ ),
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black", "Černá"),
+ ("white", "Bílá"),
+ ("grey-125", "Světle šedá"),
+ ("blue-300", "Modrá"),
+ ("cyan-200", "Tyrkysová"),
+ ("green-400", "Zelené"),
+ ("violet-400", "Vínová"),
+ ("red-600", "Červená"),
+ ],
+ label="Barva",
+ ),
+ ),
+ (
+ "hoveractive",
+ wagtail.core.blocks.BooleanBlock(
+ default=True,
+ help_text="Pokud je zapnuto, tlačítko mění barvu, když na něj uživatel najede myší.",
+ label="Animovat na hover",
+ required=False,
+ ),
+ ),
+ (
+ "mobile_fullwidth",
+ wagtail.core.blocks.BooleanBlock(
+ default=True,
+ help_text="Pokud je zapnuto, tlačítko se na mobilních zařízeních roztáhne na plnou šířku.",
+ label="Plná šířka na mobilních zařízeních",
+ required=False,
+ ),
+ ),
+ (
+ "page",
+ wagtail.core.blocks.PageChooserBlock(
+ label="Stránka", required=False
+ ),
+ ),
+ (
+ "link",
+ wagtail.core.blocks.URLBlock(
+ label="Odkaz", required=False
+ ),
+ ),
+ (
+ "align",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("auto", "Automaticky"),
+ ("center", "Na střed"),
+ ],
+ label="Zarovnání",
+ ),
+ ),
+ ]
+ ),
+ label="Tlačítka",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "header_simple",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ label="Titulek", required=False
+ ),
+ ),
+ (
+ "subtitle",
+ wagtail.core.blocks.CharBlock(
+ label="Podtitulek", required=False
+ ),
+ ),
+ ("image", wagtail.images.blocks.ImageChooserBlock()),
+ ]
+ ),
+ ),
+ (
+ "header",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ help_text="Nap", label="Titulek", required=False
+ ),
+ ),
+ ("image", wagtail.images.blocks.ImageChooserBlock()),
+ (
+ "button_text",
+ wagtail.core.blocks.CharBlock(
+ label="Text tlačítka", required=False
+ ),
+ ),
+ (
+ "button_link",
+ wagtail.core.blocks.URLBlock(
+ label="Odkaz tlačítka", required=False
+ ),
+ ),
+ ]
+ ),
+ ),
+ ],
+ blank=True,
+ verbose_name="Blok pod headerem",
+ ),
+ ),
+ ]
diff --git a/district/templates/district/blocks/homepage_simple_header_block.html b/district/templates/district/blocks/homepage_simple_header_block.html
index d12d84f2d2320027054ce7116dae29a83b94b276..ff20022b9b513e6f6c833f843b456182c054a751 100644
--- a/district/templates/district/blocks/homepage_simple_header_block.html
+++ b/district/templates/district/blocks/homepage_simple_header_block.html
@@ -4,11 +4,15 @@
<header class="hero hero--image hero--condensed" style="--image-url: url({{ img.full_url }})"
>
<div class="container container--default">
- <h1 class="head-alt-lg md:head-alt-xl text-shadow-lg max-w-2xl ">
- {{ self.title }}
- </h1>
- <h2 class="head-xs mt-2 text-shadow-lg">
- {{ self.subtitle }}
- </h2>
+ {% if self.title %}
+ <h1 class="head-alt-lg md:head-alt-xl text-shadow-lg max-w-2xl ">
+ {{ self.title }}
+ </h1>
+ {% endif %}
+ {% if self.subtitle %}
+ <h2 class="head-xs mt-2 text-shadow-lg">
+ {{ self.subtitle }}
+ </h2>
+ {% endif %}
</div>
</header>