Skip to content
Snippets Groups Projects
Commit d974a256 authored by jan.bednarik's avatar jan.bednarik
Browse files

Merge branch 'test' into fixms

parents 1994a48e 6ef18262
Branches
No related tags found
2 merge requests!173Release,!134Weby pro MS
Pipeline #2328 passed
Stage: build
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 654 additions and 19 deletions
green_deal/migrations/0005_auto_20210118_0721.py 0 → 100644
+ 351
− 0
View file @ d974a256
# Generated by Django 3.1.1 on 2021-01-18 06:21
import django.utils.timezone
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("green_deal", "0004_auto_20210110_2351"),
]
operations = [
migrations.AlterField(
model_name="greendealhomepage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"text_2_columns",
wagtail.core.blocks.StructBlock(
[
(
"left_text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
],
label="levý sloupec",
),
),
(
"right_text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
],
label="pravý sloupec",
),
),
]
),
),
(
"text_1_column",
wagtail.core.blocks.StructBlock(
[
("header", wagtail.core.blocks.CharBlock()),
(
"text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
]
),
),
]
),
),
(
"FAQ_columns",
wagtail.core.blocks.StructBlock(
[
(
"left_text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
],
label="levý sloupec",
),
),
(
"faqs",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"question",
wagtail.core.blocks.TextBlock(),
),
(
"answer",
wagtail.core.blocks.RichTextBlock(),
),
]
),
label="faq",
),
),
]
),
),
(
"news",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
("header", wagtail.core.blocks.CharBlock()),
(
"perex",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
]
),
),
("img", wagtail.images.blocks.ImageChooserBlock()),
("link", wagtail.core.blocks.URLBlock()),
(
"date",
wagtail.core.blocks.DateBlock(
default=django.utils.timezone.now
),
),
]
),
label="aktuality",
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
migrations.AlterField(
model_name="greendealsubpage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"text_2_columns",
wagtail.core.blocks.StructBlock(
[
(
"left_text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
],
label="levý sloupec",
),
),
(
"right_text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
],
label="pravý sloupec",
),
),
]
),
),
(
"text_1_column",
wagtail.core.blocks.StructBlock(
[
("header", wagtail.core.blocks.CharBlock()),
(
"text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
]
),
),
]
),
),
(
"FAQ_columns",
wagtail.core.blocks.StructBlock(
[
(
"left_text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
],
label="levý sloupec",
),
),
(
"faqs",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"question",
wagtail.core.blocks.TextBlock(),
),
(
"answer",
wagtail.core.blocks.RichTextBlock(),
),
]
),
label="faq",
),
),
]
),
),
(
"news",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
("header", wagtail.core.blocks.CharBlock()),
(
"perex",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
]
),
),
("img", wagtail.images.blocks.ImageChooserBlock()),
("link", wagtail.core.blocks.URLBlock()),
(
"date",
wagtail.core.blocks.DateBlock(
default=django.utils.timezone.now
),
),
]
),
label="aktuality",
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
]
green_deal/models.py
+ 1
− 1
View file @ d974a256
......@@ -69,7 +69,7 @@ class NewsBlock(blocks.StructBlock):
perex = blocks.RichTextBlock(features=RICH_TEXT_FEATURES)
img = ImageChooserBlock()
link = blocks.URLBlock()
date = blocks.DateBlock(default=timezone.now())
date = blocks.DateBlock(default=timezone.now)
class StudiesBlock(blocks.StructBlock):
......
green_deal/static/green_deal/css/_responsive.scss
+ 3
− 0
View file @ d974a256
......@@ -221,6 +221,7 @@ $breakpoints: (
.quarter:nth-child(2) h4 {padding-right: 0px;}
.social {text-align: center; float: none; padding-top: 1em;}
.social a img {position: relative; float: none;}
.efa img {max-width: 25%; padding: 1rem}
}
//ADDON
......@@ -262,6 +263,7 @@ $breakpoints: (
.akt h4 {font-size: 110%;}
//ADDON
#mob_menu_open {}
#footer {.efa img {max-width: 35%; padding: 1rem}}
}
......@@ -292,6 +294,7 @@ $breakpoints: (
@include media("xxx-small"){
#header {/*height: 100%;*/ padding-bottom: 0%;}
//ADDON
#footer {.efa img {max-width: 42%; padding: 1rem}}
}
@include media("medium-height"){
......
green_deal/static/green_deal/css/style.css
+ 23
− 2
View file @ d974a256
......@@ -951,6 +951,7 @@ hr.underline {
#footer .social {
/*width: 15%;*/
float: left;
text-align: center !important;
}
#footer .eshop {
display: inline-block;
......@@ -977,6 +978,14 @@ hr.underline {
padding-left: 0px;
padding-top: 0;
}
#footer .efa {
display: flex;
align-content: center;
}
#footer .efa img {
max-width: 75%;
margin: auto;
}
#footer ul.mainmenu {
position: relative;
top: 0em;
......@@ -1045,8 +1054,6 @@ hr.underline {
.copyright {
bottom: 1em;
text-align: left;
/*padding: 1em 0;*/
font-size: 75%;
text-transform: uppercase;
line-height: 20px;
......@@ -2565,6 +2572,10 @@ img, video, canvas {
position: relative;
float: none;
}
#footer .efa img {
max-width: 25%;
padding: 1rem;
}
.uvod_foto {
display: none;
......@@ -2666,6 +2677,11 @@ img, video, canvas {
.akt h4 {
font-size: 110%;
}
#footer .efa img {
max-width: 35%;
padding: 1rem;
}
}
@media (max-width: 500px) {
a.home {
......@@ -2740,6 +2756,11 @@ img, video, canvas {
/*height: 100%;*/
padding-bottom: 0%;
}
#footer .efa img {
max-width: 42%;
padding: 1rem;
}
}
/*# sourceMappingURL=style.css.map */
green_deal/static/green_deal/css/style.css.map
+ 1
− 1
View file @ d974a256
This diff is collapsed.
green_deal/static/green_deal/css/style.min.css
+ 1
− 1
View file @ d974a256
This diff is collapsed.
green_deal/static/green_deal/css/style.scss
+ 9
− 1
View file @ d974a256
......@@ -1089,6 +1089,7 @@ hr.underline {
.social { /*width: 15%;*/
float: left;
text-align: center !important;
}
.eshop {
......@@ -1118,6 +1119,14 @@ hr.underline {
padding-left: 0px;
padding-top: 0;
}
.efa{
display: flex;
align-content: center;
}
.efa img {
max-width: 75%;
margin: auto;
}
ul.mainmenu {
position: relative;
......@@ -1199,7 +1208,6 @@ hr.underline {
.copyright {
bottom: 1em;
text-align: left; /*padding: 1em 0;*/
font-size: 75%;
text-transform: uppercase;
line-height: 20px;
......
green_deal/templates/green_deal/base.html
+ 11
− 10
View file @ d974a256
......@@ -96,16 +96,6 @@
<div id="footer">
<div class="inner">
<div class="quarter logo">
<a href="https://www.pirati.cz">
<img src="{% static "styleguide18/assets/images/logo.svg" %}" alt="logo pirátské strany" class="w-32 md:w-40 pb-6" />
</a>
<p class="copyright">
<span class="copyleft inline-block">&copy;</span> {% now "Y" %} Piráti. Všechna práva vyhlazena. Sdílejte a nechte ostatní sdílet za stejných podmínek.
</p>
</div>
<div class="quarter">
</div>
<div class="quarter">
<h4>Kontakt</h4>
<hr>
......@@ -116,6 +106,17 @@
<div class="quarter social">
<a href="https://twitter.com/vonpecka" target="_blank"><img src="{% static 'green_deal/images/twitters.png' %}"/></a>&nbsp;
</div>
<div class="quarter efa">
<img src="{% static "green_deal/images/greenefa.svg" %}" alt="logo green efa" class="w-32 md:w-40 pb-6" />
</div>
<div class="quarter">
<a href="https://www.pirati.cz">
<img src="{% static "styleguide18/assets/images/logo.svg" %}" alt="logo pirátské strany" class="w-32 md:w-40 pb-6" />
</a>
<p class="copyright">
<span class="copyleft inline-block">&copy;</span> {% now "Y" %} Piráti. Všechna práva vyhlazena. Sdílejte a nechte ostatní sdílet za stejných podmínek.
</p>
</div>
<hr class="cleaner">
</div>
</div>
......
regulace_konopi/migrations/0008_auto_20210118_1259.py 0 → 100644
+ 218
− 0
View file @ d974a256
# 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 @ d974a256
......@@ -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/snippet_sections.html
+ 10
− 0
View file @ d974a256
......@@ -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.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft