zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge branch 'master' into works-editions

Browse source
This commit is contained in:
Mouse Reeve 2020-03-30 15:30:06 -07:00
commit 5c4d078f92
12 changed files with 140 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fedireads/templates/notifications.html
View file

@ -32,6 +32,9 @@
<div class="row shrink">
{% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
</div>
{% elif notification.notification_type == 'BOOST' %}
boosted your <a href="{{ notification.related_status.absolute_id}}">status</a>
{% endif %}
</div>
{% endfor %}

9
fedireads/templates/snippets/status.html
View file

@ -10,6 +10,8 @@
reviewed {{ status.book.title }}
{% elif status.status_type == 'Comment' %}
commented on {{ status.book.title }}
{% elif status.status_type == 'Boost' %}
boosted
{% elif status.reply_parent %}
{% with parent_status=status|parent %}
replied to {% include 'snippets/username.html' with user=parent_status.user possessive=True %} <a href="{{parent_status.absolute_id }}">{{ parent_status.status_type|lower }}</a>
@ -43,10 +45,15 @@
{% if status.status_type == 'Review' %}<h4>{{ status.name }}
<small>{{ status.rating | stars }} stars, by {% include 'snippets/username.html' with user=status.user %}</small>
</h4>{% endif %}
{% if status.status_type != 'Update' %}
{% if status.status_type != 'Update' and status.status_type != 'Boost' %}
<blockquote>{{ status.content | safe }}</blockquote>
{% endif %}
{% if status.status_type == 'Boost' %}
{% include 'snippets/status.html' with status=status.boosted_status depth=depth|add:1 %}
{% endif %}
{% if not max_depth and status.reply_parent or status|replies %}<p><a href="{{ status.absolute_id }}">Thread</a>{% endif %}
</div>
{% if status.status_type != 'Boost' %}
{% include 'snippets/interaction.html' with activity=status %}
{% endif %}