From f75e1562a507161bb54ba5173787a7db6547f05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Fri, 17 May 2024 13:52:23 +0200
Subject: [PATCH] migrate further pages
---
.../migrations/0161_auto_20240513_1733.py | 82 ++++++++++-
..._districtpersonpage_after_name_and_more.py | 83 +----------
...0_remove_districthomepage_calendar_page.py | 17 +++
.../0191_delete_districtpersontag.py | 16 ++
district/models.py | 137 +++++++++---------
.../district/blocks/contact_block.html | 2 +-
.../district/blocks/people_group_block.html | 2 +-
.../district/blocks/program_block.html | 2 +-
.../district/district_calendar_page.html | 23 ++-
.../templates/district/district_pdf_page.html | 8 +-
main/blocks.py | 43 +-----
main/models.py | 20 +--
maps_utils/blocks.py | 2 +
shared/blocks/main.py | 45 ++++++
shared/models/main.py | 36 +++++
shared/templates/shared/pdf_snippet.html | 10 +-
.../organisms/layout/district/navbar.html | 23 +++
.../includes/organisms/layout/navbar.html | 4 +-
shared/templates/styleguide2/simple_page.html | 14 +-
.../uniweb/blocks/people_group_block.html | 2 +-
20 files changed, 330 insertions(+), 241 deletions(-)
create mode 100644 district/migrations/0190_remove_districthomepage_calendar_page.py
create mode 100644 district/migrations/0191_delete_districtpersontag.py
diff --git a/district/migrations/0161_auto_20240513_1733.py b/district/migrations/0161_auto_20240513_1733.py
index e6310b3d..01d33c7c 100644
--- a/district/migrations/0161_auto_20240513_1733.py
+++ b/district/migrations/0161_auto_20240513_1733.py
@@ -1,7 +1,7 @@
# Generated by Django 5.0.4 on 2024-05-13 15:33
import wagtail
-from django.db import migrations
+from django.db import migrations, models
from wagtail.blocks import PageChooserBlock
from district.blocks import PeopleGroupBlock
@@ -189,5 +189,85 @@ class Migration(migrations.Migration):
verbose_name="Lidé a týmy",
),
),
+ migrations.AddField(
+ model_name="districtpersonpage",
+ name="after_name",
+ field=models.CharField(
+ blank=True, max_length=16, null=True, verbose_name="Tituly za jménem"
+ ),
+ ),
+ migrations.AddField(
+ model_name="districtpersonpage",
+ name="before_name",
+ field=models.CharField(
+ blank=True, max_length=32, null=True, verbose_name="Tituly před jménem"
+ ),
+ ),
+ migrations.AddField(
+ model_name="districtpersonpage",
+ name="perex",
+ field=models.TextField(default=""),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name="districtpersonpage",
+ name="position",
+ field=models.CharField(
+ blank=True, max_length=200, null=True, verbose_name="Pozice/povolání"
+ ),
+ ),
+ migrations.AddField(
+ model_name="districtpersonpage",
+ name="primary_group",
+ field=models.CharField(
+ blank=True,
+ help_text="např. 'Europarlament' nebo 'Sněmovna'",
+ max_length=32,
+ null=True,
+ verbose_name="Kategorie",
+ ),
+ ),
+ migrations.AddField(
+ model_name="districtpersonpage",
+ name="related_people",
+ field=wagtail.fields.StreamField(
+ [
+ (
+ "person",
+ wagtail.blocks.PageChooserBlock(
+ label="Detail osoby", page_type=["main.MainPersonPage"]
+ ),
+ )
+ ],
+ blank=True,
+ verbose_name="Další lidé",
+ ),
+ ),
+ migrations.AddField(
+ model_name="districtpersonpage",
+ name="social_links",
+ field=wagtail.fields.StreamField(
+ [
+ (
+ "social_links",
+ wagtail.blocks.StructBlock(
+ [
+ ("text", wagtail.blocks.CharBlock(label="Název")),
+ ("link", wagtail.blocks.URLBlock(label="Odkaz")),
+ (
+ "icon",
+ wagtail.blocks.CharBlock(
+ help_text="Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons <br/>Název ikony zadejte bez tečky na začátku",
+ label="Ikona",
+ ),
+ ),
+ ]
+ ),
+ )
+ ],
+ blank=True,
+ verbose_name="Odkazy na sociální sítě",
+ ),
+ ),
migrations.RunPython(migrate_people_blocks),
]
diff --git a/district/migrations/0170_districtpersonpage_after_name_and_more.py b/district/migrations/0170_districtpersonpage_after_name_and_more.py
index 0df093d1..47324333 100644
--- a/district/migrations/0170_districtpersonpage_after_name_and_more.py
+++ b/district/migrations/0170_districtpersonpage_after_name_and_more.py
@@ -1,7 +1,5 @@
# Generated by Django 5.0.4 on 2024-05-15 09:09
-import wagtail.blocks
-import wagtail.fields
from django.db import migrations, models
@@ -11,84 +9,5 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.AddField(
- model_name="districtpersonpage",
- name="after_name",
- field=models.CharField(
- blank=True, max_length=16, null=True, verbose_name="Tituly za jménem"
- ),
- ),
- migrations.AddField(
- model_name="districtpersonpage",
- name="before_name",
- field=models.CharField(
- blank=True, max_length=32, null=True, verbose_name="Tituly před jménem"
- ),
- ),
- migrations.AddField(
- model_name="districtpersonpage",
- name="perex",
- field=models.TextField(default=""),
- preserve_default=False,
- ),
- migrations.AddField(
- model_name="districtpersonpage",
- name="position",
- field=models.CharField(
- blank=True, max_length=200, null=True, verbose_name="Pozice/povolání"
- ),
- ),
- migrations.AddField(
- model_name="districtpersonpage",
- name="primary_group",
- field=models.CharField(
- blank=True,
- help_text="např. 'Europarlament' nebo 'Sněmovna'",
- max_length=32,
- null=True,
- verbose_name="Kategorie",
- ),
- ),
- migrations.AddField(
- model_name="districtpersonpage",
- name="related_people",
- field=wagtail.fields.StreamField(
- [
- (
- "person",
- wagtail.blocks.PageChooserBlock(
- label="Detail osoby", page_type=["main.MainPersonPage"]
- ),
- )
- ],
- blank=True,
- verbose_name="Další lidé",
- ),
- ),
- migrations.AddField(
- model_name="districtpersonpage",
- name="social_links",
- field=wagtail.fields.StreamField(
- [
- (
- "social_links",
- wagtail.blocks.StructBlock(
- [
- ("text", wagtail.blocks.CharBlock(label="Název")),
- ("link", wagtail.blocks.URLBlock(label="Odkaz")),
- (
- "icon",
- wagtail.blocks.CharBlock(
- help_text="Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons <br/>Název ikony zadejte bez tečky na začátku",
- label="Ikona",
- ),
- ),
- ]
- ),
- )
- ],
- blank=True,
- verbose_name="Odkazy na sociální sítě",
- ),
- ),
+
]
diff --git a/district/migrations/0190_remove_districthomepage_calendar_page.py b/district/migrations/0190_remove_districthomepage_calendar_page.py
new file mode 100644
index 00000000..fd25fb5a
--- /dev/null
+++ b/district/migrations/0190_remove_districthomepage_calendar_page.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.4 on 2024-05-17 09:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('district', '0189_auto_20240516_1526'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='districthomepage',
+ name='calendar_page',
+ ),
+ ]
diff --git a/district/migrations/0191_delete_districtpersontag.py b/district/migrations/0191_delete_districtpersontag.py
new file mode 100644
index 00000000..1d2a60e0
--- /dev/null
+++ b/district/migrations/0191_delete_districtpersontag.py
@@ -0,0 +1,16 @@
+# Generated by Django 5.0.4 on 2024-05-17 11:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('district', '0190_remove_districthomepage_calendar_page'),
+ ]
+
+ operations = [
+ migrations.DeleteModel(
+ name='DistrictPersonTag',
+ ),
+ ]
diff --git a/district/models.py b/district/models.py
index 5a42dd37..086db466 100644
--- a/district/models.py
+++ b/district/models.py
@@ -86,6 +86,9 @@ CONTENT_BLOCKS = DEFAULT_CONTENT_BLOCKS + [
]
+# --- BEGIN Migrated models ---
+
+
class DistrictHomePage(
RoutablePageMixin,
ExtendedMetadataHomePageMixin,
@@ -149,14 +152,6 @@ class DistrictHomePage(
# --- END New fields ---
- calendar_page = models.ForeignKey(
- "DistrictCalendarPage",
- verbose_name="Stránka s kalendářem",
- on_delete=models.PROTECT,
- null=True,
- blank=True,
- )
-
calendar_button_text = models.CharField(
"Text tlačítka kalendáře", max_length=256, default="Kalendář"
)
@@ -236,15 +231,9 @@ class DistrictHomePage(
MultiFieldPanel(
[
FieldPanel("calendar_button_text"),
- MultiFieldPanel(
- [
- FieldPanel("calendar_url"),
- PageChooserPanel("calendar_page"),
- ],
- "Kalendář",
- ),
+ FieldPanel("calendar_url"),
],
- gettext_lazy("Nastavení lišty s kalendářem a mapou"),
+ gettext_lazy("Kalendář"),
),
MultiFieldPanel(
[
@@ -359,6 +348,10 @@ class DistrictHomePage(
def interactive_program_page(self):
return self._first_subpage_of_type(DistrictInteractiveProgramPage)
+ @property
+ def calendar_page(self):
+ return self._first_subpage_of_type(DistrictCalendarPage)
+
@property
def root_page(self):
return self
@@ -444,14 +437,6 @@ class DistrictContactPage(MainContactPageMixin):
verbose_name = "Kontakty"
-class DistrictPersonTag(TaggedItemBase):
- content_object = ParentalKey(
- "district.DistrictPersonPage",
- on_delete=models.CASCADE,
- related_name="tagged_items",
- )
-
-
class DistrictPersonPage(MainPersonPageMixin):
### FIELDS
job = models.CharField(
@@ -570,6 +555,59 @@ class DistrictPeoplePage(MainPeoplePageMixin):
subpage_types = ["district.DistrictPersonPage"]
+class DistrictCalendarPage(SubpageMixin, MetadataPageMixin, CalendarMixin, Page):
+ """
+ Page for displaying full calendar
+ """
+
+ ### PANELS
+
+ content_panels = Page.content_panels + [FieldPanel("calendar_url")]
+
+ ### RELATIONS
+
+ parent_page_types = [
+ "district.DistrictCenterPage",
+ "district.DistrictHomePage",
+ ]
+ subpage_types = []
+
+ ### OTHERS
+
+ class Meta:
+ verbose_name = "Stránka s kalendářem"
+
+
+class DistrictPdfPage(PdfPageMixin, MetadataPageMixin, SubpageMixin, Page):
+ """
+ Single pdf page display
+ """
+
+ ### RELATIONS
+
+ parent_page_types = [
+ "district.DistrictHomePage",
+ "district.DistrictArticlePage",
+ ]
+ subpage_types = []
+
+ ### PANELS
+
+ content_panels = Page.content_panels + PdfPageMixin.content_panels
+
+ ### OTHER
+
+ class Meta:
+ verbose_name = "PDF stránka"
+
+
+class DistrictNewProgramPage():
+ pass
+
+
+# --- END Migrated models ---
+
+
class DistrictElectionBasePage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page
):
@@ -1435,30 +1473,6 @@ class DistrictGeoFeatureCollectionCategory(Orderable):
def make_feature_index_cache_key(feature: "DistrictGeoFeatureDetailPage"):
return f"DistrictGeoFeatureDetailPage::{feature.id}::index"
-
-class DistrictCalendarPage(SubpageMixin, MetadataPageMixin, CalendarMixin, Page):
- """
- Page for displaying full calendar
- """
-
- ### PANELS
-
- content_panels = Page.content_panels + [FieldPanel("calendar_url")]
-
- ### RELATIONS
-
- parent_page_types = [
- "district.DistrictCenterPage",
- "district.DistrictHomePage",
- ]
- subpage_types = []
-
- ### OTHERS
-
- class Meta:
- verbose_name = "Stránka s kalendářem"
-
-
class DistrictGeoFeatureDetailPage(
ExtendedMetadataPageMixin, MetadataPageMixin, SubpageMixin, Page, Orderable
):
@@ -1660,28 +1674,9 @@ class DistrictGeoFeatureDetailPage(
self.geojson = maps_validators.normalize_geojson_feature_collection(
self.geojson, allowed_types=SUPPORTED_FEATURE_TYPES
)
- except ValueError as exc:
- raise ValidationError({"geojson": str(exc)}) from exc
-
-
-class DistrictPdfPage(PdfPageMixin, MetadataPageMixin, SubpageMixin, Page):
- """
- Single pdf page display
- """
-
- ### RELATIONS
- parent_page_types = [
- "district.DistrictHomePage",
- "district.DistrictArticlePage",
- ]
- subpage_types = []
-
- ### PANELS
-
- content_panels = Page.content_panels + PdfPageMixin.content_panels
-
- ### OTHER
+ print(self.geojson)
+ except ValueError as exc:
+ print(exc)
- class Meta:
- verbose_name = "PDF stránka"
+ raise ValidationError({"geojson": str(exc)}) from exc
diff --git a/district/templates/district/blocks/contact_block.html b/district/templates/district/blocks/contact_block.html
index 162d56ba..4d7801a4 100644
--- a/district/templates/district/blocks/contact_block.html
+++ b/district/templates/district/blocks/contact_block.html
@@ -5,7 +5,7 @@
<div class="space-y-4">
{% for contact_details in self.contact_list %}
{% with contact_details.person as person_page %}
- {% include "shared/person_badge_snippet.html" with title=contact_details.position|default:person_page.job_function %}
+ {% include "shared/person_badge_snippet.html" with title=contact_details.position|default:person_page.job %}
{% endwith %}
{% endfor %}
</div>
diff --git a/district/templates/district/blocks/people_group_block.html b/district/templates/district/blocks/people_group_block.html
index 752458f0..7956df0e 100644
--- a/district/templates/district/blocks/people_group_block.html
+++ b/district/templates/district/blocks/people_group_block.html
@@ -5,7 +5,7 @@
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 row-gap-8 col-gap-8">
{% for person_details in self.person_list %}
{% with person_details.person as person_page %}
- {% include "shared/person_badge_snippet.html" with title=person_details.position|default:person_page.job_function %}
+ {% include "shared/person_badge_snippet.html" with title=person_details.position|default:person_page.job %}
{% endwith %}
{% endfor %}
</div>
diff --git a/district/templates/district/blocks/program_block.html b/district/templates/district/blocks/program_block.html
index 29446bce..0b600586 100644
--- a/district/templates/district/blocks/program_block.html
+++ b/district/templates/district/blocks/program_block.html
@@ -15,7 +15,7 @@
<div class="card__body">
{% with self.person.person as person_page %}
- {% include "shared/person_badge_snippet.html" with title=self.person.position|default:person_page.job_function %}
+ {% include "shared/person_badge_snippet.html" with title=self.person.position|default:person_page.job %}
{% endwith %}
<div class="content-block">
diff --git a/district/templates/district/district_calendar_page.html b/district/templates/district/district_calendar_page.html
index ea4930b2..7d008b1a 100644
--- a/district/templates/district/district_calendar_page.html
+++ b/district/templates/district/district_calendar_page.html
@@ -1,10 +1,17 @@
-{% extends "district/base.html" %}
-{% load wagtailcore_tags %}
+{% extends "styleguide2/simple_page.html" %}
-{% block content %}
-<main>
- <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
- {% include "shared/calendar_current_events_snippet.html" with fullscreen=True calendar=page.calendar %}
- </section>
-</main>
+{% block navbar %}
+ {% include 'styleguide2/includes/organisms/layout/district/navbar.html' with selected_item=page.get_menu_title %}
+{% endblock %}
+
+{% block inner_content %}
+ <div class="__js-root">
+ <ui-full-calendar
+ {% if page.calendar_url %}
+ events='{{ page.get_fullcalendar_data|safe }}'
+ {% else %}
+ events='{{ page.root_page.get_fullcalendar_data|safe }}'
+ {% endif %}
+ ></ui-full-calendar>
+ </div>
{% endblock %}
diff --git a/district/templates/district/district_pdf_page.html b/district/templates/district/district_pdf_page.html
index dd4bd8bc..b6040ebd 100644
--- a/district/templates/district/district_pdf_page.html
+++ b/district/templates/district/district_pdf_page.html
@@ -1,5 +1,9 @@
-{% extends "district/base.html" %}
+{% extends "styleguide2/simple_page.html" %}
-{% block content %}
+{% block navbar %}
+ {% include 'styleguide2/includes/organisms/layout/district/navbar.html' with selected_item=page.get_menu_title %}
+{% endblock %}
+
+{% block inner_content %}
{% include "shared/pdf_snippet.html" with download_link=True %}
{% endblock %}
diff --git a/main/blocks.py b/main/blocks.py
index 2c3509df..430921cd 100644
--- a/main/blocks.py
+++ b/main/blocks.py
@@ -18,6 +18,7 @@ from shared.blocks import (
CardLinkWithHeadlineBlockMixin,
CTAMixin,
PersonContactBlockMixin,
+ ProgramGroupBlockMixin,
)
from shared.blocks import ProgramGroupBlockPopout as SharedProgramGroupBlockPopout
@@ -44,20 +45,6 @@ class CardLinkBlock(CardLinkBlockMixin):
label = "Karta s odkazem"
-class ProgramGroupBlockMixin(StructBlock):
- title = CharBlock(label="Titulek části programu")
- # point_list = ListBlock(ProgramBlock(), label="Jednotlivé články programu")
-
- class Meta:
- icon = "date"
- # label = "Skupina programů"
-
- def get_prep_value(self, value):
- value = super().get_prep_value(value)
- value["slug"] = slugify(value["title"])
- return value
-
-
class BoxesBlock(StructBlock):
title = CharBlock(label="Nadpis")
list = ListBlock(BoxBlock, label="Boxíky")
@@ -128,34 +115,6 @@ class PeopleGroupBlock(StructBlock):
return value
-class ProgramBlock(StructBlock):
- url = URLBlock(
- label="Odkaz pokrývající celou tuto část",
- required=False,
- )
- icon = ImageChooserBlock(
- label="Ikona",
- required=False,
- )
- title = CharBlock(label="Titulek článku programu")
- text = RichTextBlock(
- label="Obsah",
- features=PROGRAM_RICH_TEXT_FEATURES,
- )
-
- class Meta:
- icon = "date"
- label = "Článek programu"
-
-
-class ProgramGroupBlock(ProgramGroupBlockMixin):
- point_list = ListBlock(ProgramBlock(), label="Jednotlivé články programu")
-
- class Meta:
- icon = "date"
- label = "Běžný program"
-
-
class ProgramGroupBlockCrossroad(ProgramGroupBlockMixin):
point_list = ListBlock(CardLinkBlock(), label="Karty programu")
diff --git a/main/models.py b/main/models.py
index ce830516..33bbabd9 100644
--- a/main/models.py
+++ b/main/models.py
@@ -42,6 +42,7 @@ from shared.models import ( # MenuMixin,
MainPersonPageMixin,
MainSearchPageMixin,
MainSimplePageMixin,
+ MainProgramPageMixin,
PageInMenuMixin,
SharedTaggedMainArticle,
SubpageMixin,
@@ -181,14 +182,12 @@ class MainArticlePage(MainArticlePageMixin):
subpage_types = []
-class MainProgramPage(
- ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page
-):
+class MainProgramPage(MainProgramPageMixin):
### FIELDS
program = StreamField(
[
- ("program_group", blocks.ProgramGroupBlock()),
+ ("program_group", shared_blocks.ProgramGroupBlock()),
("program_group_crossroad", blocks.ProgramGroupBlockCrossroad()),
("program_group_popout", blocks.ProgramGroupBlockPopout()),
("elections_program", blocks.ElectionsProgramBlock()),
@@ -198,24 +197,11 @@ class MainProgramPage(
use_json_field=True,
)
- ### PANELS
-
- content_panels = Page.content_panels + [FieldPanel("program")]
-
- promote_panels = make_promote_panels()
-
- settings_panels = []
-
### RELATIONS
parent_page_types = ["main.MainHomePage"]
subpage_types = []
- ### OTHERS
-
- class Meta:
- verbose_name = "Program"
-
class MainPeoplePage(MainPeoplePageMixin):
people = StreamField(
diff --git a/maps_utils/blocks.py b/maps_utils/blocks.py
index ba478fae..9b3b1740 100644
--- a/maps_utils/blocks.py
+++ b/maps_utils/blocks.py
@@ -111,6 +111,8 @@ class MapFeatureBlock(blocks.StructBlock):
value["geojson"], allowed_types=SUPPORTED_FEATURE_TYPES
)
except ValueError as exc:
+ print(exc)
+
errors["geojson"] = ErrorList(str(exc))
if errors:
diff --git a/shared/blocks/main.py b/shared/blocks/main.py
index 6572055a..c6711f9c 100644
--- a/shared/blocks/main.py
+++ b/shared/blocks/main.py
@@ -274,3 +274,48 @@ class MainButtonGroupBlock(StructBlock):
template = "styleguide2/includes/atoms/buttons/group.html"
icon = "group"
label = "Skupina tlačítek"
+
+
+# Program
+
+
+class ProgramGroupBlockMixin(StructBlock):
+ title = CharBlock(label="Titulek části programu")
+ # point_list = ListBlock(ProgramBlock(), label="Jednotlivé články programu")
+
+ class Meta:
+ icon = "date"
+ # label = "Skupina programů"
+
+ def get_prep_value(self, value):
+ value = super().get_prep_value(value)
+ value["slug"] = slugify(value["title"])
+ return value
+
+
+class ProgramBlock(StructBlock):
+ url = URLBlock(
+ label="Odkaz pokrývající celou tuto část",
+ required=False,
+ )
+ icon = ImageChooserBlock(
+ label="Ikona",
+ required=False,
+ )
+ title = CharBlock(label="Titulek článku programu")
+ text = RichTextBlock(
+ label="Obsah",
+ features=PROGRAM_RICH_TEXT_FEATURES,
+ )
+
+ class Meta:
+ icon = "date"
+ label = "Článek programu"
+
+
+class ProgramGroupBlock(ProgramGroupBlockMixin):
+ point_list = ListBlock(ProgramBlock(), label="Jednotlivé články programu")
+
+ class Meta:
+ icon = "date"
+ label = "Běžný program"
diff --git a/shared/models/main.py b/shared/models/main.py
index a47a6fdc..65a100bd 100644
--- a/shared/models/main.py
+++ b/shared/models/main.py
@@ -38,6 +38,8 @@ from shared.blocks import (
PersonContactBoxBlock,
SocialLinkBlock,
TwoTextColumnBlock,
+ ProgramGroupBlock,
+ ProgramGroupBlockPopout,
)
from shared.const import MONTH_NAMES
from shared.forms import SubscribeForm
@@ -977,3 +979,37 @@ class MainPersonPageMixin(
verbose_name = "Detail osoby"
abstract = True
# ordering = ("title",)
+
+
+class MainProgramPageMixin(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page):
+ ### FIELDS
+
+ program = StreamField(
+ [
+ ("program_group", ProgramGroupBlock()),
+ ("program_group_popout", ProgramGroupBlockPopout()),
+ ],
+ verbose_name="Program",
+ blank=True,
+ use_json_field=True,
+ )
+
+ ### PANELS
+
+ content_panels = Page.content_panels + [FieldPanel("program")]
+
+ promote_panels = make_promote_panels()
+
+ settings_panels = []
+
+ ### RELATIONS
+
+ # NOTE: Needs to be overridden
+ parent_page_types = []
+ subpage_types = []
+
+ ### OTHERS
+
+ class Meta:
+ verbose_name = "Program"
+ abstract = True
diff --git a/shared/templates/shared/pdf_snippet.html b/shared/templates/shared/pdf_snippet.html
index 2c69fb22..b1bc8d7d 100644
--- a/shared/templates/shared/pdf_snippet.html
+++ b/shared/templates/shared/pdf_snippet.html
@@ -61,17 +61,13 @@
</script>
</div>
- <div class="text-gray-500 my-6" id="loading">
+ <div id="loading">
Načítání ...
</div>
{% if download_link %}
- <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="{{ request.scheme }}://{{ request.get_host }}{{ page.pdf_url }}">
- <button class="btn btn--inline-icon btn--condensed btn--hoveractive btn--grey-500">
- <div class="btn__body">Odkaz ke stažení PDF</div>
- </button>
- </a>
+ <div class="inline-block py-8">
+ {% include "styleguide2/includes/atoms/buttons/round_button.html" with button_text="Stáhnout dokument" url=page.pdf_url %}
</div>
{% endif %}
{% endblock %}
diff --git a/shared/templates/styleguide2/includes/organisms/layout/district/navbar.html b/shared/templates/styleguide2/includes/organisms/layout/district/navbar.html
index b50096bb..f3668d80 100644
--- a/shared/templates/styleguide2/includes/organisms/layout/district/navbar.html
+++ b/shared/templates/styleguide2/includes/organisms/layout/district/navbar.html
@@ -49,3 +49,26 @@
</div>
</div>
{% endblock %}
+
+{% block after_desktop_search %}
+ {% if page.root_page.calendar_page %}
+ <div class="w-24 h-11 min-w-[9rem]">
+ <a
+ href="{{ page.root_page.calendar_page.url }}"
+ class="
+ navbar__border-button
+
+ font-alt flex items-center justify-center border-none border-4 w-24 h-11 py-4 px-3 duration-150 cursor-pointer text-lg gap-1
+
+ hover:no-underline
+
+ xl:w-auto
+ "
+ >
+ <i class="ico--calendar"></i>
+
+ {{ page.root_page.calendar_button_text }}
+ </a>
+ </div>
+ {% endif %}
+{% endblock %}
diff --git a/shared/templates/styleguide2/includes/organisms/layout/navbar.html b/shared/templates/styleguide2/includes/organisms/layout/navbar.html
index 5d6ade14..f7d3c5ed 100644
--- a/shared/templates/styleguide2/includes/organisms/layout/navbar.html
+++ b/shared/templates/styleguide2/includes/organisms/layout/navbar.html
@@ -41,8 +41,10 @@
</div>
<form method="GET" action="{{ page.root_page.search_page.url }}">
- {% include 'styleguide2/includes/atoms/form_fields/form_input.html' with placeholder='Hledej' classes='font-condensed text-black px-2 py-1 w-80' name='q' value=global_search_query %}
+ {% include 'styleguide2/includes/atoms/form_fields/form_input.html' with placeholder='Hledej' classes='text-black p-3 w-60' name='q' value=global_search_query %}
</form>
+
+ {% block after_desktop_search %}{% endblock %}
</div>
<!-- END Social media -->
diff --git a/shared/templates/styleguide2/simple_page.html b/shared/templates/styleguide2/simple_page.html
index 21ee68c5..fd7f7428 100644
--- a/shared/templates/styleguide2/simple_page.html
+++ b/shared/templates/styleguide2/simple_page.html
@@ -11,12 +11,14 @@
{% endblock %}
<main class="container--wide mb-2 lg:mb-12">
- {% for block in page.content %}
- {% include_block block %}
- {% endfor %}
+ {% block inner_content %}
+ {% for block in page.content %}
+ {% include_block block %}
+ {% endfor %}
- {% for block in page.new_content %}
- {% include_block block %}
- {% endfor %}
+ {% for block in page.new_content %}
+ {% include_block block %}
+ {% endfor %}
+ {% endblock %}
</main>
{% endblock %}
diff --git a/uniweb/templates/uniweb/blocks/people_group_block.html b/uniweb/templates/uniweb/blocks/people_group_block.html
index 8630f953..d268139f 100644
--- a/uniweb/templates/uniweb/blocks/people_group_block.html
+++ b/uniweb/templates/uniweb/blocks/people_group_block.html
@@ -5,7 +5,7 @@
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
{% for person_details in self.person_list %}
{% with person_details.person as person_page %}
- {% include "shared/person_badge_snippet.html" with title=person_details.position|default:person_page.job_function %}
+ {% include "shared/person_badge_snippet.html" with title=person_details.position|default:person_page.job %}
{% endwith %}
{% endfor %}
</div>
--
GitLab