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

feat(district): support candidates from other parties

parent a452c210
No related branches found
No related tags found
2 merge requests!496Release,!491feat(district): rework election page tree from scratch, update to latest styleguide 2.10.0, load styleguide from CDN and more
# Generated by Django 4.0.3 on 2022-05-06 09:49
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailimages", "0023_add_choose_permissions"),
("district", "0068_districtelectioncampaignpage_and_more"),
]
operations = [
migrations.AddField(
model_name="districtpersonpage",
name="other_party",
field=models.CharField(
blank=True,
help_text="Vyplňte pokud osoba není Pirát",
max_length=64,
null=True,
verbose_name="Strana",
),
),
migrations.AddField(
model_name="districtpersonpage",
name="other_party_logo",
field=models.ForeignKey(
blank=True,
help_text="Vyplňte pokud osoba není Pirát",
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name="+",
to="wagtailimages.image",
verbose_name="Logo strany",
),
),
]
...@@ -661,6 +661,22 @@ class DistrictPersonPage( ...@@ -661,6 +661,22 @@ class DistrictPersonPage(
city = models.CharField("Město/obec", max_length=64, blank=True, null=True) city = models.CharField("Město/obec", max_length=64, blank=True, null=True)
age = models.IntegerField("Věk", blank=True, null=True) age = models.IntegerField("Věk", blank=True, null=True)
is_pirate = models.BooleanField("Je členem Pirátské strany?", default=True) is_pirate = models.BooleanField("Je členem Pirátské strany?", default=True)
other_party = models.CharField(
"Strana",
max_length=64,
blank=True,
null=True,
help_text="Vyplňte pokud osoba není Pirát",
)
other_party_logo = models.ForeignKey(
"wagtailimages.Image",
on_delete=models.PROTECT,
blank=True,
null=True,
related_name="+",
verbose_name="Logo strany",
help_text="Vyplňte pokud osoba není Pirát",
)
facebook_url = models.URLField("Odkaz na Facebook", blank=True, null=True) facebook_url = models.URLField("Odkaz na Facebook", blank=True, null=True)
instagram_url = models.URLField("Odkaz na Instagram", blank=True, null=True) instagram_url = models.URLField("Odkaz na Instagram", blank=True, null=True)
...@@ -700,6 +716,8 @@ class DistrictPersonPage( ...@@ -700,6 +716,8 @@ class DistrictPersonPage(
FieldPanel("city"), FieldPanel("city"),
FieldPanel("age"), FieldPanel("age"),
FieldPanel("is_pirate"), FieldPanel("is_pirate"),
FieldPanel("other_party"),
ImageChooserPanel("other_party_logo"),
], ],
"Kontaktní informace", "Kontaktní informace",
), ),
......
...@@ -90,6 +90,19 @@ ...@@ -90,6 +90,19 @@
</div> </div>
{% endif %} {% endif %}
{% if not page.is_pirate and page.other_party %}
<hr>
<div class="flex items-center">
{% if page.other_party_logo %}
{% image page.other_party_logo width-48 as logo_img %}
<div class="avatar w-6 mr-2">
<img src="{{ logo_img.url }}" alt="{{ page.other_party }}">
</div>
{% endif %}
<span class="font-bold font-condensed">{{ page.other_party }}</span>
</div>
{% endif %}
{% if page.phone or page.email and page.show_email %} {% if page.phone or page.email and page.show_email %}
<hr> <hr>
<div class="content-block"> <div class="content-block">
......
...@@ -25,8 +25,17 @@ ...@@ -25,8 +25,17 @@
<img src="{% static "shared/img/logo_black.svg" %}" alt="Pirátská strana"> <img src="{% static "shared/img/logo_black.svg" %}" alt="Pirátská strana">
</div> </div>
<span class="font-bold font-condensed">Pirátská strana</span> <span class="font-bold font-condensed">Pirátská strana</span>
{% else %} {% endif %}
<span class="font-bold font-condensed">bez politické příslušnosti</span>
{% if not person_page.is_pirate and person_page.other_party %}
{% if person_page.other_party_logo %}
{% image person_page.other_party_logo width-48 as logo_img %}
<div class="avatar w-6 mr-2">
<img src="{{ logo_img.url }}" alt="{{ person_page.other_party }}">
</div>
{% endif %}
<span class="font-bold font-condensed">{{ person_page.other_party }}</span>
{% endif %} {% endif %}
</div> </div>
</div> </div>
......
...@@ -44,8 +44,17 @@ ...@@ -44,8 +44,17 @@
<img src="{% static "shared/img/logo_black.svg" %}" alt="Pirátská strana"> <img src="{% static "shared/img/logo_black.svg" %}" alt="Pirátská strana">
</div> </div>
<span class="font-bold font-condensed">Pirátská strana</span> <span class="font-bold font-condensed">Pirátská strana</span>
{% else %} {% endif %}
<span class="font-bold font-condensed">bez politické příslušnosti</span>
{% if not person_page.is_pirate and person_page.other_party %}
{% if person_page.other_party_logo %}
{% image person_page.other_party_logo width-48 as logo_img %}
<div class="avatar w-6 mr-2">
<img src="{{ logo_img.url }}" alt="{{ person_page.other_party }}">
</div>
{% endif %}
<span class="font-bold font-condensed">{{ person_page.other_party }}</span>
{% endif %} {% endif %}
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment