Skip to content
Snippets Groups Projects
Commit a2cf1928 authored by Štěpán Farka's avatar Štěpán Farka
Browse files

district and regieon: switch to image with link map

parent 9c83456e
Branches
No related tags found
2 merge requests!435Release upgrades,!430Feature/majak misc enhancements
Pipeline #7070 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
district/blocks.py
+ 2
− 5
View file @ a2cf1928
...@@ -12,11 +12,8 @@ from wagtail.images.blocks import ImageChooserBlock ...@@ -12,11 +12,8 @@ from wagtail.images.blocks import ImageChooserBlock
class AddressBlock(StructBlock): class AddressBlock(StructBlock):
title = CharBlock(label="Titulek", required=True) title = CharBlock(label="Titulek", required=True)
embed_map = URLBlock( map_image = ImageChooserBlock(label="Obrázek mapy", required=False)
label="Odkaz na embed mapku", map_link = URLBlock(label="Odkaz na detail mapy", required=False)
required=False,
help_text="Hodnota 'src' v iframe",
)
address = TextBlock(label="Adresa", required=True) address = TextBlock(label="Adresa", required=True)
address_info = TextBlock(label="Info k adrese", required=False) address_info = TextBlock(label="Info k adrese", required=False)
......
district/migrations/0034_alter_districtcenterpage_sidebar_content.py 0 → 100644
+ 86
− 0
View file @ a2cf1928
# Generated by Django 3.2.11 on 2022-02-23 10:21
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("district", "0033_alter_districthomepage_donation_page"),
]
operations = [
migrations.AlterField(
model_name="districtcenterpage",
name="sidebar_content",
field=wagtail.core.fields.StreamField(
[
(
"address",
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"map_image",
wagtail.images.blocks.ImageChooserBlock(
label="Obrázek mapy", required=False
),
),
(
"map_link",
wagtail.core.blocks.URLBlock(
label="Odkaz na detail mapy", required=False
),
),
(
"address",
wagtail.core.blocks.TextBlock(
label="Adresa", required=True
),
),
(
"address_info",
wagtail.core.blocks.TextBlock(
label="Info k adrese", required=False
),
),
]
),
),
(
"contact",
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"contact_list",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.PageChooserBlock(
label="Osoba",
page_type=["district.DistrictPersonPage"],
),
label="List kontaktů",
),
),
]
),
),
],
blank=True,
verbose_name="Obsah bočního panelu",
),
),
]
district/templates/district/blocks/address_block.html
+ 8
− 5
View file @ a2cf1928
{% load wagtailimages_tags %}
<h2 class="head-heavy-sm mb-2"> <h2 class="head-heavy-sm mb-2">
{{ self.title }} {{ self.title }}
</h2> </h2>
<iframe {% if self.map_image %}
src="{{ self.embed_map }}" <a href="{{ self.map_link }}">
width="100%" height="300" id="mapa-mobile" frameborder="0" style="border:0;" allowfullscreen="" aria-hidden="false" {% image self.map_image width-1000 as img %}
tabindex="0" <img src="{{ img.url }}" alt="{{ img.alt }}" class="h-80 w-full object-cover">
></iframe> </a>
{% endif %}
<p> <p>
{{ self.address | linebreaks }} {{ self.address | linebreaks }}
......
region/blocks.py
+ 2
− 5
View file @ a2cf1928
...@@ -12,11 +12,8 @@ from wagtail.images.blocks import ImageChooserBlock ...@@ -12,11 +12,8 @@ from wagtail.images.blocks import ImageChooserBlock
class AddressBlock(StructBlock): class AddressBlock(StructBlock):
title = CharBlock(label="Titulek", required=True) title = CharBlock(label="Titulek", required=True)
embed_map = URLBlock( map_image = ImageChooserBlock(label="Obrázek mapy", required=False)
label="Odkaz na embed mapku", map_link = URLBlock(label="Odkaz na detail mapy", required=False)
required=False,
help_text="Hodnota 'src' v iframe",
)
address = TextBlock(label="Adresa", required=True) address = TextBlock(label="Adresa", required=True)
address_info = TextBlock(label="Info k adrese", required=False) address_info = TextBlock(label="Info k adrese", required=False)
......
region/migrations/0011_alter_regioncenterpage_sidebar_content.py 0 → 100644
+ 86
− 0
View file @ a2cf1928
# Generated by Django 3.2.11 on 2022-02-23 09:50
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("region", "0010_alter_regionhomepage_donation_page"),
]
operations = [
migrations.AlterField(
model_name="regioncenterpage",
name="sidebar_content",
field=wagtail.core.fields.StreamField(
[
(
"address",
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"map_image",
wagtail.images.blocks.ImageChooserBlock(
label="Obrázek mapy", required=False
),
),
(
"map_link",
wagtail.core.blocks.URLBlock(
label="Odkaz na detail mapy", required=False
),
),
(
"address",
wagtail.core.blocks.TextBlock(
label="Adresa", required=True
),
),
(
"address_info",
wagtail.core.blocks.TextBlock(
label="Info k adrese", required=False
),
),
]
),
),
(
"contact",
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"contact_list",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.PageChooserBlock(
label="Osoba",
page_type=["region.RegionPersonPage"],
),
label="List kontaktů",
),
),
]
),
),
],
blank=True,
verbose_name="Obsah bočního panelu",
),
),
]
region/templates/region/blocks/address_block.html
+ 8
− 5
View file @ a2cf1928
{% load wagtailimages_tags %}
<h2 class="head-heavy-sm mb-2"> <h2 class="head-heavy-sm mb-2">
{{ self.title }} {{ self.title }}
</h2> </h2>
<iframe {% if self.map_image %}
src="{{ self.embed_map }}" <a href="{{ self.map_link }}">
width="100%" height="300" id="mapa-mobile" frameborder="0" style="border:0;" allowfullscreen="" aria-hidden="false" {% image self.map_image width-1000 as img %}
tabindex="0" <img src="{{ img.url }}" alt="{{ img.alt }}" class="h-80 w-full object-cover">
></iframe> </a>
{% endif %}
<p> <p>
{{ self.address | linebreaks }} {{ self.address | linebreaks }}
......
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