Skip to content
Snippets Groups Projects
Commit ba37b658 authored by OndraRehounek's avatar OndraRehounek
Browse files

Merge remote-tracking branch 'origin/feature/pirati-cz-bugfixes' into feature/pirati-cz

parents 43a4f26d c2b11337
Branches
No related tags found
3 merge requests!607Pirati.cz,!605[ADD] Bugfixes,!575Feature/pirati cz
Pipeline #9626 passed
Showing
with 105 additions and 77 deletions
...@@ -575,7 +575,7 @@ class MainPersonPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, ...@@ -575,7 +575,7 @@ class MainPersonPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin,
people = StreamField( people = StreamField(
[("people_group", blocks.PeopleGroupBlock(label="Seznam osob"))], [("people_group", blocks.PeopleGroupBlock(label="Seznam osob"))],
verbose_name="Lidé", verbose_name="Další lidé",
blank=True, blank=True,
) )
......
...@@ -2667,7 +2667,7 @@ p{ ...@@ -2667,7 +2667,7 @@ p{
.contact-box{ .contact-box{
display: flex; display: flex;
height: 20rem; height: auto;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -4499,6 +4499,10 @@ a.icon-link:hover span{ ...@@ -4499,6 +4499,10 @@ a.icon-link:hover span{
margin-bottom: 3rem; margin-bottom: 3rem;
} }
.xl\:mr-4{
margin-right: 1rem;
}
.xl\:mb-0{ .xl\:mb-0{
margin-bottom: 0px; margin-bottom: 0px;
} }
......
<div> <div>
<div class="flex max-w-md items-start xl:mr-2"> <div class="flex max-w-md items-start xl:mr-2">
<a href="#" class="mr-4">
<img src="https://i.picsum.photos/id/523/132/132.jpg?hmac=XjW7KxLZNbta7gMDNvldHNGwA9XyxpjBFUGkJqrMR4o" alt="" <img src="https://i.picsum.photos/id/523/132/132.jpg?hmac=XjW7KxLZNbta7gMDNvldHNGwA9XyxpjBFUGkJqrMR4o" alt=""
class="w-16 xl:w-36 mr-4"> class="w-16 xl:w-36">
</a>
<div class="flex flex-col justify-between items-start"> <div class="flex flex-col justify-between items-start">
<span class="text-green-500 mb-2">23.2.2022</span> <span class="text-green-500 mb-2">23.2.2022</span>
<a href="#">
<h4 class="font-alt leading-5 text-base uppercase lg:text-base mb-2"> <h4 class="font-alt leading-5 text-base uppercase lg:text-base mb-2">
Komentář Lukáše Koláříka: Kriminalita ve virtuálním prostoru není imaginární, Komentář Lukáše Koláříka: Kriminalita ve virtuálním prostoru není imaginární,
ale skutečná. Jak nenaletět internetovým šmejdům? ale skutečná. Jak nenaletět internetovým šmejdům?
</h4> </h4>
</a>
{{> atoms-button-animated(btn-text: "Zjistit více") }} {{> atoms-button-animated(btn-text: "Zjistit více") }}
</div> </div>
</div> </div>
......
<div class="flex flex-wrap mb-5 lg:mb-10"> <div class="flex flex-wrap mb-5 lg:mb-10">
<a href="#">
<img src="https://i.picsum.photos/id/361/576/576.jpg?hmac=kb62KiZkyDuigb46DUJQd7QvQM6LfYFolTdIMwEqei4" alt="" <img src="https://i.picsum.photos/id/361/576/576.jpg?hmac=kb62KiZkyDuigb46DUJQd7QvQM6LfYFolTdIMwEqei4" alt=""
class="lg:max-w-lg lg:mr-11 h-fit"> class="lg:max-w-lg lg:mr-11 h-fit">
</a>
<div class="flex flex-col max-w-xl items-start"> <div class="flex flex-col max-w-xl items-start">
<span class="text-green-500 head-3xl mt-10 mb-4 lg:mb-8">2.3.2022</span> <span class="text-green-500 head-3xl mt-10 mb-4 lg:mb-8">2.3.2022</span>
<h5 class="head-4xl mb-5 lg:mb-10">Senátoři vyzvali k ukončení veřejné podpory firmám z Ruska <a href="#" class="head-4xl mb-5 lg:mb-10">Senátoři vyzvali k ukončení veřejné podpory firmám z Ruska
a Běloruska, vkteré neodsoudí akt vojenské agrese na Ukrajině</h5> a Běloruska, vkteré neodsoudí akt vojenské agrese na Ukrajině</a>
<p class="leading-6 mb-4 lg:mb-8"> <p class="leading-6 mb-4 lg:mb-8">
Senát chce v souvislosti s ruskou agresí zabránit některým firmám z Ruska a Běloruska čerpat dotace z Senát chce v souvislosti s ruskou agresí zabránit některým firmám z Ruska a Běloruska čerpat dotace z
prostředků rozpočtu České republiky. prostředků rozpočtu České republiky.
......
<div class="flex flex-col justify-between items-start mb-9"> <div class="flex flex-col justify-between items-start mb-9">
<div class="flex font-bold mb-4 text-xs text-white uppercase"> <div class="flex flex-wrap font-bold mb-4 text-xs text-white uppercase">
<span class="bg-green-500 mr-1 px-1">Duben 2022</span> <span class="mb-1 bg-green-500 mr-1 px-1">Duben 2022</span>
<span class="bg-violet-600 mr-1 px-1">#ENERGETIKA</span> <span class="mb-1 bg-violet-600 mr-1 px-1">#ENERGETIKA</span>
</div> </div>
<a href="#">
<h4 class="head-3xl mb-4"> <h4 class="head-3xl mb-4">
Ukončili jsme povinné přimíchávání biopaliv první generace do pohonných hmot Ukončili jsme povinné přimíchávání biopaliv první generace do pohonných hmot
</h4> </h4>
</a>
<p class="mb-6"> <p class="mb-6">
Povinné přimíchávání biopaliv do benzínu a nafty jsme chtěli zcela zrušit už Povinné přimíchávání biopaliv do benzínu a nafty jsme chtěli zcela zrušit už
v minulém volebním období. Tehdy jsme zabránili zvýšení podílu biosložky, v minulém volebním období. Tehdy jsme zabránili zvýšení podílu biosložky,
......
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
<img src="https://i.picsum.photos/id/865/90/100.jpg?hmac=0E2Zv4lGASwKCcZxquMc_v2Y3Rg68gw21euyRQ1bu80" alt="" <img src="https://i.picsum.photos/id/865/90/100.jpg?hmac=0E2Zv4lGASwKCcZxquMc_v2Y3Rg68gw21euyRQ1bu80" alt=""
class="mb-8 max-w-20 max-h-20"> class="mb-8 max-w-20 max-h-20">
<h5 class="head-4xl mb-8">naloď se k pirátům</h5> <h5 class="head-4xl mb-8">naloď se k pirátům</h5>
{{> atoms-button-animated(btn-text: "Přidat se k nám") }} {{> atoms-button-animated(btn-text: "Přidat se k nám" classes="shrink-0") }}
</div> </div>
<div class="p-7 flex flex-col max-w-xl border border-grey-150 mb-8"> <div class="p-7 flex flex-col max-w-xl border border-grey-150 mb-8">
<a href="#">
<img src="https://i.picsum.photos/id/689/576/281.jpg?hmac=yIwOFV185zFy4fwVE3lF1UDqLDAm_bpLr9LZprQ26eo" alt="" <img src="https://i.picsum.photos/id/689/576/281.jpg?hmac=yIwOFV185zFy4fwVE3lF1UDqLDAm_bpLr9LZprQ26eo" alt=""
class="mb-7"> class="mb-7 w-full">
</a>
<a href="#">
<h2 class="head-2xl mb-4">Konec mezinárodní ostudy. Evropská komise uzavřela řízení o střetu zájmů</h2> <h2 class="head-2xl mb-4">Konec mezinárodní ostudy. Evropská komise uzavřela řízení o střetu zájmů</h2>
</a>
<div class="flex font-bold mb-4 text-xs text-white uppercase"> <div class="flex font-bold mb-4 text-xs text-white uppercase">
<span class="bg-green-500 mr-1 p-2">Duben 2022</span> <span class="bg-green-500 mr-1 p-2">Duben 2022</span>
<span class="bg-violet-600 mr-1 p-2">#ENERGETIKA</span> <span class="bg-violet-600 mr-1 p-2">#ENERGETIKA</span>
......
.contact-box { .contact-box {
@apply border border-grey-100 flex flex-col h-80 items-center justify-between px-16 py-8 text-center; @apply border border-grey-100 flex flex-col h-auto min-h-80 items-center justify-between px-16 py-8 text-center;
width: 280px; width: 280px;
} }
...@@ -8,10 +8,14 @@ ...@@ -8,10 +8,14 @@
{% if article_main %} {% if article_main %}
<div class="flex flex-wrap mb-5 lg:mb-10"> <div class="flex flex-wrap mb-5 lg:mb-10">
{% image article_main.image original as article_img %} {% image article_main.image original as article_img %}
<a href="{{ article_main.url }}">
<img src="{{ article_img.url }}" draggable="false" alt="" class="lg:max-w-lg lg:mr-11 h-fit"> <img src="{{ article_img.url }}" draggable="false" alt="" class="lg:max-w-lg lg:mr-11 h-fit">
</a>
<div class="flex flex-col max-w-xl items-start"> <div class="flex flex-col max-w-xl items-start">
<span class="text-green-500 head-3xl mt-10 mb-4 lg:mb-8">{{ article_main.date }}</span> <span class="text-green-500 head-3xl mt-10 mb-4 lg:mb-8">{{ article_main.date }}</span>
<h5 class="head-4xl mb-5 lg:mb-10">{{ article_main.title }}</h5> <a href="{{ article_main.url }}">
<h4 class="head-4xl mb-5 lg:mb-10">{{ article_main.title }}</h4>
</a>
<p class="leading-6 mb-4 lg:mb-8">{{ article_main.perex }}</p> <p class="leading-6 mb-4 lg:mb-8">{{ article_main.perex }}</p>
{% include 'main/includes/button_animated.html' with btn_link=article_main.url btn_text="Číst dále" %} {% include 'main/includes/button_animated.html' with btn_link=article_main.url btn_text="Číst dále" %}
</div> </div>
......
...@@ -3,14 +3,16 @@ ...@@ -3,14 +3,16 @@
<div> <div>
<div class="flex max-w-md items-start xl:mr-2"> <div class="flex max-w-md items-start xl:mr-2">
{% image article_item.image fill-128x128 as image %} {% image article_item.image fill-128x128 as image %}
<a href="{{ article_item.url }}" class="mr-4">
<img src="{{ image.url }}" <img src="{{ image.url }}"
alt="" alt=""
class="w-16 xl:w-36 mr-4"> class="w-16 xl:w-36">
</a>
<div class="flex flex-col justify-between items-start"> <div class="flex flex-col justify-between items-start">
<span class="text-green-500 mb-2">{{ article_item.date | date }}</span> <span class="text-green-500 mb-2">{{ article_item.date | date }}</span>
<h4 class="font-alt leading-5 text-base uppercase lg:text-base mb-2"> <a href="{{ article_item.url }}" class="font-alt leading-5 text-base uppercase lg:text-base mb-2">
{{ article_item.title }} {{ article_item.title }}
</h4> </a>
{% include 'main/includes/button_animated.html' with btn_link=article_item.url btn_text="Zjistit více" %} {% include 'main/includes/button_animated.html' with btn_link=article_item.url btn_text="Zjistit více" %}
</div> </div>
</div> </div>
......
{% for article_page in article_data_list %} {% for article_page in article_data_list %}
<div class="flex flex-col justify-between items-start mb-9"> <div class="flex flex-col justify-between items-start mb-9">
<div class="flex font-bold mb-4 text-xs text-white uppercase"> <div class="flex flex-wrap font-bold mb-4 text-xs text-white uppercase">
<span class="bg-green-500 mr-1 px-1">{{ article_page.date }}</span> <span class="mb-1 bg-green-500 mr-1 px-1">{{ article_page.date }}</span>
{% for tag in article_page.tags.all %} {% for tag in article_page.tags.all %}
<span class="bg-violet-600 mr-1 px-1">{{ tag }}</span> <span class="bg-violet-600 mb-1 mr-1 px-1">{{ tag }}</span>
{% endfor %} {% endfor %}
</div> </div>
<a href="{{ article_page.url }}">
<h4 class="head-3xl mb-4"> <h4 class="head-3xl mb-4">
{{ article_page.title }} {{ article_page.title }}
</h4> </h4>
</a>
<p class="mb-6"> <p class="mb-6">
{{ article_page.perex }} {{ article_page.perex }}
</p> </p>
......
...@@ -2,13 +2,17 @@ ...@@ -2,13 +2,17 @@
<div class="p-7 flex flex-col max-w-xl border border-grey-150 mb-8"> <div class="p-7 flex flex-col max-w-xl border border-grey-150 mb-8">
{% image article_page.image max-500x500 as image %} {% image article_page.image max-500x500 as image %}
<a href="{{ article_page.url }}">
<img <img
src='{{ image.url }}' alt="" src='{{ image.url }}' alt=""
class="mb-7" class="mb-7 w-full"
> >
</a>
<a href="{{ article_page.url }}">
<h2 class="head-2xl mb-4"> <h2 class="head-2xl mb-4">
{{ article_page.title }} {{ article_page.title }}
</h2> </h2>
</a>
<div class="flex font-bold mb-4 text-xs text-white uppercase"> <div class="flex font-bold mb-4 text-xs text-white uppercase">
<span class="bg-green-500 mr-1 p-2">{{ article_page.date }}</span> <span class="bg-green-500 mr-1 p-2">{{ article_page.date }}</span>
{% for tag in article_page.tags.all %} {% for tag in article_page.tags.all %}
......
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
<div class="grid-container mb-2 lg:mb-12 relative"> <div class="grid-container mb-2 lg:mb-12 relative">
<div class="grid-left-side h-full bg-grey-150 left-tab"> <div class="grid-left-side h-full bg-grey-150 left-tab">
<div class="p-6 flex flex-wrap flex-row items-center justify-between xl:items-start xl:flex-col"> <div class="p-6 flex flex-wrap flex-row items-center justify-between xl:items-start xl:flex-col">
{% if page.author %} <span class="font-bold 3xl:text-xl">AUTOR ČLÁNKU: <br> {% firstof page.author_page.title page.author '' %}</span><br>
<span class="font-bold 3xl:text-xl">AUTOR ČLÁNKU: <br> {{ page.author }}</span><br>
{% endif %}
<div class="flex flex-row static bottom-0 xl:absolute sm:bottom-5"> <div class="flex flex-row static bottom-0 xl:absolute sm:bottom-5">
{% for social in page.author_page.social_links %} {% for social in page.author_page.social_links %}
<a href="{{ social.value.link }}" class="flex hover:no-underline"> <a href="{{ social.value.link }}" class="flex hover:no-underline">
......
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
</section> </section>
</template> </template>
</ui-view-provider> </ui-view-provider>
{% include "main/includes/newsletter_section.html" %}
</div> </div>
</main> </main>
......
...@@ -46,10 +46,9 @@ ...@@ -46,10 +46,9 @@
{% for contact_block in page.contact_boxes %} {% for contact_block in page.contact_boxes %}
<div class="contact-box"> <div class="contact-box">
<div> <div>
<div class="h-16 mx-auto w-16 mb-3">
{% image contact_block.value.image fill-150x150 as contact_box_image %} {% image contact_block.value.image fill-150x150 as contact_box_image %}
<img src="{{ contact_box_image.url }}" alt="{{ contact_block.title }}"> <img src="{{ contact_box_image.url }}" alt="{{ contact_block.title }}"
</div> class="h-16 mx-auto w-16 mb-3">
<h3 class="font-alt mb-3 text-xl"> <h3 class="font-alt mb-3 text-xl">
{{ contact_block.value.title }} {{ contact_block.value.title }}
</h3> </h3>
...@@ -57,12 +56,8 @@ ...@@ -57,12 +56,8 @@
{{ contact_block.value.subtitle }} {{ contact_block.value.subtitle }}
</p> </p>
</div> </div>
<a href="{{ contact_block.value.button_link }}" class="btn btn__slide__wrap"> {% include 'main/includes/button_animated.html' with btn_link=contact_block.value.button_link btn_text=contact_block.value.button_text extra_classes="shrink-0" %}
<span class="btn bg-black text-white w-32">{{ contact_block.value.button_text }}</span>
<span class="btn bg-blue-300 text-white w-32">{{ contact_block.value.button_text }}</span>
</a>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</section> </section>
...@@ -95,7 +90,8 @@ ...@@ -95,7 +90,8 @@
</span> </span>
{% if contact_person_box.value.person %} {% if contact_person_box.value.person %}
<span>{{ contact_person_box.value.person.phone|default_if_none:'' }}</span> <span>{{ contact_person_box.value.person.phone|default_if_none:'' }}</span>
<span class="text-turquoise-500">{{ contact_person_box.value.person.email|default_if_none:'' }}</span> <span
class="text-turquoise-500">{{ contact_person_box.value.person.email|default_if_none:'' }}</span>
{% endif %} {% endif %}
</div> </div>
</div> </div>
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
</ui-view-provider> </ui-view-provider>
</div> </div>
</div> </div>
{% include 'main/includes/newsletter_section.html' %}
</main> </main>
{% include 'main/includes/newsletter_section.html' %}
{% endblock content %} {% endblock content %}
...@@ -15,25 +15,31 @@ ...@@ -15,25 +15,31 @@
{{ page.perex }} {{ page.perex }}
</p> </p>
<p class="mb-5"> <p class="mb-5">
{{ paga.text|richtext }} {{ page.text|richtext }}
</p> </p>
</article> </article>
</div> </div>
<div class="grid-right-side mb-8 xl:mb-0"> <div class="grid-right-side mb-8 xl:mb-0">
{% if page.email or page.phone %}
<div class="bg-grey-100 flex flex-col justify-center mb-1 px-7 py-4 xl:py-9"> <div class="bg-grey-100 flex flex-col justify-center mb-1 px-7 py-4 xl:py-9">
{% if page.email %}
<div class="flex mb-2"> <div class="flex mb-2">
<i class="ico--envelope mr-2"></i> <i class="ico--envelope mr-2"></i>
<a href="mailto:{{ page.email }}" class="text-turquoise-500 underline"> <a href="mailto:{{ page.email }}" class="text-turquoise-500 underline">
{{ page.email }} {{ page.email }}
</a> </a>
</div> </div>
{% endif %}
{% if page.phone %}
<div class="flex"> <div class="flex">
<i class="ico--phone mr-2"></i> <i class="ico--phone mr-2"></i>
<a href="tel:{{ page.phone }}"> <a href="tel:{{ page.phone }}">
{{ page.phone }} {{ page.phone }}
</a> </a>
</div> </div>
{% endif %}
</div> </div>
{% endif %}
{% if page.social_links %} {% if page.social_links %}
<div class="bg-grey-100 flex flex-col justify-center px-7 py-4 xl:py-9"> <div class="bg-grey-100 flex flex-col justify-center px-7 py-4 xl:py-9">
{% for social_block in page.social_links %} {% for social_block in page.social_links %}
...@@ -57,7 +63,7 @@ ...@@ -57,7 +63,7 @@
</h2> </h2>
<div class="__js-root twitter-carousel-root"> <div class="__js-root twitter-carousel-root">
<ui-twitter-carousel> <ui-twitter-carousel>
{% for tweet in page.tweet_list %} {% for tweet in tweet_list %}
<div class="w-full flex max-w-xs"> <div class="w-full flex max-w-xs">
<div class="mb-5 p-4 flex flex-col items-center text-center border border-grey-100 sm:mb-0"> <div class="mb-5 p-4 flex flex-col items-center text-center border border-grey-100 sm:mb-0">
<div class="flex flex-row sm:flex-col items-center"> <div class="flex flex-row sm:flex-col items-center">
...@@ -76,7 +82,7 @@ ...@@ -76,7 +82,7 @@
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</ui-twitter-carousel> <ui-twitter-carousel>
</div> </div>
</div> </div>
</section> </section>
......
...@@ -53,6 +53,6 @@ ...@@ -53,6 +53,6 @@
</ui-view-provider> </ui-view-provider>
</div> </div>
</div> </div>
{% include 'main/includes/newsletter_section.html' %}
</main> </main>
{% include 'main/includes/newsletter_section.html' %}
{% endblock %} {% endblock %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment