diff --git a/shared/templatetags/shared_filters.py b/shared/templatetags/shared_filters.py index 9ff5baa1a809b7039fb3ad0a5c7d73e7b1660da1..a8bb00aa3495549f37e9beac81cb80a633b2b0cc 100644 --- a/shared/templatetags/shared_filters.py +++ b/shared/templatetags/shared_filters.py @@ -8,9 +8,4 @@ register = template.Library() @register.filter def markdown(value): """Prekonvertuje vstupni text na markdown, necekane""" - return mark_safe(md.markdown(value)) - - -@register.filter -def dictionary(value): - return value.__dict__ + return mark_safe(md.markdown(value)) \ No newline at end of file diff --git a/shared/utils.py b/shared/utils.py index c27449f8ded58045eba91bad10bdb65869cebb27..23eafdf5b23bf869a6407a131ca4ad697b9917de 100644 --- a/shared/utils.py +++ b/shared/utils.py @@ -51,7 +51,7 @@ def make_promote_panels( panels.append(HelpPanel(help_content)) panels.append(CommentPanel()) - return [MultiFieldPanel(panels, gettext_lazy("Common page configuration"))] + return [MultiFieldPanel(panels, gettext_lazy("Metadata stránky"))] def subscribe_to_newsletter(email, list_id): diff --git a/shared_legacy/templates/shared/person_badge_snippet.html b/shared_legacy/templates/shared/person_badge_snippet.html index 28399a9b82bf5dab738c7801a3d560289826d4d3..5d10d8b9be4193ecdcc6c66a612fd7fbbc2e7cd9 100644 --- a/shared_legacy/templates/shared/person_badge_snippet.html +++ b/shared_legacy/templates/shared/person_badge_snippet.html @@ -3,8 +3,8 @@ <div class="badge badge--condensed"> <a href="{{ person_page.url }}" class="avatar badge__avatar avatar--sm"> {% if person_page.profile_photo %} - {% image person_page.profile_photo fill-80x80 as profile_img %} - {% image person_page.profile_photo fill-160x160 as profile_img_2x %} + {% image person_page.profile_photo fill-80x80 as profile_img %} + {% image person_page.profile_photo fill-160x160 as profile_img_2x %} <img src="{{ profile_img.url }}" srcset="{{ profile_img.url }}, {{ profile_img_2x.url }} 2x" alt="{{ person_page.title }}"/> {% else %} <img src="{% static "shared/img/unknown_pirate_160x160.jpg" %}" alt="{{ person_page.title }}"/> diff --git a/shared_legacy/utils.py b/shared_legacy/utils.py index c27449f8ded58045eba91bad10bdb65869cebb27..358f50566c9ff816a42e937a16987bcbe12fd546 100644 --- a/shared_legacy/utils.py +++ b/shared_legacy/utils.py @@ -47,11 +47,12 @@ def make_promote_panels( if search_description: panels.append(FieldPanel("search_description")) if search_image: - panels.append(FieldPanel("search_image")) + # TODO + panels.append(FieldPanel("search_image")) #, label="Obrázek pro embed")) panels.append(HelpPanel(help_content)) panels.append(CommentPanel()) - return [MultiFieldPanel(panels, gettext_lazy("Common page configuration"))] + return [MultiFieldPanel(panels, gettext_lazy("Metadata stránky"))] def subscribe_to_newsletter(email, list_id): diff --git a/uniweb/templates/uniweb/blocks/people_group_block.html b/uniweb/templates/uniweb/blocks/people_group_block.html index b75071db202105ef40340d106cd5df99ce932c66..b2fce69e0e8b9da1dc7373858e935034121d5f19 100644 --- a/uniweb/templates/uniweb/blocks/people_group_block.html +++ b/uniweb/templates/uniweb/blocks/people_group_block.html @@ -1,14 +1,16 @@ +{% load shared_filters %} + <section> <h2 class="head-heavy-base mb-4"> {{ self.group_title }} </h2> <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8"> {% for person_details in self.person_list %} - {% with person_details.person as person_page %} + {% with person_details.person.specific as person_page %} {% if person_details.position %} - {% include "shared/person_badge_snippet.html" with title=person_details.position %} + {% include "shared/person_badge_snippet.html" with title=person_details.position person_page=person_page %} {% else %} - {% include "shared/person_badge_snippet.html" with title=person_page.job %} + {% include "shared/person_badge_snippet.html" with title=person_page.job person_page=person_page %} {% endif %} {% endwith %} {% endfor %}