Skip to content
Snippets Groups Projects
Commit 13e5bc07 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

menu title

parent 826c831b
No related branches found
No related tags found
2 merge requests!861Release: New homepage design,!856menu title
Pipeline #15964 passed
...@@ -77,3 +77,18 @@ class MenuMixin(MenuMixinBase): ...@@ -77,3 +77,18 @@ class MenuMixin(MenuMixinBase):
class Meta: class Meta:
abstract = True abstract = True
class PageInMenuMixin(Page):
def get_menu_title(self) -> str:
for menu_item in self.root_page.menu:
if menu_item.value["page"] is None:
continue
if menu_item.value["page"].id == self.id:
return menu_item.value["title"]
return self.title
class Meta:
abstract = True
...@@ -44,7 +44,7 @@ from tuning import admin_help ...@@ -44,7 +44,7 @@ from tuning import admin_help
from . import blocks from . import blocks
from .constants import MONTH_NAMES from .constants import MONTH_NAMES
from .forms import JekyllImportForm from .forms import JekyllImportForm
from .menu import MenuMixin from .menu import MenuMixin, PageInMenuMixin
class MainHomePage( class MainHomePage(
...@@ -58,8 +58,7 @@ class MainHomePage( ...@@ -58,8 +58,7 @@ class MainHomePage(
# header # header
menu_button_name = models.CharField( menu_button_name = models.CharField(
verbose_name="Text na tlačítku pro zapojení", verbose_name="Text na tlačítku pro zapojení", max_length=16
max_length=16
) )
menu_button_content = StreamField( menu_button_content = StreamField(
...@@ -188,8 +187,7 @@ class MainHomePage( ...@@ -188,8 +187,7 @@ class MainHomePage(
context["article_data_list"] = self.materialize_shared_articles_query( context["article_data_list"] = self.materialize_shared_articles_query(
self.append_all_shared_articles_query(MainArticlePage.objects.live().all()) self.append_all_shared_articles_query(MainArticlePage.objects.live().all())
.live() .live()
.order_by("-union_date") .order_by("-union_date")[:3]
[:3]
) )
return context return context
...@@ -306,6 +304,7 @@ class MainArticlesPage( ...@@ -306,6 +304,7 @@ class MainArticlesPage(
SubpageMixin, SubpageMixin,
MetadataPageMixin, MetadataPageMixin,
ArticlesPageMixin, ArticlesPageMixin,
PageInMenuMixin,
Page, Page,
): ):
last_import_log = models.TextField( last_import_log = models.TextField(
...@@ -554,7 +553,12 @@ class MainArticleTag(TaggedItemBase): ...@@ -554,7 +553,12 @@ class MainArticleTag(TaggedItemBase):
class MainArticlePage( class MainArticlePage(
ArticleMixin, ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page ArticleMixin,
ExtendedMetadataPageMixin,
SubpageMixin,
MetadataPageMixin,
PageInMenuMixin,
Page,
): ):
### FIELDS ### FIELDS
content = StreamField( content = StreamField(
...@@ -626,7 +630,9 @@ class MainArticlePage( ...@@ -626,7 +630,9 @@ class MainArticlePage(
# return context # return context
class MainProgramPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page): class MainProgramPage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page
):
### FIELDS ### FIELDS
program = StreamField( program = StreamField(
...@@ -659,7 +665,9 @@ class MainProgramPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin ...@@ -659,7 +665,9 @@ class MainProgramPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin
verbose_name = "Program" verbose_name = "Program"
class MainPeoplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page): class MainPeoplePage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page
):
### FIELDS ### FIELDS
perex_col_1 = models.TextField( perex_col_1 = models.TextField(
...@@ -714,6 +722,7 @@ class MainPersonPage( ...@@ -714,6 +722,7 @@ class MainPersonPage(
SubpageMixin, SubpageMixin,
MetadataPageMixin, MetadataPageMixin,
CalendarMixin, CalendarMixin,
PageInMenuMixin,
Page, Page,
): ):
### FIELDS ### FIELDS
...@@ -829,7 +838,9 @@ class MainPersonPage( ...@@ -829,7 +838,9 @@ class MainPersonPage(
) )
class MainSimplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page): class MainSimplePage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page
):
### FIELDS ### FIELDS
# content # content
...@@ -868,7 +879,9 @@ class MainSimplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, ...@@ -868,7 +879,9 @@ class MainSimplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin,
verbose_name = "Jednoduchá stárnka" verbose_name = "Jednoduchá stárnka"
class MainContactPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page): class MainContactPage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page
):
### FIELDS ### FIELDS
contact_people = StreamField( contact_people = StreamField(
...@@ -914,7 +927,7 @@ class MainContactPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin ...@@ -914,7 +927,7 @@ class MainContactPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin
class MainCrossroadPage( class MainCrossroadPage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page
): ):
### FIELDS ### FIELDS
...@@ -958,7 +971,9 @@ class MainCrossroadPage( ...@@ -958,7 +971,9 @@ class MainCrossroadPage(
verbose_name = "Rozcestník s kartami" verbose_name = "Rozcestník s kartami"
class MainHoaxPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page): class MainHoaxPage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page
):
### FIELDS ### FIELDS
description = RichTextField( description = RichTextField(
...@@ -996,7 +1011,7 @@ class MainHoaxPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, P ...@@ -996,7 +1011,7 @@ class MainHoaxPage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, P
class MainSearchPage( class MainSearchPage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, PageInMenuMixin, Page
): ):
parent_page_types = ["main.MainHomePage"] parent_page_types = ["main.MainHomePage"]
subpage_types = [] subpage_types = []
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% block content %} {% block content %}
{% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.root_page.articles_page.title %} {% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.root_page.articles_page.get_menu_title %}
{% include 'main/includes/organisms/header/article_header.html' with title=page.title description=page.perex tags=page.tags.names first_nav_text=page.root_page.articles_page.title first_nav_link=page.root_page.articles_page.url second_nav_text=page.date %} {% include 'main/includes/organisms/header/article_header.html' with title=page.title description=page.perex tags=page.tags.names first_nav_text=page.root_page.articles_page.title first_nav_link=page.root_page.articles_page.url second_nav_text=page.date %}
<main role="main" class="mb-10 xl:mb-32"> <main role="main" class="mb-10 xl:mb-32">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% block content %} {% block content %}
{% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.title %} {% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.get_menu_title %}
{% include 'main/includes/organisms/header/articles_header.html' with title=page.title tags=tags %} {% include 'main/includes/organisms/header/articles_header.html' with title=page.title tags=tags %}
<main role="main"> <main role="main">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %} {% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %} {% block content %}
{% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.title %} {% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.get_menu_title %}
{% include 'main/includes/organisms/header/simple_header.html' with title=page.title %} {% include 'main/includes/organisms/header/simple_header.html' with title=page.title %}
<main role="main"> <main role="main">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wagtailcore_tags %} {% load wagtailcore_tags %}
{% block content %} {% block content %}
{% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.title %} {% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.get_menu_title %}
{% include 'main/includes/organisms/header/simple_header.html' with title=page.title %} {% include 'main/includes/organisms/header/simple_header.html' with title=page.title %}
<main role="main" class="mb-10 xl:mb-32"> <main role="main" class="mb-10 xl:mb-32">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %} {% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %} {% block content %}
{% include 'main/includes/organisms/layout/navbar.html' with selected_item='Kdo jsme' %} {% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.get_menu_title %}
<div class="__js-root"> <div class="__js-root">
<ui-view-provider <ui-view-provider
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters perex %} {% load wagtailcore_tags wagtailimages_tags shared_filters perex %}
{% block content %} {% block content %}
{% include 'main/includes/organisms/layout/navbar.html' with selected_item='Kdo jsme' is_transparent=True is_on_dark_background=True %} {% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.root_page.people_page.get_menu_title is_transparent=True is_on_dark_background=True %}
{% include 'main/includes/organisms/header/photo_header.html' with first_nav_text=page.root_page.people_page.title first_nav_link=page.root_page.people_page.url second_nav_text=page.primary_group degree_before=page.before_name name=page.title degree_after=page.after_name function=page.position main_image=page.main_image %} {% include 'main/includes/organisms/header/photo_header.html' with first_nav_text=page.root_page.people_page.title first_nav_link=page.root_page.people_page.url second_nav_text=page.primary_group degree_before=page.before_name name=page.title degree_after=page.after_name function=page.position main_image=page.main_image %}
<main role="main"> <main role="main">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %} {% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %} {% block content %}
{% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.title %} {% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.get_menu_title %}
<div class="__js-root"> <div class="__js-root">
<ui-view-provider <ui-view-provider
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
:sync-location="true" :sync-location="true"
v-slot="{ isCurrentView, toggleView }" v-slot="{ isCurrentView, toggleView }"
> >
{% include 'main/includes/organisms/header/simple_header_with_ui_switch.html' with title='Program' ui_switch_iterable=page.program %} {% include 'main/includes/organisms/header/simple_header_with_ui_switch.html' with title=page.title ui_switch_iterable=page.program %}
<main role="main" class="mb-4 xl:mb-20"> <main role="main" class="mb-4 xl:mb-20">
<div class="container--wide flex flex-col"> <div class="container--wide flex flex-col">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wagtailcore_tags %} {% load wagtailcore_tags %}
{% block content %} {% block content %}
{% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.title %} {% include 'main/includes/organisms/layout/navbar.html' with selected_item=page.get_menu_title %}
{% include 'main/includes/organisms/header/simple_header.html' with title=page.title %} {% include 'main/includes/organisms/header/simple_header.html' with title=page.title %}
<main class="container--wide mb-2 lg:mb-12"> <main class="container--wide mb-2 lg:mb-12">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment