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

update mobile europarl carousel

parent f44c325b
Branches
No related tags found
2 merge requests!899Release,!898update mobile europarl carousel
Pipeline #16383 passed
Stage: build
Show whitespace changes
Inline Side-by-side
elections/blocks.py
+ 3
− 0
View file @ e507013c
...@@ -23,6 +23,9 @@ class ElectionsCarouselBlock(StructBlock): ...@@ -23,6 +23,9 @@ class ElectionsCarouselBlock(StructBlock):
required=False, required=False,
) )
mobile_line_1 = TextBlock(label="První mobilní řádek")
mobile_line_2 = TextBlock(label="Druhý mobilní řádek")
class Meta: class Meta:
template = "styleguide2/includes/molecules/menus/elections/carousel.html" template = "styleguide2/includes/molecules/menus/elections/carousel.html"
icon = "form" icon = "form"
......
elections/migrations/0019_electionsarticlepage_show_initial_image.py
+ 8
− 5
View file @ e507013c
...@@ -4,15 +4,18 @@ from django.db import migrations, models ...@@ -4,15 +4,18 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('elections', '0018_alter_electionshomepage_content'), ("elections", "0018_alter_electionshomepage_content"),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='electionsarticlepage', model_name="electionsarticlepage",
name='show_initial_image', name="show_initial_image",
field=models.BooleanField(default=True, help_text='Pokud je tato volba zaškrtnutá, obrázek nastavený u tohoto článku se automaticky vloží do prvního odstavce.', verbose_name='Ukázat obrázek v textu'), field=models.BooleanField(
default=True,
help_text="Pokud je tato volba zaškrtnutá, obrázek nastavený u tohoto článku se automaticky vloží do prvního odstavce.",
verbose_name="Ukázat obrázek v textu",
),
), ),
] ]
elections/migrations/0020_alter_electionshomepage_content.py 0 → 100644
+ 228
− 0
View file @ e507013c
# Generated by Django 4.1.10 on 2024-01-21 19:46
from django.db import migrations
import wagtail.blocks
import wagtail.fields
import wagtail.images.blocks
class Migration(migrations.Migration):
dependencies = [
("elections", "0019_electionsarticlepage_show_initial_image"),
]
operations = [
migrations.AlterField(
model_name="electionshomepage",
name="content",
field=wagtail.fields.StreamField(
[
(
"carousel",
wagtail.blocks.StructBlock(
[
(
"image",
wagtail.images.blocks.ImageChooserBlock(
help_text="Pokud není vybráno video, ukáže se na mobilu i desktopu.",
label="Obrázek na pozadí",
),
),
(
"video_url",
wagtail.blocks.URLBlock(
help_text="Pokud je vybráno, ukáže se na desktopech s povoleným autoplayem místo obrázku.",
label="URL videa",
required=False,
),
),
(
"mobile_line_1",
wagtail.blocks.TextBlock(
label="První mobilní řádek"
),
),
(
"mobile_line_2",
wagtail.blocks.TextBlock(
label="Druhý mobilní řádek"
),
),
]
),
),
(
"candidates",
wagtail.blocks.StructBlock(
[
(
"candidates",
wagtail.blocks.ListBlock(
wagtail.blocks.StructBlock(
[
(
"page",
wagtail.blocks.PageChooserBlock(
label="Stránka",
page_type=[
"elections.ElectionsCandidatePage"
],
),
),
(
"image",
wagtail.images.blocks.ImageChooserBlock(
help_text="Pokud není vybrán, použije se obrázek ze stránky kandidáta",
label="Obrázek",
required=False,
),
),
(
"description",
wagtail.blocks.TextBlock(
label="Popis"
),
),
]
),
label="Kandidáti",
),
)
]
),
),
(
"secondary_candidates",
wagtail.blocks.StructBlock(
[
("heading", wagtail.blocks.CharBlock(label="Nadpis")),
(
"candidates",
wagtail.blocks.ListBlock(
wagtail.blocks.StructBlock(
[
(
"number",
wagtail.blocks.CharBlock(
label="Číslo"
),
),
(
"page",
wagtail.blocks.PageChooserBlock(
label="Stránka",
page_type=[
"elections.ElectionsCandidatePage"
],
),
),
(
"image",
wagtail.images.blocks.ImageChooserBlock(
help_text="Pokud není vybrán, použije se obrázek ze stránky kandidáta",
label="Obrázek",
required=False,
),
),
]
),
label="Kandidáti",
),
),
]
),
),
(
"program",
wagtail.blocks.StructBlock(
[
(
"label",
wagtail.blocks.CharBlock(
default="Program",
help_text="Např. 'Program'",
label="Nadpis",
),
),
(
"categories",
wagtail.blocks.ListBlock(
wagtail.blocks.StructBlock(
[
(
"number",
wagtail.blocks.IntegerBlock(
label="Číslo"
),
),
(
"name",
wagtail.blocks.CharBlock(
label="Název"
),
),
(
"points",
wagtail.blocks.ListBlock(
wagtail.blocks.StructBlock(
[
(
"content",
wagtail.blocks.TextBlock(
label="Obsah"
),
)
]
),
label="Body",
),
),
]
),
label="Kategorie",
),
),
(
"long_version_url",
wagtail.blocks.URLBlock(
help_text="Pro zobrazení odkazu na celou verzi programu musí být obě následující pole vyplněná.",
label="Odkaz na celou verzi programu",
required=False,
),
),
(
"long_version_text",
wagtail.blocks.CharBlock(
label="Nadpis odkazu na celou verzi programu",
required=False,
),
),
]
),
),
(
"news",
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.CharBlock(
help_text="Nejnovější články se načtou automaticky",
label="Titulek",
),
),
(
"description",
wagtail.blocks.TextBlock(label="Popis"),
),
],
template="styleguide2/includes/organisms/articles/elections/articles_section.html",
),
),
],
blank=True,
use_json_field=True,
verbose_name="Hlavní obsah",
),
),
]
main/migrations/0072_mainarticlepage_show_initial_image.py
+ 8
− 5
View file @ e507013c
...@@ -4,15 +4,18 @@ from django.db import migrations, models ...@@ -4,15 +4,18 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('main', '0071_rename_date_mainarticlepage_timestamp'), ("main", "0071_rename_date_mainarticlepage_timestamp"),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='mainarticlepage', model_name="mainarticlepage",
name='show_initial_image', name="show_initial_image",
field=models.BooleanField(default=True, help_text='Pokud je tato volba zaškrtnutá, obrázek nastavený u tohoto článku se automaticky vloží do prvního odstavce.', verbose_name='Ukázat obrázek v textu'), field=models.BooleanField(
default=True,
help_text="Pokud je tato volba zaškrtnutá, obrázek nastavený u tohoto článku se automaticky vloží do prvního odstavce.",
verbose_name="Ukázat obrázek v textu",
),
), ),
] ]
shared/templates/styleguide2/includes/molecules/menus/elections/carousel.html
+ 40
− 13
View file @ e507013c
...@@ -5,10 +5,21 @@ ...@@ -5,10 +5,21 @@
<div class="h-[700px] xl:h-screen relative bg-white"> <div class="h-[700px] xl:h-screen relative bg-white">
{% image self.image original as image %} {% image self.image original as image %}
<img <video
class="header-carousel--image opacity-60 inline xl:hidden" class="
src="{{ image.url }}" header-carousel--image
lg:hidden
"
autoplay
muted
loop
playsinline
preload="metadata"
poster="{% static 'styleguide2/images/background-images/bg-flag-mobile-preview.jpg' %}"
> >
<source src="{% static 'styleguide2/images/background-images/bg-flag-mobile.mp4' %}">
</video>
<video <video
class="header-carousel--image opacity-60 hidden xl:block" class="header-carousel--image opacity-60 hidden xl:block"
...@@ -24,7 +35,10 @@ ...@@ -24,7 +35,10 @@
{% endif %} {% endif %}
</video> </video>
<div class="elections--header-carousel--text-wrapper {% if self.video_url %}xl:hidden{% endif %}"> {% comment %}
(No longer needed. So far.)
<div class="elections--header-carousel--text-wrapper hidden xl:block">
<div <div
class="container--wide h-full flex flex-col justify-end items-start" class="container--wide h-full flex flex-col justify-end items-start"
> >
...@@ -36,6 +50,19 @@ ...@@ -36,6 +50,19 @@
</div> </div>
</div> </div>
</div> </div>
{% endcomment %}
{% if self.mobile_line_1 or self.mobile_line_2 %}
<div class="header-carousel--text-wrapper" style="box-sizing: border-box">
<div class="container--wide px-0 h-full flex flex-col justify-end items-start" style="box-sizing: border-box">
<h1 class="mb-4 px-5 flex flex-col text-black block lg:hidden">
<div>{{ self.mobile_line_1 }}</div>
<div>{{ self.mobile_line_2 }}</div>
</h1>
</div>
</div>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
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