Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added metadata using schema.org to contacts #1120

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Added metadata using schema.org to contacts #1120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61bc7c4
Added metadata using schema.org
ResendeTech Sep 20, 2024
db6e246
added one line of emptiness
ResendeTech Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 89 additions & 45 deletions contact/templates/contact/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends 'base.html' %}

{% load wagtailcore_tags wagtailimages_tags %}

Expand All @@ -7,7 +7,7 @@ <h1>{{ page.title }}</h1>

<div class="row">
<div class="col">
{{ page.specific.description | richtext }}
{{ page.specific.description|richtext }}

{% if page.specific.phone %}
<dt>Phone</dt>
Expand All @@ -21,17 +21,15 @@ <h1>{{ page.title }}</h1>

{% if page.specific.website %}
<dt>Website</dt>
<dd>
<a href="{{ page.specific.website }}">{{ page.specific.website }}</a>
</dd>
<dd><a href="{{ page.specific.website }}">{{ page.specific.website }}</a></dd>
{% endif %}

{% if page.addresses.count %}
<h2>Address(es)</h2>

<dl>
{% for address in page.addresses.all %}
<dt>{{ address.address_type | title }}</dt>
<dt>{{ address.address_type|title }}</dt>
<dd>{{ address }}</dd>
{% endfor %}
</dl>
Expand All @@ -42,7 +40,7 @@ <h2>Worship time(s)</h2>

<dl>
{% for worship_time in page.worship_times.all %}
<dt>{{ worship_time.get_worship_type_display | title }}</dt>
<dt>{{ worship_time.get_worship_type_display|title }}</dt>
<dd>{{ worship_time.worship_time }}</dd>
{% endfor %}
</dl>
Expand All @@ -54,9 +52,7 @@ <h2>Worship time(s)</h2>
<ul>
{% for online_worship in page.online_worship.all %}
<li>
<a href="{% pageurl online_worship %}">
{{ online_worship.title }}
</a>
<a href="{% pageurl online_worship %}">{{ online_worship.title }}</a>
</li>
{% endfor %}
</ul>
Expand All @@ -82,35 +78,27 @@ <h2>Presiding clerk(s)</h2>

<div class="col">
{% if quarterly_meetings %}

<h2 class="fs-3">Quarterly Meetings</h2>

<ul>
{% for meeting in quarterly_meetings %}
<li class="list-unstyled">
<a href="{% pageurl meeting %}">
{{ meeting.title }}
</a>
<a href="{% pageurl meeting %}">{{ meeting.title }}</a>
</li>
{% endfor %}
</ul>

{% endif %}

{% if monthly_meetings %}

<h2 class="fs-3">Monthly Meetings</h2>

<ul>
{% for meeting in monthly_meetings %}
<li class="list-unstyled">
<a href="{% pageurl meeting %}">
{{ meeting.title }}
</a>
<a href="{% pageurl meeting %}">{{ meeting.title }}</a>
</li>
{% endfor %}
</ul>

{% endif %}

{% if worship_groups %}
Expand All @@ -119,23 +107,18 @@ <h2 class="fs-3">Worship Groups</h2>
<ul>
{% for meeting in worship_groups %}
<li class="list-unstyled">
<a href="{% pageurl meeting %}">
{{ meeting.title }}
</a>
<a href="{% pageurl meeting %}">{{ meeting.title }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
</div>

</div>



{% if page.articles_authored.count %}
<h2>Articles</h2>
{% for article in page.articles_authored.all %}
{% include "magazine/magazine_article_summary.html" with article=article.article %}
{% include 'magazine/magazine_article_summary.html' with article=article.article %}
{% endfor %}
{% endif %}

Expand All @@ -146,29 +129,23 @@ <h2>Archive Articles</h2>
{% for article in page.archive_articles_authored.all %}
<li>
{{ article.article.issue }} -
<a
href="{% pageurl article.article.issue %}?pdf_page_number={{ article.article.pdf_page_number }}">
{{ article.article.title }}
</a>
<a href="{% pageurl article.article.issue %}?pdf_page_number={{ article.article.pdf_page_number }}">{{ article.article.title }}</a>
</li>
{% endfor %}
</ul>

{% endif %}

{% if page.books_authored.count %}
<h2>Books</h2>
{% for book_author in page.books_authored.all %}
{% with book_author.book as book %}
{% with book=book_author.book %}
<div class="card mb-2">
<div class="card-body">
<div>
<a href="{% pageurl book %}" class="card-title lead">
{{ book }}
</a>
<a href="{% pageurl book %}" class="card-title lead">{{ book }}</a>
</div>

{% image book.image max-150x150 class="float-left me-2" %}
{% image book.image max - 150 x150 class='float-left me-2' %}

{% if book.authors.count %}
<ul class="list-inline mb-1">
Expand All @@ -185,7 +162,7 @@ <h2>Books</h2>
</ul>
{% endif %}

{{ book.description | richtext | truncatewords_html:30 }}
{{ book.description|richtext|truncatewords_html:30 }}
</div>
</div>
{% endwith %}
Expand All @@ -195,8 +172,8 @@ <h2>Books</h2>
{% if page.specific.library_items_authored.count %}
<h2>Library items</h2>
{% for item_authored in page.specific.library_items_authored.all %}
{% with item_authored.library_item as library_item %}
{% include "library/library_item_card.html" %}
{% with library_item=item_authored.library_item %}
{% include 'library/library_item_card.html' %}
{% endwith %}
{% endfor %}
{% endif %}
Expand All @@ -205,13 +182,80 @@ <h2>Library items</h2>
<h2>Memorials</h2>

<ul class="list-group">
{% for memorial_minute in page.memorial_minutes.all|dictsort:"memorial_person.family_name" %}
{% for memorial_minute in page.memorial_minutes.all|dictsort:'memorial_person.family_name' %}
<li class="list-group-item">
<a href="{% pageurl memorial_minute %}">
{{ memorial_minute.memorial_person }}
</a>
<a href="{% pageurl memorial_minute %}">{{ memorial_minute.memorial_person }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% endblock content %}
{% endblock %}

{% block extra_js %}
<script type="application/ld+json">
{
"@context": "https://schema.org",
{% if page.specific_class_name == 'Person' %}
"@type": "Person",
"givenName": "{{ page.specific.given_name }}",
"familyName": "{{ page.specific.family_name }}",
{% elif page.specific_class_name == 'Meeting' %}
"@type": "Organization",
"additionalType": "{{ page.specific.get_meeting_type_display }}",
{% else %}
"@type": "Organization",
{% endif %}
"name": "{{ page.title }}",
{% if page.specific.description %}
"description": "{{ page.specific.description|striptags }}",
{% endif %}
{% if page.specific.website %}
"url": "{{ page.specific.website }}",
{% endif %}
{% if page.specific.email %}
"email": "{{ page.specific.email }}",
{% endif %}
{% if page.specific.phone %}
"telephone": "{{ page.specific.phone }}",
{% endif %}
{% if page.addresses.count %}
"address": [
{% for address in page.addresses.all %}
{
"@type": "PostalAddress",
"streetAddress": "{{ address.street_address }}{% if address.extended_address %}, {{ address.extended_address }}{% endif %}{% if address.po_box_number %}, PO Box {{ address.po_box_number }}{% endif %}",
"addressLocality": "{{ address.locality }}",
"addressRegion": "{{ address.region }}",
"postalCode": "{{ address.postal_code }}",
"addressCountry": "{{ address.country }}"
}{% if not forloop.last %},{% endif %}
{% endfor %}
],
{% endif %}
{% if page.specific_class_name == 'Meeting' and page.worship_times.count %}
"event": [
{% for worship_time in page.worship_times.all %}
{
"@type": "Event",
"name": "{{ worship_time.get_worship_type_display }}",
"description": "{{ worship_time.worship_time }}"
}{% if not forloop.last %},{% endif %}
{% endfor %}
],
{% endif %}
{% if page.specific_class_name == 'Meeting' and page.presiding_clerks.count %}
"member": [
{% for presiding_clerk in page.presiding_clerks.all %}
{
"@type": "Person",
"name": "{{ presiding_clerk.person.title }}",
"jobTitle": "Presiding Clerk"
}{% if not forloop.last %},{% endif %}
{% endfor %}
]
{% endif %}
}
</script>
{% endblock extra_js %}


Loading