From cee4428a4f75096ff5a5ed6b1cf9e3d7234d2b48 Mon Sep 17 00:00:00 2001
From: Jarmil <jarmil.halamicek@seznam.cz>
Date: Wed, 7 Oct 2020 14:31:41 +0200
Subject: [PATCH] MS: paticka a kontaktni informace
---
.../migrations/0003_auto_20201007_1410.py | 27 ++
.../0004_districthomepage_donation_page.py | 20 ++
district/models.py | 26 +-
district/templates/district/base.html | 315 +++++++++++++++---
4 files changed, 346 insertions(+), 42 deletions(-)
create mode 100644 district/migrations/0003_auto_20201007_1410.py
create mode 100644 district/migrations/0004_districthomepage_donation_page.py
diff --git a/district/migrations/0003_auto_20201007_1410.py b/district/migrations/0003_auto_20201007_1410.py
new file mode 100644
index 00000000..e84ebf7c
--- /dev/null
+++ b/district/migrations/0003_auto_20201007_1410.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.1.1 on 2020-10-07 12:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("district", "0002_districtarticles"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="districthomepage",
+ name="contact_email",
+ field=models.EmailField(
+ blank=True, max_length=250, verbose_name="kontaktni email"
+ ),
+ ),
+ migrations.AddField(
+ model_name="districthomepage",
+ name="contact_newcomers",
+ field=models.URLField(
+ blank=True, null=True, verbose_name="URL pro zájemce o ÄŤlenstvĂ"
+ ),
+ ),
+ ]
diff --git a/district/migrations/0004_districthomepage_donation_page.py b/district/migrations/0004_districthomepage_donation_page.py
new file mode 100644
index 00000000..cc607d74
--- /dev/null
+++ b/district/migrations/0004_districthomepage_donation_page.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1.1 on 2020-10-07 12:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("district", "0003_auto_20201007_1410"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="districthomepage",
+ name="donation_page",
+ field=models.URLField(
+ blank=True, null=True, verbose_name="URL pro pĹ™Ăjem darĹŻ"
+ ),
+ ),
+ ]
diff --git a/district/models.py b/district/models.py
index 8a877ea3..bad8198c 100644
--- a/district/models.py
+++ b/district/models.py
@@ -10,6 +10,18 @@ from wagtailmetadata.models import MetadataPageMixin
from shared.models import Article
+class SubpageMixin:
+ """Must be used in class definition before MetadataPageMixin!"""
+
+ @property
+ def root_page(self):
+ if not hasattr(self, "_root_page"):
+ self._root_page = (
+ self.get_ancestors().type(DistrictHomePage).specific().get()
+ )
+ return self._root_page
+
+
class DistrictHomePage(MetadataPageMixin, Page):
### FIELDS
@@ -22,6 +34,13 @@ class DistrictHomePage(MetadataPageMixin, Page):
facebook = models.URLField("Facebook URL", blank=True, null=True)
forum = models.URLField("FĂłrum URL", blank=True, null=True)
+ contact_email = models.EmailField("kontaktni email", max_length=250, blank=True)
+ contact_newcomers = models.URLField(
+ "URL pro zájemce o ÄŤlenstvĂ", blank=True, null=True
+ )
+
+ donation_page = models.URLField("URL pro pĹ™Ăjem darĹŻ", blank=True, null=True)
+
# settings
matomo_id = models.IntegerField(
"Matomo ID pro sledovánà návštěvnosti", blank=True, null=True
@@ -42,6 +61,11 @@ class DistrictHomePage(MetadataPageMixin, Page):
settings_panels = [
FieldPanel("matomo_id"),
+ FieldPanel("donation_page"),
+ MultiFieldPanel(
+ [FieldPanel("contact_email"), FieldPanel("contact_newcomers"),],
+ gettext_lazy("Kontakty"),
+ ),
]
### RELATIONS
@@ -68,7 +92,7 @@ class DistrictHomePage(MetadataPageMixin, Page):
return self
-class DistrictArticles(MetadataPageMixin, Page):
+class DistrictArticles(SubpageMixin, MetadataPageMixin, Page):
### FIELDS
max_items = models.IntegerField(
diff --git a/district/templates/district/base.html b/district/templates/district/base.html
index 0b869114..d0f4b7ce 100644
--- a/district/templates/district/base.html
+++ b/district/templates/district/base.html
@@ -64,52 +64,285 @@
{% block content %}{% endblock %}
</div>
+
<footer class="footer bg-grey-700 text-white __js-root">
- <ui-app inline-template>
- <div>
- <div class="footer__main py-4 lg:py-16 container container--default">
- <section class="footer__brand">
- <a href="https://www.pirati.cz">
- <img src="{% static "uniweb/assets/images/logo.svg" %}" alt="logo pirátské strany" class="w-32 md:w-40 pb-6" />
- </a>
- <p class="para hidden md:block md:mb-4 lg:mb-0 text-grey-200">
- <span class="copyleft inline-block">©</span> {% now "Y" %} Piráti. Všechna práva vyhlazena. SdĂlejte a nechte ostatnĂ sdĂlet za stejnĂ˝ch podmĂnek.
- </p>
- </section>
- <section class="footer__social lg:text-right">
- <div class="mb-4">
- <div class="social-icon-group space-x-2 text-white pb-4">
- <a href="https://www.pirati.cz" class="social-icon "><i class="ico--home"></i></a>
- <a href="https://www.facebook.com/ceska.piratska.strana/" class="social-icon "><i class="ico--facebook"></i></a>
- <a href="https://twitter.com/PiratskaStrana" class="social-icon "><i class="ico--twitter"></i></a>
- <a href="https://www.youtube.com/user/CeskaPiratskaStrana" class="social-icon "><i class="ico--youtube"></i></a>
- <a href="https://www.instagram.com/pirati.cz/" class="social-icon "><i class="ico--instagram"></i></a>
- <a href="https://www.flickr.com/photos/pirati/" class="social-icon "><i class="ico--flickr"></i></a>
- </div>
+
+ <ui-app inline-template>
+
+ <div>
+ <div class="footer__main py-4 lg:py-16 container container--default pt-5">
+
+ <section class="footer__brand">
+ <img src="https://styleguide.pir-test.eu/latest//images/logo-full-white.svg" alt="Pirátská strana" class="w-32 md:w-40 pb-6" />
+ <p class="para hidden md:block md:mb-4 lg:mb-0 text-grey-200">
+ Piráti, 2020. Všechna práva vyhlazena.
+ SdĂlejte a nechte ostatnĂ sdĂlet za stejnĂ˝ch podmĂnek.
+ </p>
+ </section>
+
+ <section class="footer__main-links bg-grey-700 text-white lg:grid grid-cols-3 gap-4">
+ <div class="pb-4">
+ <ui-footer-collapsible label="Připoj se">
+ <ul class="mt-6 space-y-2 text-grey-200">
+ <li><a href="{{ page.root_page.contact_newcomers|default:"https://nalodeni.pirati.cz" }}">Zájemci o ÄŤlenstvĂ</a></li>
+ <li><a href="/kontakt/">Dej nám vědět</a></li>
+ <li><a href="https://nalodeni.pirati.cz">NalodÄ›nĂ</a></li>
+ </ul>
+ </ui-footer-collapsible>
</div>
- <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 md:space-y-0 md:space-x-2 lg:space-x-0 lg:space-y-2">
- <a href="https://dary.pirati.cz" class="btn btn--icon btn--cyan-200 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth">
- <div class="btn__body-wrap">
- <div class="btn__body ">Přispěj</div>
- <div class="btn__icon ">
- <i class="ico--pig"></i>
- </div>
+
+ <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <ui-footer-collapsible label="Makáme">
+ <ul class="mt-6 space-y-2 text-grey-200">
+ <li><a href="/lide/">Lidé</a></li>
+ <li><a href="/aktuality/">Aktuality</a></li>
+ </ul>
+ </ui-footer-collapsible>
+ </div>
+
+ <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <ui-footer-collapsible label="Otevřenost">
+ <ul class="mt-6 space-y-2 text-grey-200">
+ <li><a href="https://ucet.pirati.cz">Transparentnà účet</a></li>
+ <li><a href="https://smlouvy.pirati.cz">Registr smluv</a></li>
+ <li><a href="https://wiki.pirati.cz/fo/otevrene_ucetnictvi">OtevĹ™enĂ© účetnictvĂ</a></li>
+ </ul>
+ </ui-footer-collapsible>
+ </div>
+ </section>
+
+ <section class="footer__social lg:text-right">
+ <div class="mb-4">
+ <div class="social-icon-group space-x-2 text-white pb-4">
+ <a href="https://www.twitter.com/PiratskaStrana" rel="noopener noreferrer" target="_blank" title="Náš účet na Twitteru" class="social-icon "><i class="ico--twitter"></i></a>
+ <a href="/feed.xml" rel="noopener noreferrer" target="_blank" title="Články tohoto webu v RSS" class="social-icon "><i class="ico--feed"></i></a>
+ <a href=https://www.instagram.com/pirati.cz/ rel="noopener noreferrer" target="_blank" title="Instagram - Česká pirátská strana" class="social-icon "><i class="ico--instagram"></i></a>
+ <a href=https://www.flickr.com/photos/pirati/ rel="noopener noreferrer" target="_blank" title="Flickr - Česká pirátská strana" class="social-icon "><i class="ico--flickr"></i></a>
+ <a href="mailto:{{ page.root_page.contact_email|default:"info@pirati.cz" }}" class="social-icon "><i class="ico--envelope"></i></a>
+ </div>
+ <a href="mailto:{{ page.root_page.contact_email|default:"info@pirati.cz" }}" class="contact-line icon-link content-block--nostyle " ><i class="ico--envelope"></i><span>Dejte nám vědět</span></a>
+ </div>
+
+ <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 lg:space-x-0 mr-0 pr-0">
+ <a href="{{ page.root_page.donation_page|default:"https://dary.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth px-0 mx-0">
+ <div class="btn__body-wrap">
+ <div class="btn__body ">Přispěj</div>
+ <div class="btn__icon ">
+ <i class="ico--pig"></i>
</div>
- </a>
- <a href="https://nalodeni.pirati.cz" class="btn btn--icon btn--blue-300 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth">
- <div class="btn__body-wrap">
- <div class="btn__body ">NaloÄŹ se</div>
- <div class="btn__icon ">
- <i class="ico--anchor"></i>
- </div>
+ </div>
+ </a>
+
+ <a href="https://nalodeni.pirati.cz" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth mt-0 px-0 mx-0">
+ <div class="btn__body-wrap">
+ <div class="btn__body ">NaloÄŹ se</div>
+ <div class="btn__icon ">
+ <i class="ico--anchor"></i>
</div>
- </a>
- </div>
- </section>
- </div>
+ </div>
+ </a>
+ </div>
+ </section>
+
</div>
- </ui-app>
- </footer>
+
+
+
+ <section class="bg-black py-4 lg:py-12">
+ <div class="container container--default">
+ <div class="grid gap-4 grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
+
+
+<div class="badge ">
+
+
+
+ <a href="/lide/yveta-martinkova/" class="avatar
+ badge__avatar avatar--sm
+">
+ <img src="/assets/d989e6-f3ff0de24e5601b4783127c01a73d5dc22f3fb0b3f4c3965fa329f8a34d4b819.jpg" alt="
+ Yveta Martinková
+" />
+ </a>
+
+
+
+
+ <div class="badge__body">
+ <h2 class="head-heavy-2xs badge__title">
+
+ <a href="/lide/yveta-martinkova/" title="
+ Yveta Martinková
+" class="content-block--nostyle">
+ Yveta Martinková
+</a>
+
+ </h2>
+
+
+ <p class="badge__occupation">
+ Koordinátor
+ </p>
+
+
+
+
+
+
+ <a href="tel:+420 770 113 648" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
+ <i class="ico--phone"></i>
+ <span>+420 770 113 648</span>
+</a>
+
+
+
+
+ <a href="mailto:yveta.martinkova@pirati.cz" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
+ <i class="ico--envelope"></i>
+ <span>yveta.martinkova@pirati.cz</span>
+</a>
+
+
+
+
+ </div>
+</div>
+
+
+
+
+
+
+
+<div class="badge ">
+
+
+
+ <a href="/lide/jaromir-horky/" class="avatar
+ badge__avatar avatar--sm
+">
+ <img src="/assets/d6b500-5107c589366d0e824b13e9ceb7ef2dcc2a93317a5733481a4fd0dc66ce6f1be6.jpg" alt="
+ JaromĂr HorkĂ˝
+" />
+ </a>
+
+
+
+
+ <div class="badge__body">
+ <h2 class="head-heavy-2xs badge__title">
+
+ <a href="/lide/jaromir-horky/" title="
+ JaromĂr HorkĂ˝
+" class="content-block--nostyle">
+ JaromĂr HorkĂ˝
+</a>
+
+ </h2>
+
+
+ <p class="badge__occupation">
+
+ VolebnĂ manaĹľer
+
+ </p>
+
+
+
+
+
+
+ <a href="tel:+420 774 942 021" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
+ <i class="ico--phone"></i>
+ <span>+420 774 942 021</span>
+</a>
+
+
+
+
+ <a href="mailto:jaromir.horky@pirati.cz" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
+ <i class="ico--envelope"></i>
+ <span>jaromir.horky@pirati.cz</span>
+</a>
+
+
+
+
+ </div>
+</div>
+
+
+
+
+
+
+
+<div class="badge ">
+
+
+
+ <a href="/lide/jaromir-horky/" class="avatar
+ badge__avatar avatar--sm
+">
+ <img src="/assets/d6b500-5107c589366d0e824b13e9ceb7ef2dcc2a93317a5733481a4fd0dc66ce6f1be6.jpg" alt="
+ JaromĂr HorkĂ˝
+" />
+ </a>
+
+
+
+
+ <div class="badge__body">
+ <h2 class="head-heavy-2xs badge__title">
+
+ <a href="/lide/jaromir-horky/" title="
+ JaromĂr HorkĂ˝
+" class="content-block--nostyle">
+ JaromĂr HorkĂ˝
+</a>
+
+ </h2>
+
+
+ <p class="badge__occupation">
+
+ Kontakt pro novináře
+
+ </p>
+
+
+
+
+
+
+ <a href="tel:+420 774 942 021" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
+ <i class="ico--phone"></i>
+ <span>+420 774 942 021</span>
+</a>
+
+
+
+
+ <a href="mailto:jaromir.horky@pirati.cz" class="contact-line icon-link content-block--nostyle contact-line--responsive badge__link" >
+ <i class="ico--envelope"></i>
+ <span>jaromir.horky@pirati.cz</span>
+</a>
+
+
+
+
+ </div>
+</div>
+
+
+
+ </div>
+ </div>
+ </section>
+ </div>
+ </ui-app>
+</footer>
+
<script src="{% static "uniweb/assets/js/vue.2.6.11.js" %}"></script>
<script src="{% static "uniweb/assets/js/main.bundle.js" %}"></script>
--
GitLab