Skip to content
Snippets Groups Projects
Commit 69970148 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

update hoaxes for richtext, move to left & content grid area

parent 3359514b
Branches
No related tags found
2 merge requests!732Release,!729Add hoax section, add teams section to people page
......@@ -123,11 +123,11 @@ class CardLinkBlock(CardLinkBlockMixin):
class Meta:
template = "district/blocks/card_link_block.html"
icon = "link"
label = "Karta odkazu"
label = "Karta s odkazem"
class CardLinkWithHeadlineBlock(CardLinkWithHeadlineBlockMixin):
card_items = ListBlock(CardLinkBlock(), label="Karty odkazu")
card_items = ListBlock(CardLinkBlock(), label="Karty s odkazy")
class Meta:
template = "district/blocks/card_link_with_headline_block.html"
......
......@@ -53,7 +53,7 @@ class CardLinkBlock(CardLinkBlockMixin):
class Meta:
template = "main/blocks/card_link_block.html"
icon = "link"
label = "Karta odkazu"
label = "Karta s odkazem"
class CTAMixin(StructBlock):
......@@ -364,7 +364,7 @@ class TwoTextColumnBlock(StructBlock):
class CardLinkWithHeadlineBlock(CardLinkWithHeadlineBlockMixin):
card_items = ListBlock(CardLinkBlock(), label="Karty odkazu")
card_items = ListBlock(CardLinkBlock(), label="Karty s odkazy")
class Meta:
template = "main/blocks/card_link_with_headline_block.html"
......@@ -386,9 +386,9 @@ class HoaxBlock(StructBlock):
class TeamBlock(StructBlock):
title = CharBlock(label="Název sekce")
title = CharBlock(label="Název sekce týmů")
slug = CharBlock(
label="Slug skupiny",
label="Slug sekce",
required=False,
help_text="Není třeba vyplňovat, bude automaticky vyplněno",
)
......
# Generated by Django 4.1.6 on 2023-02-27 22:30
# Generated by Django 4.1.6 on 2023-02-28 08:10
from django.db import migrations, models
import django.db.models.deletion
......@@ -12,8 +12,8 @@ import wagtailmetadata.models
class Migration(migrations.Migration):
dependencies = [
('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
('wagtailcore', '0083_workflowcontenttype'),
('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
('main', '0045_alter_mainprogrampage_program'),
]
......@@ -22,10 +22,15 @@ class Migration(migrations.Migration):
name='mainpeoplepage',
options={'verbose_name': 'Lidé a týmy'},
),
migrations.AlterField(
model_name='maincrossroadpage',
name='headlined_cards_content',
field=wagtail.fields.StreamField([('headlined_cards', wagtail.blocks.StructBlock([('headline', wagtail.blocks.CharBlock(label='Titulek bloku', required=False)), ('card_items', 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=['main.MainArticlesPage', 'main.MainArticlePage', 'main.MainProgramPage', 'main.MainPeoplePage', 'main.MainPersonPage', 'main.MainSimplePage', 'main.MainContactPage', 'main.MainCrossroadPage'], required=False)), ('link', wagtail.blocks.URLBlock(label='Odkaz', required=False))]), label='Karty s odkazy'))]))], blank=True, use_json_field=True, verbose_name='Karty rozcestníku s nadpisem'),
),
migrations.AlterField(
model_name='mainpeoplepage',
name='people',
field=wagtail.fields.StreamField([('people_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug skupiny', required=False)), ('person_list', wagtail.blocks.ListBlock(wagtail.blocks.PageChooserBlock(label='Detail osoby', page_type=['main.MainPersonPage']), label='Skupina osob'))], label='Seznam osob')), ('team_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Název sekce')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug skupiny', required=False)), ('team_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('headline', wagtail.blocks.CharBlock(label='Titulek bloku', required=False)), ('card_items', 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=['main.MainArticlesPage', 'main.MainArticlePage', 'main.MainProgramPage', 'main.MainPeoplePage', 'main.MainPersonPage', 'main.MainSimplePage', 'main.MainContactPage', 'main.MainCrossroadPage'], required=False)), ('link', wagtail.blocks.URLBlock(label='Odkaz', required=False))]), label='Karty odkazu'))], label='Karta týmu'), label='Týmy'))]))], blank=True, use_json_field=True, verbose_name='Lidé a týmy'),
field=wagtail.fields.StreamField([('people_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug skupiny', required=False)), ('person_list', wagtail.blocks.ListBlock(wagtail.blocks.PageChooserBlock(label='Detail osoby', page_type=['main.MainPersonPage']), label='Skupina osob'))], label='Seznam osob')), ('team_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Název sekce týmů')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug sekce', required=False)), ('team_list', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('headline', wagtail.blocks.CharBlock(label='Titulek bloku', required=False)), ('card_items', 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=['main.MainArticlesPage', 'main.MainArticlePage', 'main.MainProgramPage', 'main.MainPeoplePage', 'main.MainPersonPage', 'main.MainSimplePage', 'main.MainContactPage', 'main.MainCrossroadPage'], required=False)), ('link', wagtail.blocks.URLBlock(label='Odkaz', required=False))]), label='Karty s odkazy'))], label='Karta týmu'), label='Týmy'))]))], blank=True, use_json_field=True, verbose_name='Lidé a týmy'),
),
migrations.CreateModel(
name='MainHoaxPage',
......
......@@ -4,13 +4,17 @@
{% block content %}
{% include 'main/includes/layout/simple_page_header.html' %}
<main role="main" class="mb-10 xl:mb-32 __js-root">
<div class="grid-container mb-2 lg:mb-12">
<div class="grid-full">
{% if page.description %}
<div class="prose max-w-none mb-10">
{{ page.description }}
{% if page.description %}
<div class="grid-container mb-2 lg:mb-12">
<div class="grid-content">
<div class="prose max-w-none font-condensed text-xl text-black leading-7 mb-12 program-perex">
{{ page.description|richtext }}
</div>
{% endif %}
</div>
</div>
{% endif %}
<div class="grid-container mb-2 lg:mb-12">
<div class="grid-left-side-with-content">
{% for block in page.content %}
{% include_block block %}
{% endfor %}
......
......@@ -46,7 +46,7 @@
</div>
{% for block in page.people %}
<template v-if="isCurrentView('{{ block.value.slug }}-{{ forloop.counter }}')">
<div class="grid-full">
<div class="grid-left-side-with-content">
{% if block.block_type == "team_group" %}
{% for card_block in block.value.team_list %}
{% include_block card_block %}
......
......@@ -628,7 +628,7 @@ class CardLinkBlockMixin(blocks.StructBlock):
class Meta:
# template = ""
icon = "link"
label = "Karta odkazu"
label = "Karta s odkazem"
def clean(self, value):
errors = {}
......@@ -650,7 +650,7 @@ class CardLinkBlockMixin(blocks.StructBlock):
class CardLinkWithHeadlineBlockMixin(blocks.StructBlock):
headline = blocks.CharBlock(label="Titulek bloku", required=False)
card_items = blocks.ListBlock(CardLinkBlockMixin(), label="Karty odkazu")
card_items = blocks.ListBlock(CardLinkBlockMixin(), label="Karty s odkazy")
class Meta:
# template = ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment