From 8f794034d6ded5b9eff078d0c03867b9f3375c86 Mon Sep 17 00:00:00 2001
From: OndraPetrzilka <ondra.petrzilka@gmail.com>
Date: Thu, 25 Aug 2022 07:59:11 +0200
Subject: [PATCH] tags on work_article_preview, main article page with tag
edited, contact box block with image, program page icon changed to image
---
main/blocks.py | 1 +
...021_alter_maincontactpage_contact_boxes.py | 21 +++++++++++++++++++
.../main/includes/work_article_preview.html | 7 ++++---
main/templates/main/main_article_page.html | 2 +-
main/templates/main/main_contact_page.html | 3 ++-
main/templates/main/main_program_page.html | 3 ++-
6 files changed, 31 insertions(+), 6 deletions(-)
create mode 100644 main/migrations/0021_alter_maincontactpage_contact_boxes.py
diff --git a/main/blocks.py b/main/blocks.py
index 1203b039..2243fcab 100644
--- a/main/blocks.py
+++ b/main/blocks.py
@@ -125,6 +125,7 @@ class PersonContactBlock(StructBlock):
class PersonContactBoxBlock(CTAMixin, StructBlock):
title = CharBlock(label="Titulek")
+ image = ImageChooserBlock(label="Ikona")
subtitle = CharBlock(label="Podtitulek")
diff --git a/main/migrations/0021_alter_maincontactpage_contact_boxes.py b/main/migrations/0021_alter_maincontactpage_contact_boxes.py
new file mode 100644
index 00000000..507300a1
--- /dev/null
+++ b/main/migrations/0021_alter_maincontactpage_contact_boxes.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.0.7 on 2022-08-25 05:55
+
+from django.db import migrations
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main', '0020_alter_mainhomepage_content'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='maincontactpage',
+ name='contact_boxes',
+ field=wagtail.fields.StreamField([('item', wagtail.blocks.StructBlock([('button_link', wagtail.blocks.URLBlock(label='Odkaz tlačítka')), ('button_text', wagtail.blocks.CharBlock(label='Text tlačítka')), ('title', wagtail.blocks.CharBlock(label='Titulek')), ('image', wagtail.images.blocks.ImageChooserBlock(label='Ikona')), ('subtitle', wagtail.blocks.CharBlock(label='Podtitulek'))]))], blank=True, use_json_field=None, verbose_name='Kontaktní boxy'),
+ ),
+ ]
diff --git a/main/templates/main/includes/work_article_preview.html b/main/templates/main/includes/work_article_preview.html
index 6d423edb..ea5c047e 100644
--- a/main/templates/main/includes/work_article_preview.html
+++ b/main/templates/main/includes/work_article_preview.html
@@ -7,9 +7,10 @@
{{ article_page.title }}
</h2>
<div class="flex font-bold mb-4 text-xs text-white uppercase">
- {# TODO tags #}
- {# <span class="bg-green-400 mr-1 p-2">Duben 2022</span>#}
- {# <span class="bg-violet-400 mr-1 p-2">#ENERGETIKA</span>#}
+ <span class="bg-green-400 mr-1 p-2">{{ article_page.date }}</span>
+ {% for tag in article_page.tags.all %}
+ <span class="bg-violet-400 mr-1 p-2">{{ tag }}</span>
+ {% endfor %}
</div>
<p class="mb-8">
{{ article_page.perex }}
diff --git a/main/templates/main/main_article_page.html b/main/templates/main/main_article_page.html
index 115c4978..f886d012 100644
--- a/main/templates/main/main_article_page.html
+++ b/main/templates/main/main_article_page.html
@@ -3,7 +3,7 @@
{% block content %}
{% image page.image max-1920x800 as main_img %}
- {% with before_title=page.date after_title=page.after_name subtitle=page.position image_url=main_img.url %}
+ {% with before_title=page.date image_url=main_img.url %}
{% include 'main/includes/layout/photo_page_header.html' %}
{% endwith %}
{# {% routablepageurl page.root_page.articles_page "tags" as articles_tag_page_url %}#}
diff --git a/main/templates/main/main_contact_page.html b/main/templates/main/main_contact_page.html
index 22176e09..38222961 100644
--- a/main/templates/main/main_contact_page.html
+++ b/main/templates/main/main_contact_page.html
@@ -46,7 +46,8 @@
<div class="contact-box">
<div>
<div class="h-16 mx-auto w-16">
- hm, image...
+ {% image contact_block.value.image fill-150x150 as contact_box_image %}
+ <img src="{{ contact_box_image.url }}" alt="{{ contact_block.title }}">
</div>
<h3 class="font-alt mb-3 text-xl">
{{ contact_block.value.title }}
diff --git a/main/templates/main/main_program_page.html b/main/templates/main/main_program_page.html
index 97d2b8f3..38340790 100644
--- a/main/templates/main/main_program_page.html
+++ b/main/templates/main/main_program_page.html
@@ -28,7 +28,8 @@
{% for program_group in page.program %}
{% for item in program_group.value.point_list %}
<div class="flex mb-6">
- <i class="{{ item.icon }} mr-6 text-6xl"></i>
+ {% image item.icon fill-150x150 as icon %}
+ <img src="{{ icon.url }}" alt="{{ item.title }}" class="mr-6 text-6xl">
<div class="flex flex-col">
<h3 class="font-alt mb-4 text-4xl">
{{ item.title }}
--
GitLab