From 75de54c0335f433dc1b4573c3b7dc80405b0b8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Wed, 3 Jun 2020 18:27:46 +0200
Subject: [PATCH] senat campaign: Degree before and after name
---
.../migrations/0007_auto_20200603_1815.py | 27 +++++++++++++++++++
senat_campaign/models.py | 8 ++++++
.../senat_campaign_home_page.html | 2 +-
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 senat_campaign/migrations/0007_auto_20200603_1815.py
diff --git a/senat_campaign/migrations/0007_auto_20200603_1815.py b/senat_campaign/migrations/0007_auto_20200603_1815.py
new file mode 100644
index 00000000..5541afc3
--- /dev/null
+++ b/senat_campaign/migrations/0007_auto_20200603_1815.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.0.6 on 2020-06-03 16:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("senat_campaign", "0006_auto_20200601_1819"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="senatcampaignhomepage",
+ name="degree_after",
+ field=models.CharField(
+ blank=True, max_length=250, null=True, verbose_name="titul za jménem"
+ ),
+ ),
+ migrations.AddField(
+ model_name="senatcampaignhomepage",
+ name="degree_before",
+ field=models.CharField(
+ blank=True, max_length=250, null=True, verbose_name="titul před jménem"
+ ),
+ ),
+ ]
diff --git a/senat_campaign/models.py b/senat_campaign/models.py
index 2500019a..b3fb5250 100644
--- a/senat_campaign/models.py
+++ b/senat_campaign/models.py
@@ -110,6 +110,12 @@ class SenatCampaignHomePage(Page, MetadataPageMixin, CalendarMixin):
# settings
first_name = models.CharField("jméno", max_length=250)
last_name = models.CharField("příjmení", max_length=250)
+ degree_before = models.CharField(
+ "titul před jménem", max_length=250, blank=True, null=True
+ )
+ degree_after = models.CharField(
+ "titul za jménem", max_length=250, blank=True, null=True
+ )
facebook = models.URLField("Facebook URL", blank=True, null=True)
instagram = models.URLField("Instagram URL", blank=True, null=True)
twitter = models.URLField("Twitter URL", blank=True, null=True)
@@ -124,8 +130,10 @@ class SenatCampaignHomePage(Page, MetadataPageMixin, CalendarMixin):
content_panels = Page.content_panels + [
MultiFieldPanel(
[
+ FieldPanel("degree_before"),
FieldPanel("first_name"),
FieldPanel("last_name"),
+ FieldPanel("degree_after"),
FieldPanel("headline"),
],
heading="úvod",
diff --git a/senat_campaign/templates/senat_campaign/senat_campaign_home_page.html b/senat_campaign/templates/senat_campaign/senat_campaign_home_page.html
index 50cd661f..9cce9d96 100644
--- a/senat_campaign/templates/senat_campaign/senat_campaign_home_page.html
+++ b/senat_campaign/templates/senat_campaign/senat_campaign_home_page.html
@@ -11,7 +11,7 @@
<div class="row align-items-center">
<div class="col-12 col-md-7 col-lg-7 mb-5 mb-md-0 py-4 text-center text-md-left">
- <h1 class="lead homepage-heading">{{ page.root_page.full_name }}</h1>
+ <h1 class="lead homepage-heading">{% if page.degree_before %}<small>{{ page.degree_before }}</small> {% endif %}{{ page.root_page.full_name }}{% if page.degree_after %}<small>, {{ page.degree_after }}</small>{% endif %}</h1>
<p class="lead mb-5">{{ page.headline }}</p>
<div class="row align-items-center">
--
GitLab