diff --git a/district/models.py b/district/models.py
index 9c9108667fcd0adbdfec3eada9117e556b2c04ca..4c946bd705530fc6260c3233839d6a4a8f19a45e 100644
--- a/district/models.py
+++ b/district/models.py
@@ -344,7 +344,10 @@ class DistrictArticlePage(ArticleMixin, SubpageMixin, MetadataPageMixin, Page):
FieldPanel("tags"),
]
- promote_panels = make_promote_panels()
+ promote_panels = make_promote_panels(
+ admin_help.build(admin_help.NO_SEO_TITLE, admin_help.NO_DESCRIPTION_USE_PEREX),
+ search_image=False,
+ )
### RELATIONS
diff --git a/district/templates/district/base.html b/district/templates/district/base.html
index af425062dd49d131613afa3a846d01a786e830a1..36217ee61b8479e44cf3e79da834a5c3a31bf6b5 100644
--- a/district/templates/district/base.html
+++ b/district/templates/district/base.html
@@ -56,7 +56,7 @@
/>
{% endif %}
</a>
- <span class="lg:hidden pl-4 font-bold text-xl">Pirátská strana</span>
+ <span class="lg:hidden pl-4 font-bold text-xl">{{ page.root_page.title }}</span>
</div>
<div class="navbar__menutoggle my-4 flex justify-end lg:hidden">
@@ -106,7 +106,7 @@
</ul>
</div>
- <div v-if="show || isLgScreenSize" class="navbar__actions navbar__section navbar__section--expandable container-padding--zero lg:container-padding--auto self-start flex flex-col sm:flex-row lg:flex-col sm:space-x-4 space-y-2 sm:space-y-0 lg:space-y-2 xl:flex-row xl:space-x-2 xl:space-y-0">
+ <div v-if="show || isLgScreenSize" class="navbar__actions navbar__section navbar__section--expandable container-padding--zero lg:container-padding--auto self-start flex flex-col sm:flex-row lg:flex-col sm:space-x-4 space-y-2 sm:space-y-0 lg:space-y-2 xl:flex-row xl:space-x-2 xl:space-y-0 mb-5">
<a href="{{ page.root_page.donation_page|default:"https://dary.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
<div class="btn__body-wrap">
<div class="btn__body ">Přispěj</div>
@@ -115,7 +115,7 @@
</div>
</div>
</a>
- <a href={{ page.root_page.contact_newcomers|default:"https://nalodeni.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
+ <a href="{{ page.root_page.contact_newcomers|default:"https://nalodeni.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
<div class="btn__body-wrap">
<div class="btn__body ">Naloď se</div>
<div class="btn__icon ">
@@ -203,7 +203,7 @@
{% block subheader %}{% endblock %}
- <div class="container container--default lg:py-4">
+ <div class="container container--default py-8 lg:py-4">
{% block content %}{% endblock %}
</div>
@@ -224,7 +224,7 @@
</section>
<section class="footer__main-links bg-grey-700 text-white lg:grid grid-cols-3 gap-4">
- <div class="pb-4">
+ <div class="pt-8 pb-4 lg:py-0">
<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>
@@ -234,7 +234,7 @@
</ui-footer-collapsible>
</div>
- <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <div class="py-4 lg:py-0 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="{{ page.root_page.people_page.url }}">{{ page.root_page.people_page }}</a></li>
@@ -243,7 +243,7 @@
</ui-footer-collapsible>
</div>
- <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <div class="py-4 lg:py-0 border-t border-grey-400 lg:border-t-0">
<ui-footer-collapsible label="Otevřenost">
<ul class="mt-6 space-y-2 text-grey-200">
<li><a href="https://ucet.pirati.cz">Transparentní účet</a></li>
@@ -262,7 +262,7 @@
<a href="mailto:{{ page.root_page.contact_email|default:"info@pirati.cz" }}" class="contact-line icon-link content-block--nostyle " ><i class="ico--envelope"></i><span>Dejte nám vědět</span></a>
</div>
- <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 lg:space-x-0 mr-0 pr-0">
+ <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="{{ page.root_page.donation_page|default:"https://dary.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth px-0 mx-0">
<div class="btn__body-wrap">
diff --git a/district/templates/district/district_after_election_page.html b/district/templates/district/district_after_election_page.html
index 7d26093bd74adbced7c31f19261ed1a25e74b5a9..14b8b6f1941983df0392ef8c85e1b27246f1d2bb 100644
--- a/district/templates/district/district_after_election_page.html
+++ b/district/templates/district/district_after_election_page.html
@@ -2,7 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<main>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -51,6 +50,5 @@
</section>
</div>
</main>
- </div>
{% endblock content %}
diff --git a/district/templates/district/district_article_page.html b/district/templates/district/district_article_page.html
index 2a3a4e17f738956c2090a049dd230c5a67e33eeb..a94a0dd8e32c91ff852144f30016a967aab1a412 100644
--- a/district/templates/district/district_article_page.html
+++ b/district/templates/district/district_article_page.html
@@ -2,7 +2,6 @@
{% load static wagtailcore_tags wagtailimages_tags %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<article>
<link itemprop="mainEntityOfPage" href="{{ page.url }}">
<meta itemprop="datePublished" content="{{ page.last_published_at }}">
@@ -89,6 +88,5 @@
{% include "shared/more_articles_snippet.html" %}
</section>
{% endif %}
- </div>
{% endblock %}
diff --git a/district/templates/district/district_articles_page.html b/district/templates/district/district_articles_page.html
index 35d91804bddd255bb297739ebb49ec86e6fabb84..13b49ee4986ad47881d867941b2581b7766b0baf 100644
--- a/district/templates/district/district_articles_page.html
+++ b/district/templates/district/district_articles_page.html
@@ -2,9 +2,6 @@
{% block content %}
<main>
-
- <div class="container container--default py-8 lg:py-24">
-
<header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
</header>
@@ -16,7 +13,5 @@
</div>
{% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
- </div>
-
</main>
{% endblock %}
diff --git a/district/templates/district/district_center_page.html b/district/templates/district/district_center_page.html
index 920c07d290c13e78da3ba3b84fe0486f210bdf1e..a4c194bd948ce00f1bc8d63f334235684233af7b 100644
--- a/district/templates/district/district_center_page.html
+++ b/district/templates/district/district_center_page.html
@@ -16,7 +16,6 @@
{% endblock %}
{% block content %}
- <div class="container container--default pt-8 lg:pb-16">
<article>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<div class="lg:w-3/5 xl:w-2/3">
@@ -46,6 +45,5 @@
</div>
</div>
</article>
- </div>
{% endblock %}
diff --git a/district/templates/district/district_contact_page.html b/district/templates/district/district_contact_page.html
index 23e32401cb4cfd3ef87048df0392d69431199234..926c024593b393d56bdc7ca4c79ef1d2ab577b63 100644
--- a/district/templates/district/district_contact_page.html
+++ b/district/templates/district/district_contact_page.html
@@ -2,8 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8">
<div class="lg:flex lg:mt-8 space-y-16 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-5">
<section class="lg:w-3/5 xl:w-2/3">
<header>
@@ -83,6 +81,4 @@
{% include "shared/followus_snippet.html" %}
- </div>
-
{% endblock %}
diff --git a/district/templates/district/district_election_point_page.html b/district/templates/district/district_election_point_page.html
index 9b6dbcdac757032d3691c2476b3bdf69ca2cba4a..023be11cee4bfb589aa5781ddd2f406a68b9cbcb 100644
--- a/district/templates/district/district_election_point_page.html
+++ b/district/templates/district/district_election_point_page.html
@@ -2,7 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<main>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -76,6 +75,5 @@
</section>
</div>
</main>
- </div>
{% endblock content %}
diff --git a/district/templates/district/district_people_page.html b/district/templates/district/district_people_page.html
index b19b7352a666ceac62c0eed7812d6f3386831130..5ce4203a325e103b72be4b8fc37007f70c195007 100644
--- a/district/templates/district/district_people_page.html
+++ b/district/templates/district/district_people_page.html
@@ -2,9 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8 lg:py-24">
-
<header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">
{{ page.title }}
@@ -19,6 +16,5 @@
{% endif %}
{% endfor %}
</main>
- </div>
{% endblock %}
diff --git a/district/templates/district/district_person_page.html b/district/templates/district/district_person_page.html
index 7119f32a157b5fe19ad7584673dea18cb37959f9..0487dd8226cae5e3ed5c3e1cdf1f529756993797 100644
--- a/district/templates/district/district_person_page.html
+++ b/district/templates/district/district_person_page.html
@@ -18,7 +18,6 @@
{% endblock %}
{% block content %}
- <div class="container container--default py-8 lg:pb-24">
<main>
<div class="flex flex-col lg:flex-row lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -148,6 +147,5 @@
</section>
</div>
</main>
- </div>
{% endblock %}
diff --git a/district/templates/district/district_program_page.html b/district/templates/district/district_program_page.html
index 3805467f276625699af9c9c4836f5e5af977f4e8..a7b8e545f3d69d4fe42006ad98dfba340d6506cf 100644
--- a/district/templates/district/district_program_page.html
+++ b/district/templates/district/district_program_page.html
@@ -2,8 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8">
<div class="lg:flex lg:mt-8 space-y-16 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-5">
<section>
<header>
@@ -21,5 +19,4 @@
{% endfor %}
</section>
</div>
- </div>
{% endblock %}
diff --git a/elections2021/models.py b/elections2021/models.py
index 70a887db307715d73684226ec66075987265b77c..856143276d3b0581036c8604d023734c31ab974a 100644
--- a/elections2021/models.py
+++ b/elections2021/models.py
@@ -586,16 +586,6 @@ class Elections2021ArticlePage(ArticleMixin, SubpageMixin, MetadataPageMixin, Pa
class Meta:
verbose_name = "Aktualita"
- def get_meta_image(self):
- return self.image
-
- def get_meta_description(self):
- if self.search_description:
- return self.search_description
- if len(self.perex) > 150:
- return str(self.perex)[:150] + "..."
- return self.perex
-
def card_css_class(self):
return STYLE_CSS[self.card_style]
diff --git a/region/models.py b/region/models.py
index 02a3d8a721fb745c61ab22a878016d0b852451ef..d1f6072b4bdd5b51b562098f9db4d29440f7adab 100644
--- a/region/models.py
+++ b/region/models.py
@@ -334,7 +334,10 @@ class RegionArticlePage(ArticleMixin, SubpageMixin, MetadataPageMixin, Page):
FieldPanel("tags"),
]
- promote_panels = make_promote_panels()
+ promote_panels = make_promote_panels(
+ admin_help.build(admin_help.NO_SEO_TITLE, admin_help.NO_DESCRIPTION_USE_PEREX),
+ search_image=False,
+ )
### RELATIONS
diff --git a/region/templates/region/base.html b/region/templates/region/base.html
index d4e24e48eea517ef952aebdcb1e2dc88a948336a..725aa7962fb9d0e2c74295b755537010487e47eb 100644
--- a/region/templates/region/base.html
+++ b/region/templates/region/base.html
@@ -56,7 +56,7 @@
/>
{% endif %}
</a>
- <span class="lg:hidden pl-4 font-bold text-xl">Pirátská strana</span>
+ <span class="lg:hidden pl-4 font-bold text-xl">{{ page.root_page.title }}</span>
</div>
<div class="navbar__menutoggle my-4 flex justify-end lg:hidden">
@@ -109,7 +109,7 @@
</div>
</div>
</a>
- <a href="https://nalodeni.pirati.cz" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
+ <a href="{{ page.root_page.contact_newcomers|default:"https://nalodeni.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
<div class="btn__body-wrap">
<div class="btn__body ">Naloď se</div>
<div class="btn__icon ">
@@ -197,7 +197,7 @@
{% block subheader %}{% endblock %}
- <div class="container container--default lg:py-4">
+ <div class="container container--default py-8 lg:py-4">
{% block content %}{% endblock %}
</div>
@@ -218,7 +218,7 @@
</section>
<section class="footer__main-links bg-grey-700 text-white lg:grid grid-cols-3 gap-4">
- <div class="pb-4">
+ <div class="pt-8 pb-4 lg:py-0">
<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>
@@ -228,7 +228,7 @@
</ui-footer-collapsible>
</div>
- <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <div class="py-4 lg:py-0 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="{{ page.root_page.people_page.url }}">{{ page.root_page.people_page }}</a></li>
@@ -237,7 +237,7 @@
</ui-footer-collapsible>
</div>
- <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <div class="py-4 lg:py-0 border-t border-grey-400 lg:border-t-0">
<ui-footer-collapsible label="Otevřenost">
<ul class="mt-6 space-y-2 text-grey-200">
<li><a href="https://ucet.pirati.cz">Transparentní účet</a></li>
@@ -256,7 +256,7 @@
<a href="mailto:{{ page.root_page.contact_email|default:"info@pirati.cz" }}" class="contact-line icon-link content-block--nostyle " ><i class="ico--envelope"></i><span>Dejte nám vědět</span></a>
</div>
- <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 lg:space-x-0 mr-0 pr-0">
+ <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="{{ page.root_page.donation_page|default:"https://dary.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth px-0 mx-0">
<div class="btn__body-wrap">
diff --git a/region/templates/region/region_after_election_page.html b/region/templates/region/region_after_election_page.html
index 5f285e229d2adf42a0c628ed4c3a65cc44e4e8f9..a767d7d945e49c37eed8c9cb4769775bb9f9bb27 100644
--- a/region/templates/region/region_after_election_page.html
+++ b/region/templates/region/region_after_election_page.html
@@ -2,7 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<main>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -51,6 +50,5 @@
</section>
</div>
</main>
- </div>
{% endblock content %}
diff --git a/region/templates/region/region_article_page.html b/region/templates/region/region_article_page.html
index 8e2bc94a0f17cd26719b7320b2be03872d44b1f5..39ba9ce55d2872c8a79e67d39b1f2396fb3ef6f6 100644
--- a/region/templates/region/region_article_page.html
+++ b/region/templates/region/region_article_page.html
@@ -2,7 +2,6 @@
{% load static wagtailcore_tags wagtailimages_tags %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<article>
<link itemprop="mainEntityOfPage" href="{{ page.url }}">
<meta itemprop="datePublished" content="{{ page.last_published_at }}">
@@ -89,6 +88,5 @@
{% include "shared/more_articles_snippet.html" %}
</section>
{% endif %}
- </div>
{% endblock %}
diff --git a/region/templates/region/region_articles_page.html b/region/templates/region/region_articles_page.html
index 87e5b68be17f1aecddb9555b1ab5182577e682e5..dd8ce7228d040314b7fd3f825b556b0064ae64b4 100644
--- a/region/templates/region/region_articles_page.html
+++ b/region/templates/region/region_articles_page.html
@@ -2,9 +2,6 @@
{% block content %}
<main>
-
- <div class="container container--default py-8 lg:py-24">
-
<header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
</header>
@@ -16,7 +13,6 @@
</div>
{% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
- </div>
</main>
{% endblock %}
diff --git a/region/templates/region/region_center_page.html b/region/templates/region/region_center_page.html
index 42c05775c4880474c6075db208fd24b421ee577b..5206ea08ffd029e2fc4f864ec02c447c40f79ea8 100644
--- a/region/templates/region/region_center_page.html
+++ b/region/templates/region/region_center_page.html
@@ -16,7 +16,6 @@
{% endblock %}
{% block content %}
- <div class="container container--default pt-8 lg:pb-16">
<article>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<div class="lg:w-3/5 xl:w-2/3">
@@ -46,6 +45,5 @@
</div>
</div>
</article>
- </div>
{% endblock %}
diff --git a/region/templates/region/region_contact_page.html b/region/templates/region/region_contact_page.html
index 65abc403f78021ec981992db9b4d0dd268b28d0d..3676968919beb19e9224426f366a2ccf205a0abb 100644
--- a/region/templates/region/region_contact_page.html
+++ b/region/templates/region/region_contact_page.html
@@ -2,8 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8">
<div class="lg:flex lg:mt-8 space-y-16 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-5">
<section class="lg:w-3/5 xl:w-2/3">
<header>
@@ -83,6 +81,4 @@
{% include "shared/followus_snippet.html" %}
- </div>
-
{% endblock %}
diff --git a/region/templates/region/region_election_point_page.html b/region/templates/region/region_election_point_page.html
index 1a4241d2b23a10ea34f9f6ee569deb83d45204c4..1fcc925c9103ca50922f85afdbbe3b47d331593c 100644
--- a/region/templates/region/region_election_point_page.html
+++ b/region/templates/region/region_election_point_page.html
@@ -2,7 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<main>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -76,6 +75,5 @@
</section>
</div>
</main>
- </div>
{% endblock content %}
diff --git a/region/templates/region/region_people_page.html b/region/templates/region/region_people_page.html
index 15b6160b9b86edef43aca1227ccf03a2a042d899..88a63bbd81d83ea4c991b856f30eb9b05481b3cd 100644
--- a/region/templates/region/region_people_page.html
+++ b/region/templates/region/region_people_page.html
@@ -2,9 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8 lg:py-24">
-
<header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">
{{ page.title }}
@@ -19,6 +16,5 @@
{% endif %}
{% endfor %}
</main>
- </div>
{% endblock %}
diff --git a/region/templates/region/region_person_page.html b/region/templates/region/region_person_page.html
index d094c82e44458f589f2a7de37741911a98b08560..2bb465389be7b9da7542f26c02db0a038e335379 100644
--- a/region/templates/region/region_person_page.html
+++ b/region/templates/region/region_person_page.html
@@ -18,7 +18,6 @@
{% endblock %}
{% block content %}
- <div class="container container--default py-8 lg:pb-24">
<main>
<div class="flex flex-col lg:flex-row lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -153,6 +152,5 @@
</section>
</div>
</main>
- </div>
{% endblock %}
diff --git a/region/templates/region/region_program_page.html b/region/templates/region/region_program_page.html
index 5287b37368731a03e7b9580301553ab14366623b..1a6709d8bd934bc44c060ea406be841484a62eb3 100644
--- a/region/templates/region/region_program_page.html
+++ b/region/templates/region/region_program_page.html
@@ -3,7 +3,6 @@
{% block content %}
- <div class="container container--default py-8">
<div class="lg:flex lg:mt-8 space-y-16 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-5">
<section>
<header>
@@ -21,5 +20,4 @@
{% endfor %}
</section>
</div>
- </div>
{% endblock %}
diff --git a/shared/models.py b/shared/models.py
index a145e5484ff5ffc9c4069a1f6ae1bae1d01f71b5..09c39f312e5f1835ef0ebcca4180af93977abd7d 100644
--- a/shared/models.py
+++ b/shared/models.py
@@ -31,7 +31,9 @@ class SubpageMixin:
class ArticleMixin(models.Model):
"""
- Common fields for articles
+ Common fields for articles.
+
+ Must be used in class definition before MetadataPageMixin!
If you want to tag articles, add tags as `tags` field in article page model.
"""
@@ -101,6 +103,16 @@ class ArticleMixin(models.Model):
"""Page used for filtering by tags in url like `?tag=foo`."""
return self.get_parent()
+ def get_meta_image(self):
+ return self.image
+
+ def get_meta_description(self):
+ if self.search_description:
+ return self.search_description
+ if len(self.perex) > 150:
+ return str(self.perex)[:150] + "..."
+ return self.perex
+
class MenuMixin(Page):
menu = StreamField(
diff --git a/shared/templates/shared/social_icons_snippet.html b/shared/templates/shared/social_icons_snippet.html
index bddeafb635592412fc357b578b7a7e91a48f7974..f2b332dca466ddcc0bf1d33b4a03ddf71b0c9d2e 100644
--- a/shared/templates/shared/social_icons_snippet.html
+++ b/shared/templates/shared/social_icons_snippet.html
@@ -5,10 +5,10 @@
<a href="{{ page.root_page.youtube }}" rel="noopener noreferrer" target="_blank" title="Náš účet na YouTube" class="social-icon "><i class="ico--youtube"></i></a>
{% endif %}
{% if page.root_page.instagram %}
- <a href="https://www.instagram.com/pirati.cz/" rel="noopener noreferrer" target="_blank" title="Instagram - Česká pirátská strana" class="social-icon "><i class="ico--instagram"></i></a>
+ <a href="{{ page.root_page.instagram }}" rel="noopener noreferrer" target="_blank" title="Instagram - Česká pirátská strana" class="social-icon "><i class="ico--instagram"></i></a>
{% endif %}
{% if page.root_page.flickr %}
- <a href="https://www.flickr.com/photos/pirati/" rel="noopener noreferrer" target="_blank" title="Flickr - Česká pirátská strana" class="social-icon "><i class="ico--flickr"></i></a>
+ <a href="{{ page.root_page.flickr }}" rel="noopener noreferrer" target="_blank" title="Flickr - Česká pirátská strana" class="social-icon "><i class="ico--flickr"></i></a>
{% endif %}
{#<a href="/feed.xml" rel="noopener noreferrer" target="_blank" title="Články tohoto webu v RSS" class="social-icon "><i class="ico--feed"></i></a>#}
<a href="mailto:{{ page.root_page.contact_email|default:"info@pirati.cz" }}" class="social-icon "><i class="ico--envelope"></i></a>
diff --git a/uniweb/models.py b/uniweb/models.py
index f4dc030c1efe036bf85b8dba8a0860a7cd20ca50..d279eb022d60c1a27edc0193f201b2c199677544 100644
--- a/uniweb/models.py
+++ b/uniweb/models.py
@@ -459,7 +459,10 @@ class UniwebArticlePage(ArticleMixin, SubpageMixin, MetadataPageMixin, Page):
content_panels = ArticleMixin.content_panels + [FieldPanel("tags")]
- promote_panels = make_promote_panels()
+ promote_panels = make_promote_panels(
+ admin_help.build(admin_help.NO_SEO_TITLE, admin_help.NO_DESCRIPTION_USE_PEREX),
+ search_image=False,
+ )
### RELATIONS