diff --git a/district/blocks.py b/district/blocks.py
index 2e85692ceb25ba940f2604ec0e420b07e77d3375..4bf6dc93c7787e8f72c90d4f43468a5811488626 100644
--- a/district/blocks.py
+++ b/district/blocks.py
@@ -15,7 +15,7 @@ class AddressBlock(StructBlock):
embed_map = URLBlock(
label="Odkaz na embed mapku",
required=False,
- help_text="Hodnota 'src' v <iframe>",
+ help_text="Hodnota 'src' v iframe",
)
address = TextBlock(label="Adresa", required=True)
address_info = TextBlock(label="Info k adrese", required=False)
diff --git a/district/migrations/0029_alter_districtcenterpage_sidebar_content.py b/district/migrations/0029_alter_districtcenterpage_sidebar_content.py
new file mode 100644
index 0000000000000000000000000000000000000000..e4e0ea6707326ecb5a6db0a8c48fd0706913ed29
--- /dev/null
+++ b/district/migrations/0029_alter_districtcenterpage_sidebar_content.py
@@ -0,0 +1,81 @@
+# Generated by Django 3.2.8 on 2021-11-28 13:35
+
+import wagtail.core.blocks
+import wagtail.core.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("district", "0028_alter_districthomepage_subheader"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="districtcenterpage",
+ name="sidebar_content",
+ field=wagtail.core.fields.StreamField(
+ [
+ (
+ "address",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ label="Titulek", required=True
+ ),
+ ),
+ (
+ "embed_map",
+ wagtail.core.blocks.URLBlock(
+ help_text="Hodnota 'src' v iframe",
+ label="Odkaz na embed mapku",
+ required=False,
+ ),
+ ),
+ (
+ "address",
+ wagtail.core.blocks.TextBlock(
+ label="Adresa", required=True
+ ),
+ ),
+ (
+ "address_info",
+ wagtail.core.blocks.TextBlock(
+ label="Info k adrese", required=False
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "contact",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ label="Titulek", required=True
+ ),
+ ),
+ (
+ "contact_list",
+ wagtail.core.blocks.ListBlock(
+ wagtail.core.blocks.PageChooserBlock(
+ label="Osoba",
+ page_type=["district.DistrictPersonPage"],
+ ),
+ label="List kontaktů",
+ ),
+ ),
+ ]
+ ),
+ ),
+ ],
+ blank=True,
+ verbose_name="Obsah bočního panelu",
+ ),
+ ),
+ ]
diff --git a/region/blocks.py b/region/blocks.py
index 84bd7d44188951c0dea73e32af7d25c2d0a847e3..9e2eacd5b29da24b3217b3896a14916618d1232a 100644
--- a/region/blocks.py
+++ b/region/blocks.py
@@ -15,7 +15,7 @@ class AddressBlock(StructBlock):
embed_map = URLBlock(
label="Odkaz na embed mapku",
required=False,
- help_text="Hodnota 'src' v <iframe>",
+ help_text="Hodnota 'src' v iframe",
)
address = TextBlock(label="Adresa", required=True)
address_info = TextBlock(label="Info k adrese", required=False)
diff --git a/region/migrations/0006_alter_regioncenterpage_sidebar_content.py b/region/migrations/0006_alter_regioncenterpage_sidebar_content.py
new file mode 100644
index 0000000000000000000000000000000000000000..dc3db76ad857687edbd554fd0f7ad2d9b96af228
--- /dev/null
+++ b/region/migrations/0006_alter_regioncenterpage_sidebar_content.py
@@ -0,0 +1,81 @@
+# Generated by Django 3.2.8 on 2021-11-28 13:35
+
+import wagtail.core.blocks
+import wagtail.core.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("region", "0005_auto_20211128_1152"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="regioncenterpage",
+ name="sidebar_content",
+ field=wagtail.core.fields.StreamField(
+ [
+ (
+ "address",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ label="Titulek", required=True
+ ),
+ ),
+ (
+ "embed_map",
+ wagtail.core.blocks.URLBlock(
+ help_text="Hodnota 'src' v iframe",
+ label="Odkaz na embed mapku",
+ required=False,
+ ),
+ ),
+ (
+ "address",
+ wagtail.core.blocks.TextBlock(
+ label="Adresa", required=True
+ ),
+ ),
+ (
+ "address_info",
+ wagtail.core.blocks.TextBlock(
+ label="Info k adrese", required=False
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "contact",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ label="Titulek", required=True
+ ),
+ ),
+ (
+ "contact_list",
+ wagtail.core.blocks.ListBlock(
+ wagtail.core.blocks.PageChooserBlock(
+ label="Osoba",
+ page_type=["region.RegionPersonPage"],
+ ),
+ label="List kontaktů",
+ ),
+ ),
+ ]
+ ),
+ ),
+ ],
+ blank=True,
+ verbose_name="Obsah bočního panelu",
+ ),
+ ),
+ ]
diff --git a/region/templates/region/base.html b/region/templates/region/base.html
index 92e286f23bc14f7fe20229c564bc45751c896b84..8a82724bcb075c4bf3b5a7f830ea6004a4b60abb 100644
--- a/region/templates/region/base.html
+++ b/region/templates/region/base.html
@@ -19,9 +19,9 @@
<link rel="stylesheet" href="{% static "styleguide18/assets/css/styles.css" %}">
<style type="text/css">
- .inline-block {
- display: inline-block;
- }
+ .inline-block {
+ display: inline-block;
+ }
</style>
{% if page.root_page.matomo_id %}
@@ -31,9 +31,9 @@
<body>
-<nav class="navbar __js-root py-lg-6">
- <ui-app inline-template>
- <ui-navbar inline-template>
+ <nav class="navbar __js-root py-lg-6">
+ <ui-app inline-template>
+ <ui-navbar inline-template>
<div>
<div class="container container--wide navbar__content" :class="{'navbar__content--initialized': true}">
@@ -80,13 +80,62 @@
<div v-if="show || isLgScreenSize" class="navbar__main navbar__section navbar__section--expandable container-padding--zero lg:container-padding--auto">
<ul class="navbar-menu text-white">
{% if page.root_page.articles_page %}
- <li class="navbar-menu__item"><a href="{% pageurl page.root_page.articles_page %}" class="navbar-menu__link">{{ page.root_page.articles_page }}</a></li>
+ <li class="navbar-menu__item">
+ <a href="{% pageurl page.root_page.articles_page %}" class="navbar-menu__link">
+ Aktuality
+ </a>
+ </li>
{% endif %}
{% if page.root_page.people_page %}
- <li class="navbar-menu__item"><a href="{% pageurl page.root_page.people_page %}" class="navbar-menu__link">{{ page.root_page.people_page }}</a></li>
+ <li class="navbar-menu__item">
+ <a href="{% pageurl page.root_page.people_page %}" class="navbar-menu__link">
+ Lidé
+ </a>
+ </li>
{% endif %}
+ {% if page.root_page.election_page and page.root_page.program_page %}
+ <li class="navbar-menu__item">
+ <ui-navbar-subitem label="Volby">
+ <ul class="navbar-menu__submenu">
+ <li>
+ <a href="{{ page.root_page.election_page.url }}" class="navbar-menu__link">
+ {{ page.root_page.election_page }}
+ </a>
+ </li>
+ <li>
+ <a href="{{ page.root_page.program_page.url }}" class="navbar-menu__link">
+ {{ page.root_page.program_page }}
+ </a>
+ </li>
+ </ul>
+ </ui-navbar-subitem>
+ </li>
+ {% elif page.root_page.program_page %}
+ <li class="navbar-menu__item">
+ <a href="{% pageurl page.root_page.program_page %}" class="navbar-menu__link">
+ Program
+ </a>
+ </li>
+ {% elif page.root_page.election_page %}
+ <li class="navbar-menu__item">
+ <a href="{% pageurl page.root_page.election_page %}" class="navbar-menu__link">
+ Volby
+ </a>
+ </li>
+ {% endif %}
{% if page.root_page.contact_page %}
- <li class="navbar-menu__item"><a href="{% pageurl page.root_page.contact_page %}" class="navbar-menu__link">{{ page.root_page.contact_page }}</a></li>
+ <li class="navbar-menu__item">
+ <a href="{% pageurl page.root_page.contact_page %}" class="navbar-menu__link">
+ Kontakt
+ </a>
+ </li>
+ {% endif %}
+ {% if page.root_page.center_page %}
+ <li class="navbar-menu__item">
+ <a href="{% pageurl page.root_page.center_page %}" class="navbar-menu__link">
+ Pirátské centrum
+ </a>
+ </li>
{% endif %}
</ul>
</div>
@@ -111,8 +160,8 @@
</div>
</div>
</div>
- </ui-navbar>
- </ui-app>
+ </ui-navbar>
+ </ui-app>
</nav>
<div class="__js-root">
@@ -164,7 +213,9 @@
<ui-region-map class="container container--default" />
</div>
<div class="subnav-aside__item" :class="{'subnav-aside__item--visible': isCurrentView('calendar')}">
- {% include "shared/calendar_current_events_snippet.html" %}
+ <div class="container container--default">
+ {% include "shared/calendar_current_events_snippet.html" %}
+ </div>
</div>
</aside>
</ui-view-provider>
@@ -172,13 +223,13 @@
</div>
-{% block subheader %}{% endblock %}
-<div class="container container--default lg:py-4">
- {% block content %}{% endblock %}
-</div>
+ {% block subheader %}{% endblock %}
+ <div class="container container--default lg:py-4">
+ {% block content %}{% endblock %}
+ </div>
-<footer class="footer bg-grey-700 text-white __js-root">
+ <footer class="footer bg-grey-700 text-white __js-root">
<ui-app inline-template>
@@ -274,10 +325,10 @@
</footer>
-<script src="{% static "styleguide18/assets/js/vue.2.6.11.js" %}"></script>
-<script src="{% static "styleguide18/assets/js/main.bundle.js" %}"></script>
-<script src="{% static "shared/vendor/jquery/jquery-3.4.1.min.js" %}"></script>
-<script src="{% static "shared/vendor/lazysizes/lazysizes.min.js" %}"></script>
-<script src="{% static "shared/vendor/fancybox/jquery.fancybox.min.js" %}"></script>
+ <script src="{% static "styleguide18/assets/js/vue.2.6.11.js" %}"></script>
+ <script src="{% static "styleguide18/assets/js/main.bundle.js" %}"></script>
+ <script src="{% static "shared/vendor/jquery/jquery-3.4.1.min.js" %}"></script>
+ <script src="{% static "shared/vendor/lazysizes/lazysizes.min.js" %}"></script>
+ <script src="{% static "shared/vendor/fancybox/jquery.fancybox.min.js" %}"></script>
</body>
</html>