From 64c71aae1713fda4ba9461b61bb975e18b185af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Fri, 30 Dec 2022 14:16:49 +0100
Subject: [PATCH] don't require program point icons
---
main/blocks.py | 5 ++++-
.../0039_alter_mainprogrampage_program.py | 21 +++++++++++++++++++
main/templates/main/main_program_page.html | 9 ++++----
3 files changed, 30 insertions(+), 5 deletions(-)
create mode 100644 main/migrations/0039_alter_mainprogrampage_program.py
diff --git a/main/blocks.py b/main/blocks.py
index 76b73be5..ea4246d5 100644
--- a/main/blocks.py
+++ b/main/blocks.py
@@ -116,7 +116,10 @@ class ProgramBlock(StructBlock):
label="Odkaz pokrývající celou tuto část",
required=False,
)
- icon = ImageChooserBlock(label="Ikona")
+ icon = ImageChooserBlock(
+ label="Ikona",
+ required=False,
+ )
title = CharBlock(label="Titulek článku programu")
text = RichTextBlock(label="Obsah")
diff --git a/main/migrations/0039_alter_mainprogrampage_program.py b/main/migrations/0039_alter_mainprogrampage_program.py
new file mode 100644
index 00000000..150a5cad
--- /dev/null
+++ b/main/migrations/0039_alter_mainprogrampage_program.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.0.7 on 2022-12-30 13:16
+
+from django.db import migrations
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main', '0038_alter_maincrossroadpage_cards_content_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='mainprogrampage',
+ name='program',
+ field=wagtail.fields.StreamField([('program_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek části programu')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug části programu', required=False)), ('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(label='Obsah'))]), label='Jednotlivé články programu'))], label='Část programu'))], blank=True, use_json_field=None, verbose_name='Program'),
+ ),
+ ]
diff --git a/main/templates/main/main_program_page.html b/main/templates/main/main_program_page.html
index 134d189e..f7190022 100644
--- a/main/templates/main/main_program_page.html
+++ b/main/templates/main/main_program_page.html
@@ -40,10 +40,11 @@
{% else %}
<div class="grid-container mb-12">
{% endif %}
-
- {% image item.icon max-150x150 as icon %}
- <img src="{{ icon.url }}" alt="{{ item.title }}" class="grid-left-side mr-6 text-6xl xl:justify-self-end">
- <div class="grid-content flex flex-col">
+ {% if item.icon %}
+ {% image item.icon max-150x150 as icon %}
+ <img src="{{ icon.url }}" alt="{{ item.title }}" class="grid-left-side mr-6 text-6xl xl:justify-self-end">
+ {% endif %}
+ <div class="{% if item.icon %}grid-content{% else %}grid-left-side-with-content{% endif %} flex flex-col">
<h3 class="font-alt mb-4 text-4xl">
{{ item.title }}
</h3>
--
GitLab