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

feat(district): few more geo feature collection and election page improvements

parent 404070b2
No related branches found
No related tags found
2 merge requests!518Release,!517feat(district): few more geo feature collection and election page improvements
Pipeline #8238 passed
Stage: build
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 11130 additions and 58 deletions
district/models.py
+ 21
− 1
View file @ e1da3c47
......@@ -1348,13 +1348,31 @@ class DistrictGeoFeatureCollectionPage(
):
### FIELDS
perex = models.TextField("Perex", null=True)
hero_cta_buttons = StreamField(
[
("button_group", ButtonGroupBlock()),
],
verbose_name="CTAs pro banner",
blank=True,
null=True,
help_text="Použije se v hlavním banneru.",
)
content = StreamField(
DEFAULT_CONTENT_BLOCKS
+ [
("badge", blocks.PersonBadgeBlock()),
("people_group", blocks.PeopleGroupListBlock()),
],
verbose_name="Obsah",
verbose_name="Obsah úvodní",
blank=True,
)
content_after = StreamField(
DEFAULT_CONTENT_BLOCKS
+ [
("badge", blocks.PersonBadgeBlock()),
("people_group", blocks.PeopleGroupListBlock()),
],
verbose_name="Obsah za mapou",
blank=True,
)
image = models.ForeignKey(
......@@ -1387,7 +1405,9 @@ class DistrictGeoFeatureCollectionPage(
MultiFieldPanel(
[
FieldPanel("perex"),
FieldPanel("hero_cta_buttons"),
StreamFieldPanel("content"),
StreamFieldPanel("content_after"),
ImageChooserPanel("logo_image"),
ImageChooserPanel("image"),
],
......
district/templates/district/district_election_campaign_page.html
+ 7
− 8
View file @ e1da3c47
......@@ -9,8 +9,8 @@
{% endif %}
<header class="hero hero--image text-center md:text-left {% if page.root_election_page.campaigns|length > 1 %}pb-0 pt-16{% else %}py-16{% endif %}" style="--image-url: url({{ bg_img.full_url }})">
<div class="container container--default grid lg:grid-rows-3 lg:grid-cols-7 gap-2 items-center">
<div class="lg:row-span-2 lg:col-span-3 order-1">
<div class="container container--default grid lg:grid-cols-7 gap-4 items-center text-center lg:text-left">
<div class="lg:col-span-3 order-2 lg:order-1">
{% if page.number %}
<div class="flag bg-violet-400 text-white head-alt-base mb-6">
Volte č. {{ page.number }}
......@@ -29,22 +29,21 @@
</h1>
{% endif %}
{% if page.hero_motto %}
<h2 class="head-xs md:head-base text-shadow-lg mt-2">
<h2 class="head-xs text-shadow-lg mt-2">
{{ page.hero_motto }}
</h2>
{% endif %}
</div>
<div class="lg:row-span-1 lg:col-span-3 order-3">
<div class="mt-4 md:mt-8 space-y-4">
{% for block in page.hero_cta_buttons %}
{% include_block block %}
{% endfor %}
</div>
</div>
<div class="lg:row-span-3 lg:col-span-4 order-2">
<div class="lg:col-span-4 order-1 lg:order-2">
{% if page.hero_candidates_image %}
{% image page.hero_candidates_image width-490 as candidates_img %}
<img src="{{ candidates_img.url }}" class="h-32 lg:h-80 lg:m-auto hidden md:block object-contain" alt="Kandidáti">
<img src="{{ candidates_img.url }}" class="h-32 lg:h-80 m-auto object-contain" alt="Kandidáti">
{% endif %}
</div>
</div>
......
district/templates/district/district_geo_feature_collection_page.html
+ 58
− 44
View file @ e1da3c47
......@@ -17,6 +17,11 @@
<h2 class="head-xs text-shadow-lg max-w-xl mb-2 mx-auto lg:mx-0">
{{ page.perex }}
</h2>
<div class="mt-4 md:mt-8 space-y-4">
{% for block in page.hero_cta_buttons %}
{% include_block block %}
{% endfor %}
</div>
</div>
<div class="lg:col-span-4 order-1 lg:order-2">
{% if page.logo_image %}
......@@ -34,41 +39,31 @@
{% block content %}
<article>
<div class="md:space-y-8 lg:space-y-16">
<div class="lg:flex lg:space-x-16">
<section class="lg:w-2/3">
<div class="content-block mb-4">
<section>
{% for block in page.content %}
{% include_block block %}
{% endfor %}
</div>
</section>
<div class="lg:w-1/3">
<aside class="sharebox pt-4 md:card md:elevation-10">
<div class="md:card__body">
<span class="head-alt-base md:head-alt-md">Sdílení je aktem lásky</span>
<div class="flex w-full space-x-4 pt-4 md:pt-8 text-center text-white">
<a
href="https://www.facebook.com/sharer/sharer.php?u={{ page.full_url|urlencode }}"
onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
class="bg-brands-facebook px-8 py-3 text-2xl w-full hover:no-underline"
><i class="ico--facebook"></i></a>
<a
href="https://twitter.com/intent/tweet?text={{ page.title|urlencode }}&url={{ page.full_url|urlencode }}"
onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
class="bg-brands-twitter px-8 py-3 text-2xl w-full hover:no-underline"
><i class="ico--twitter"></i></a>
</div>
</div>
<div class="h-52 overflow-hidden hidden md:block">
<img src="{% static "shared/img/flag.png" %}" alt="Pirátská strana" class="w-80 object-cover m-auto"/>
</div>
</aside>
</div>
</div>
<section id="mapa">
{% if page.map_title %}
<h2 class="head-alt-md mb-4">{{ page.map_title }}</h2>
{% endif %}
<div
class="v-geo-feature-collection"
data-wrapper-class="container-padding--zero lg:container-padding--auto"
data-initial-zoom="14"
data-tile-server-config="{{ js_map.tile_server_config }}"
data-tile-style="{{ js_map.style }}"
data-categories="{{ js_map.categories }}"
data-geojson="{{ js_map.geojson }}"
></div>
</section>
<section>
<h2 id="kategorie" class="head-heavy-base mt-8 mb-4">{{ page.category_list_title|default:"Přehled dle kategorií" }}</h2>
<section id="kategorie">
{% if page.category_list_title %}
<h2 class="head-alt-md mb-4">{{ page.category_list_title }}</h2>
{% endif %}
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 md:gap-8">
{% for category, features in features_by_category %}
......@@ -92,19 +87,38 @@
</div>
</section>
<section>
<h2 id="mapa" class="head-heavy-base mt-8 mb-4">{{ page.map_title|default:"Interaktivní mapa" }}</h2>
<div
class="v-geo-feature-collection"
data-wrapper-class="container-padding--zero lg:container-padding--auto"
data-initial-zoom="14"
data-tile-server-config="{{ js_map.tile_server_config }}"
data-tile-style="{{ js_map.style }}"
data-categories="{{ js_map.categories }}"
data-geojson="{{ js_map.geojson }}"
></div>
<div class="lg:flex lg:space-x-16">
<section class="lg:w-2/3 space-y-4">
{% for block in page.content_after %}
{% include_block block %}
{% endfor %}
</section>
<div class="lg:w-1/3">
<aside class="sharebox pt-4 md:card md:elevation-10">
<div class="md:card__body">
<span class="head-alt-base md:head-alt-md">Sdílení je aktem lásky</span>
<div class="flex w-full space-x-4 pt-4 md:pt-8 text-center text-white">
<a
href="https://www.facebook.com/sharer/sharer.php?u={{ page.full_url|urlencode }}"
onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
class="bg-brands-facebook px-8 py-3 text-2xl w-full hover:no-underline"
><i class="ico--facebook"></i></a>
<a
href="https://twitter.com/intent/tweet?text={{ page.title|urlencode }}&url={{ page.full_url|urlencode }}"
onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
class="bg-brands-twitter px-8 py-3 text-2xl w-full hover:no-underline"
><i class="ico--twitter"></i></a>
</div>
</div>
<div class="h-52 overflow-hidden hidden md:block">
<img src="{% static "shared/img/flag.png" %}" alt="Pirátská strana" class="w-80 object-cover m-auto"/>
</div>
</aside>
</div>
</div>
{% include "shared/followus_snippet.html" %}
</div>
</article>
......
shared/templates/styleguide/2.3.x/blocks/three_column_block.html
+ 3
− 3
View file @ e1da3c47
{% load wagtailcore_tags %}
<div class="grid md:grid-cols-3 gap-8">
<div>
<div class="space-y-4">
{% for block in self.left_column_content %}
{% include_block block %}
{% endfor %}
</div>
<div>
<div class="space-y-4">
{% for block in self.middle_column_content %}
{% include_block block %}
{% endfor %}
</div>
<div>
<div class="space-y-4">
{% for block in self.right_column_content %}
{% include_block block %}
{% endfor %}
......
shared/templates/styleguide/2.3.x/blocks/two_column_block.html
+ 2
− 2
View file @ e1da3c47
{% load wagtailcore_tags %}
<div class="grid md:grid-cols-2 gap-8">
<div>
<div class="space-y-4">
{% for block in self.left_column_content %}
{% include_block block %}
{% endfor %}
</div>
<div>
<div class="space-y-4">
{% for block in self.right_column_content %}
{% include_block block %}
{% endfor %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

Pirátský GitLab - Home of the CopyLeft