From 7f3dcc43547feb49702cbd5808e9a18af5fdc883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Fri, 17 Apr 2020 10:54:12 +0200
Subject: [PATCH] majak: Tweaks
---
majak/settings/base.py | 2 +-
senator/models.py | 18 ++++++++++++++++++
senator/templates/senator/base.html | 4 +---
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/majak/settings/base.py b/majak/settings/base.py
index 20c8e6b1..439f434e 100644
--- a/majak/settings/base.py
+++ b/majak/settings/base.py
@@ -141,7 +141,7 @@ MEDIA_URL = "/media/"
# Wagtail settings
-WAGTAIL_SITE_NAME = "majak"
+WAGTAIL_SITE_NAME = "Maják"
# Base URL to use when referring to full URLs within the Wagtail admin backend -
# e.g. in notification emails. Don't include '/admin' or a trailing slash
diff --git a/senator/models.py b/senator/models.py
index e4a82968..f891e9db 100644
--- a/senator/models.py
+++ b/senator/models.py
@@ -21,8 +21,19 @@ class SenatorHomePage(Page):
FieldPanel("my_work"),
]
+ subpage_types = ["senator.SenatorNewsIndexPage"]
+
+ class Meta:
+ verbose_name = "[senátor] Úvodní stránka"
+
class SenatorNewsIndexPage(Page):
+ parent_page_types = ["senator.SenatorHomePage"]
+ subpage_types = ["senator.SenatorNewsPage"]
+
+ class Meta:
+ verbose_name = "[senátor] Přehled novinek"
+
def get_context(self, request):
# Update context to include only published posts, ordered by reverse-chron
context = super().get_context(request)
@@ -42,6 +53,7 @@ class SenatorNewsPage(Page):
search_fields = Page.search_fields + [
index.SearchField("perex"),
index.SearchField("body"),
+ index.FilterField("date"),
]
content_panels = Page.content_panels + [
@@ -50,3 +62,9 @@ class SenatorNewsPage(Page):
FieldPanel("body", classname="full"),
ImageChooserPanel("image"),
]
+
+ parent_page_types = ["senator.SenatorNewsIndexPage"]
+ subpage_types = []
+
+ class Meta:
+ verbose_name = "[senátor] Novinka"
diff --git a/senator/templates/senator/base.html b/senator/templates/senator/base.html
index ed5001e1..f5eed989 100644
--- a/senator/templates/senator/base.html
+++ b/senator/templates/senator/base.html
@@ -749,11 +749,9 @@
<body data-rsssl=1 class="home page-template-default page page-id-4949 l-body Zephyr_4.10.2 header_hor header_inpos_top btn_hov_ state_default wpb-js-composer js-comp-ver-5.4.5 vc_responsive" itemscope itemtype="https://schema.org/WebPage">
+ {% wagtailuserbar %}
<div class="l-canvas sidebar_none type_wide">
-
-
-
<header class="l-header pos_fixed bg_solid shadow_thin" itemscope itemtype="https://schema.org/WPHeader">
<div class="l-subheader at_top">
<div class="l-subheader-h">
--
GitLab