diff --git a/district/models.py b/district/models.py index f2b8a6823f42fd7311feb9ce33380f1030d2ff19..a853eff4b430c9e38f92c9cc9bd84eb2527cc00a 100644 --- a/district/models.py +++ b/district/models.py @@ -7,7 +7,7 @@ from wagtail.core.fields import StreamField from wagtail.core.models import Page from wagtailmetadata.models import MetadataPageMixin -from shared.models import Article, SharedSubpageMixin +from shared.models import Article, PeoplePage, SharedSubpageMixin class SubpageMixin: @@ -125,6 +125,14 @@ class DistrictHomePage(MetadataPageMixin, Page): def articles_page(self): return self.get_descendants().type(DistrictArticles).live().specific()[0] + @property + def people_page(self): + return self.get_descendants().type(PeoplePage).live().specific()[0] + + @property + def contact_page(self): + return self.get_descendants().type(DistrictContact).live().specific()[0] + @property def root_page(self): return self diff --git a/district/templates/district/_more_articles.html b/district/templates/district/_more_articles.html index 3620753e8063aa54772156702352fc2dcab6ebc0..f5033712a6a0c2665e76b06e21beaf9719232bf9 100644 --- a/district/templates/district/_more_articles.html +++ b/district/templates/district/_more_articles.html @@ -1,5 +1,5 @@ <nav class="text-center mb-3"> - <a href="/aktuality/" class="btn btn--icon text-xl pt-8" rel="next" > + <a href="{{ page.root_page.articles_page.url }}" class="btn btn--icon text-xl pt-8" rel="next" > <div class="btn__body-wrap"> <div class="btn__body ">Dalšà články</div> <div class="btn__icon "> diff --git a/district/templates/district/base.html b/district/templates/district/base.html index 93e42ce2d88589087dd0417f9c80e9e154f58d60..296dbe2362620fc45504018283b0f44920eceb53 100644 --- a/district/templates/district/base.html +++ b/district/templates/district/base.html @@ -83,12 +83,12 @@ <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"> - <li class="navbar-menu__item"><a href="/aktuality/" class="navbar-menu__link">Aktuality</a></li> - <li class="navbar-menu__item"><a href="/lide/" class="navbar-menu__link">LidĂ©</a></li> + <li class="navbar-menu__item"><a href="{{ page.root_page.articles_page.url }}" class="navbar-menu__link">{{ page.root_page.articles_page }}</a></li> + <li class="navbar-menu__item"><a href="{{ page.root_page.people_page.url }}" class="navbar-menu__link">{{ page.root_page.people_page }}</a></li> {% comment %} <li class="navbar-menu__item"><a href="/komunalni-program/" class="navbar-menu__link">KomunálnĂ program</a></li> {% endcomment %} - <li class="navbar-menu__item"><a href="/kontakt/" class="navbar-menu__link">Kontakt</a></li> + <li class="navbar-menu__item"><a href="{{ page.root_page.contact_page.url }}" class="navbar-menu__link">{{ page.root_page.contact_page }}</a></li> </ul> </div> @@ -142,7 +142,7 @@ <ui-footer-collapsible label="PĹ™ipoj se"> <ul class="mt-6 space-y-2 text-grey-200"> <li><a href="{{ page.root_page.contact_newcomers|default:"https://nalodeni.pirati.cz" }}">Zájemci o ÄŤlenstvĂ</a></li> - <li><a href="/kontakt/">Dej nám vÄ›dÄ›t</a></li> + <li><a href="{{ page.root_page.contact_page.url }}">Dej nám vÄ›dÄ›t</a></li> <li><a href="https://nalodeni.pirati.cz">NalodÄ›nĂ</a></li> </ul> </ui-footer-collapsible> @@ -151,8 +151,8 @@ <div class="pb-4 border-t border-grey-400 lg:border-t-0"> <ui-footer-collapsible label="Makáme"> <ul class="mt-6 space-y-2 text-grey-200"> - <li><a href="/lide/">LidĂ©</a></li> - <li><a href="/aktuality/">Aktuality</a></li> + <li><a href="{{ page.root_page.people_page.url }}">{{ page.root_page.people_page }}</a></li> + <li><a href="{{ page.root_page.articles_page.url }}">{{ page.root_page.articles_page }}</a></li> </ul> </ui-footer-collapsible> </div> diff --git a/district/templates/district/district_articles.html b/district/templates/district/district_articles.html index 55d316919af7acf0f3b9730bbe3fe2dca106757f..fb594009d695ff48e8841cc8e32bb94e6fa9f494 100644 --- a/district/templates/district/district_articles.html +++ b/district/templates/district/district_articles.html @@ -3,7 +3,7 @@ {% block content %} <main> - <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-4 mt-5">AktuálnĂ tĂ©mata</h1> + <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-4 mt-5">{{ page }}</h1> <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8"> {% for a in articles %} @@ -15,7 +15,7 @@ <nav> {% if articles.has_previous %} - <a href="/aktuality/?page={{ articles.previous_page_number }}" class="btn btn--icon btn--grey-125 btn--hoveractive btn--to-black btn--condensed btn--inverted-icon px-0" aria-label="PĹ™edchozĂ stránka"> + <a href="{{ page.root_page.articles_page.url }}?page={{ articles.previous_page_number }}" class="btn btn--icon btn--grey-125 btn--hoveractive btn--to-black btn--condensed btn--inverted-icon px-0" aria-label="PĹ™edchozĂ stránka"> <div class="btn__body-wrap"> <div class="btn__body ">PĹ™edchozĂ</div> <div class="btn__icon "> @@ -26,13 +26,13 @@ {% endif %} {% for i in articles.paginator.page_range %} - <a href="/aktuality/?page={{ i }}" class="btn {% if i == articles.number %} btn--grey-500 {% else %} btn--grey-125 {% endif %} btn--hoveractive btn--to-black btn--condensed hidden md:inline-block px-0" aria-label="Stránka {{ i }}"> + <a href="{{ page.root_page.articles_page.url }}?page={{ i }}" class="btn {% if i == articles.number %} btn--grey-500 {% else %} btn--grey-125 {% endif %} btn--hoveractive btn--to-black btn--condensed hidden md:inline-block px-0" aria-label="Stránka {{ i }}"> <div class="btn__body ">{{ i }}</div> </a> {% endfor %} {% if articles.has_next %} - <a href="/aktuality/?page={{ articles.next_page_number }}" class="btn btn--icon btn--grey-125 btn--hoveractive btn--to-black btn--condensed px-0" aria-label="Dalšà stránka"> + <a href="{{ page.root_page.articles_page.url }}?page={{ articles.next_page_number }}" class="btn btn--icon btn--grey-125 btn--hoveractive btn--to-black btn--condensed px-0" aria-label="Dalšà stránka"> <div class="btn__body-wrap"> <div class="btn__body ">DalšĂ</div> <div class="btn__icon "> diff --git a/district/templates/shared/person_page.html b/district/templates/shared/person_page.html index 90b384f786c2d2706cebc553464d52858c6af51e..efd9f13ff9d49b30c504337fc5ebcb41398a1474 100644 --- a/district/templates/shared/person_page.html +++ b/district/templates/shared/person_page.html @@ -82,7 +82,7 @@ {% endfor %} </div> - <a href="/lide/" class="btn btn--icon btn--violet-500 btn--fullwidth btn--hoveractive pt-4" > + <a href="{{ page.root_page.people_page.url }}" class="btn btn--icon btn--violet-500 btn--fullwidth btn--hoveractive pt-4" > <div class="btn__body-wrap"> <div class="btn__body ">Poznejte celĂ˝ náš tĂ˝m</div> <div class="btn__icon ">