mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-29 21:11:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2210 from bookwyrm-social/notification-cw

Browse source 
Show content warning in notification status previews
This commit is contained in:
Mouse Reeve 2022-07-09 13:29:22 -07:00 committed by GitHub
commit 85f811022f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/templates/notifications/items/boost.html
View file

@ -118,7 +118,7 @@
<div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-muted{% endif %}"> <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-muted{% endif %}">
<div class="columns"> <div class="columns">
<div class="column is-clipped"> <div class="column is-clipped">
{% include 'snippets/status_preview.html' with status=related_status %} {% include 'notifications/items/status_preview.html' with status=related_status %}
</div> </div>
<div class="column is-narrow has-text-muted"> <div class="column is-narrow has-text-muted">
{{ related_status.published_date|timesince }} {{ related_status.published_date|timesince }}

2
bookwyrm/templates/notifications/items/fav.html
View file

@ -119,7 +119,7 @@
<div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-muted{% endif %}"> <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-muted{% endif %}">
<div class="columns"> <div class="columns">
<div class="column is-clipped"> <div class="column is-clipped">
{% include 'snippets/status_preview.html' with status=related_status %} {% include 'notifications/items/status_preview.html' with status=related_status %}
</div> </div>
<div class="column is-narrow has-text-muted"> <div class="column is-narrow has-text-muted">
{{ related_status.published_date|timesince }} {{ related_status.published_date|timesince }}

2
bookwyrm/templates/notifications/items/mention.html
View file

@ -51,7 +51,7 @@
<div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-default{% endif %}"> <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-default{% endif %}">
<div class="columns"> <div class="columns">
<div class="column is-clipped"> <div class="column is-clipped">
{% include 'snippets/status_preview.html' with status=related_status %} {% include 'notifications/items/status_preview.html' with status=related_status %}
</div> </div>
<div class="column is-narrow has-text-default"> <div class="column is-narrow has-text-default">
{{ related_status.published_date|timesince }} {{ related_status.published_date|timesince }}

2
bookwyrm/templates/notifications/items/reply.html
View file

@ -54,7 +54,7 @@
<div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-default{% endif %}"> <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-body has-text-default{% endif %}">
<div class="columns"> <div class="columns">
<div class="column is-clipped"> <div class="column is-clipped">
{% include 'snippets/status_preview.html' with status=related_status %} {% include 'notifications/items/status_preview.html' with status=related_status %}
</div> </div>
<div class="column is-narrow has-text-default"> <div class="column is-narrow has-text-default">
{{ related_status.published_date|timesince }} {{ related_status.published_date|timesince }}

15
bookwyrm/templates/snippets/status_preview.html → bookwyrm/templates/notifications/items/status_preview.html
View file

@ -1,4 +1,17 @@
{% if status.content %} {% load i18n %}
{% if status.content_warning %}
{% trans "Content warning" as text %}
<span>
<span class="icon icon-warning is-size-5" title="{{ text }}">
<span class="is-sr-only">{{ text }}</span>
</span>
<a href="{{ status.local_path }}">
{{ status.content_warning }}
</a>
</span>
{% elif status.content %}
<a href="{{ status.local_path }}"> <a href="{{ status.local_path }}">
{{ status.content | safe | truncatewords_html:10 }}{% if status.mention_books %} <em>{{ status.mention_books.first.title }}</em>{% endif %} {{ status.content | safe | truncatewords_html:10 }}{% if status.mention_books %} <em>{{ status.mention_books.first.title }}</em>{% endif %}
</a> </a>