diff --git a/fedireads/static/format.css b/fedireads/static/format.css index f0b5e1a8..28dc98ac 100644 --- a/fedireads/static/format.css +++ b/fedireads/static/format.css @@ -607,3 +607,7 @@ a .icon { position: absolute; overflow: hidden; } + +.book-row .book-cover { + float: none; +} diff --git a/fedireads/templates/snippets/status.html b/fedireads/templates/snippets/status.html index 92900b27..89f59fe3 100644 --- a/fedireads/templates/snippets/status.html +++ b/fedireads/templates/snippets/status.html @@ -22,36 +22,8 @@ - {% if not hide_book and status.mention_books.count %} - {% for book in status.mention_books.all|slice:"0:3" %} -
- {% if status.status_type == 'Review' %} - {% include 'snippets/book.html' with book=book %} - {% else %} - {% include 'snippets/book.html' with book=book description=True %} - {% endif %} -
- {% endfor %} - {% endif %} - {% if not hide_book and status.book%} -
- {% if status.status_type == 'Review' %} - {% include 'snippets/book.html' with book=status.book %} - {% else %} - {% include 'snippets/book.html' with book=status.book description=True %} - {% endif %} -
- {% endif %} - {% if status.status_type == 'Review' %}

{{ status.name }} - {{ status.rating | stars }} stars, by {% include 'snippets/username.html' with user=status.user %} -

{% endif %} - {% if status.status_type != 'Update' and status.status_type != 'Boost' %} -
{{ status.content | safe }}
- {% 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 %}

Thread{% endif %} + {% include 'snippets/status_content.html' with status=status %} + {% if status.status_type != 'Boost' %} {% include 'snippets/interaction.html' with activity=status %} diff --git a/fedireads/templates/snippets/status_content.html b/fedireads/templates/snippets/status_content.html new file mode 100644 index 00000000..7da75784 --- /dev/null +++ b/fedireads/templates/snippets/status_content.html @@ -0,0 +1,36 @@ +{% load fr_display %} + +{% if not hide_book and status.mention_books.count %} +

+{% for book in status.mention_books.all|slice:"0:3" %} +
+ {% if status.status_type == 'Review' %} + {% include 'snippets/book.html' with book=book %} + {% else %} + {% include 'snippets/book.html' with book=book description=True %} + {% endif %} +
+{% endfor %} +
+{% endif %} + +{% if not hide_book and status.book%} +
+ {% if status.status_type == 'Review' %} + {% include 'snippets/book.html' with book=status.book %} + {% else %} + {% include 'snippets/book.html' with book=status.book description=True %} + {% endif %} +
+{% endif %} +{% if status.status_type == 'Review' %}

{{ status.name }} + {{ status.rating | stars }} stars, by {% include 'snippets/username.html' with user=status.user %} +

{% endif %} +{% if status.status_type != 'Update' and status.status_type != 'Boost' %} +
{{ status.content | safe }}
+{% endif %} +{% if status.status_type == 'Boost' %} + {% include 'snippets/status.html' with status=status.boosted_status %} +{% endif %} +{% if not max_depth and status.reply_parent or status|replies %}

Thread{% endif %} +