Skip to content
Snippets Groups Projects
Commit 67fd3082 authored by Dan Nepejchal's avatar Dan Nepejchal
Browse files

Regulace konopi: 

- text 3 columns block
parent 9a11c17c
No related branches found
No related tags found
2 merge requests!167Deploy,!166Regulace konopi
Pipeline #2120 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
regulace_konopi/migrations/0008_auto_20210118_1259.py 0 → 100644
+ 218
− 0
View file @ 67fd3082
# Generated by Django 3.1.1 on 2021-01-18 11:59
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("regulace_konopi", "0007_auto_20201214_1346"),
]
operations = [
migrations.AlterField(
model_name="regkonsubpage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"title",
wagtail.core.blocks.CharBlock(icon="title", label="nadpis"),
),
(
"text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
"superscript",
"subscript",
"strikethrough",
"blockquote",
],
label="text",
),
),
(
"text_centered",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
"superscript",
"subscript",
"strikethrough",
"blockquote",
],
label="text-center",
),
),
(
"text_justify",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
"superscript",
"subscript",
"strikethrough",
"blockquote",
],
label="text-justify",
),
),
(
"carousel",
wagtail.core.blocks.ListBlock(
wagtail.images.blocks.ImageChooserBlock(label="obrázek"),
icon="image",
label="carousel",
),
),
(
"carousel_text",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
"superscript",
"subscript",
"strikethrough",
"blockquote",
]
),
icon="image",
label="carousel-text",
),
),
(
"FAQ",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
("question", wagtail.core.blocks.TextBlock()),
("answer", wagtail.core.blocks.RichTextBlock()),
],
template="regulace_konopi/blocks/faq.html",
),
label="faq",
),
),
(
"meps",
wagtail.core.blocks.StructBlock(
[
("name", wagtail.core.blocks.CharBlock(label="název")),
(
"mep",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"name",
wagtail.core.blocks.CharBlock(
label="jméno"
),
),
(
"approved",
wagtail.core.blocks.ChoiceBlock(
choices=[
(1, "Pro"),
(0, "Proti"),
(-1, "Nevíme"),
],
label="hlasoval",
),
),
]
)
),
),
],
template="regulace_konopi/blocks/party.html",
),
),
(
"text_3_columns",
wagtail.core.blocks.StreamBlock(
[
(
"column",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
"superscript",
"subscript",
"strikethrough",
"blockquote",
],
label="column",
),
)
],
icon="doc-full",
max_num=3,
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
]
regulace_konopi/models.py
+ 26
− 3
View file @ 67fd3082
......@@ -69,6 +69,11 @@ class FaqBlock(blocks.StructBlock):
answer = blocks.RichTextBlock()
class ThreeColumnsBlock(blocks.StructBlock):
first_column = blocks.RichTextBlock(features=RICH_TEXT_FEATURES)
second_column = blocks.RichTextBlock(features=RICH_TEXT_FEATURES)
class RegkonHomePage(MetadataPageMixin, Page):
### FIELDS
content = StreamField(
......@@ -176,7 +181,7 @@ class RegkonSubPage(Page, MetadataPageMixin):
blocks.ListBlock(
blocks.RichTextBlock(features=RICH_TEXT_FEATURES),
label="carousel-text",
icon="paragraph",
icon="image",
),
),
(
......@@ -186,6 +191,21 @@ class RegkonSubPage(Page, MetadataPageMixin):
),
),
("meps", PartyBlock(template="regulace_konopi/blocks/party.html")),
(
"text_3_columns",
blocks.StreamBlock(
[
(
"column",
blocks.RichTextBlock(
label="column", features=RICH_TEXT_FEATURES
),
)
],
max_num=3,
icon="doc-full",
),
),
],
verbose_name="obsah stránky",
blank=True,
......@@ -214,8 +234,11 @@ class RegkonSubPage(Page, MetadataPageMixin):
### RELATIONS
parent_page_types = ["regulace_konopi.RegkonHomePage"]
subpage_types = []
parent_page_types = [
"regulace_konopi.RegkonHomePage",
"regulace_konopi.RegkonSubPage",
]
subpage_types = ["regulace_konopi.RegkonSubPage"]
### OTHERS
......
regulace_konopi/templates/regulace_konopi/base.html
+ 2
− 2
View file @ 67fd3082
......@@ -14,7 +14,7 @@
{% include "shared/favicon_snippet.html" %}
<!-- Styles -->
<link href="{% static "regulace_konopi/vendor/css/bootstrap.min.css" %}" rel="stylesheet"/>
<link href="{% static "shared/vendor/bootstrap-4.4.1/css/bootstrap.min.css" %}" rel="stylesheet"/>
<link href="{% static "styleguide18/assets/css/styles.css" %}" rel="stylesheet" media="all"/>
<link href="{% static "styleguide18/assets/css/pattern-scaffolding.css" %}" rel="stylesheet" media="all"/>
<link href="{% static "shared/vendor/fancybox/jquery.fancybox.min.css" %}" rel="stylesheet">
......@@ -120,7 +120,7 @@
</ui-app>
</footer>
<script src="{% static "regulace_konopi/vendor/js/bootstrap.bundle.min.js" %}"></script>
<script src="{% static "shared/vendor/bootstrap-4.4.1/js/bootstrap.min.js" %}"></script>
<script src="{% static "styleguide18/assets/js/vue.2.6.11.js" %}"></script>
<script src="{% static "shared/vendor/lazysizes/lazysizes.min.js" %}"></script>
<script src="{% static "shared/vendor/fancybox/jquery.fancybox.min.js" %}"></script>
......
regulace_konopi/templates/regulace_konopi/snippet_sections.html
+ 10
− 0
View file @ 67fd3082
......@@ -26,6 +26,16 @@
</div>
{% endif %}
{% if block.block_type == "text_3_columns" %}
<div class="lg:flex clearfix">
{% for column in block.value %}
<div class="content-block lg:w-1/3 text-center text-justify">
{{ column.value|richtext }}
</div>
{% endfor %}
</div>
{% endif %}
{% if block.block_type == "carousel" %}
<div id="carouselExampleControls" class="carousel slide" data-ride="carousel">
<div class="carousel-inner">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Pirátský GitLab - Home of the CopyLeft