yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Threaded-view on status pages

Browse Source 
It's hideous though, sorry
This commit is contained in:
Mouse Reeve
2020-03-09 17:03:59 -07:00
parent a0f1880f37
commit 2215e0a894
11 changed files with 91 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fedireads/templates/book.html
View File

@ -20,7 +20,7 @@
</form>
{% for review in user_reviews %}
{% include 'snippets/review.html' with review=review %}
{% include 'snippets/status.html' with status=review hide_book=True main=True depth=1 %}
{% endfor %}
</div>
</div>
@ -62,7 +62,7 @@
</form>
<p>Average rating: {{ rating | stars }}</p>
{% for review in reviews %}
{% include 'snippets/review.html' with review=review %}
{% include 'snippets/status.html' with status=review hide_book=True main=True depth=1 %}
{% endfor %}
</div>
</div>

2
fedireads/templates/feed.html
View File

@ -38,7 +38,7 @@
{% include 'snippets/tabs.html' with tabs=feed_tabs active_tab=active_tab %}
{% for activity in activities %}
{% include 'snippets/activity.html' with activity=activity %}
{% include 'snippets/status.html' with status=activity depth=1 %}
{% endfor %}
</div>

28
fedireads/templates/snippets/activity.html
View File

@ -1,28 +0,0 @@
{% load fr_display %}
<div class="update">
{% if activity.status_type == 'Review' %}
{% include 'snippets/activity_banner.html' with content="reviewed <i>"|add:activity.book.title|add:"</i>" %}
<div class="book-preview review">
{% include 'snippets/book.html' with book=activity.book size=large %}
<h3>{{ activity.name }}</h3>
<p>{{ activity.rating | stars }}</p>
<p>{{ activity.content | safe }}</p>
</div>
{% include 'snippets/interaction.html' with activity=activity %}
{% elif activity.status_type == 'Note' %}
{% include 'snippets/activity_banner.html' %}
<span>{{ activity.content | safe }}</span>
{% for book in activity.mention_books.all %}
<div class="book-preview review">
{% include 'snippets/book.html' with book=book size=large description=True %}
</div>
{% endfor %}
{% include 'snippets/interaction.html' with activity=activity %}
{% else %}
{# generic handling for a misc activity, which perhaps should not be displayed at all #}
did {{ activity.activity_type }}
</h2>
{% endif %}
</div>

10
fedireads/templates/snippets/activity_banner.html Normal file
View File

@ -0,0 +1,10 @@
{% load humanize %}
<h2>
{% include 'snippets/avatar.html' with user=activity.user %}
{% include 'snippets/username.html' with user=activity.user %}
{{ content | safe }}
<span class="time-ago">
<a href="{{ activity.absolute_id }}">{{ activity.published_date | naturaltime }}</a>
</span>
</h2>

2
fedireads/templates/snippets/interaction.html
View File

@ -11,7 +11,7 @@
<form name="comment" action="/comment" method="post">
{% csrf_token %}
<input type="hidden" name="parent" value="{{ activity.id }}"></input>
{{ comment_form.content }}
<textarea name="content" cols="40" rows="10" id="id_content"></textarea>
<button type="submit">Comment</button>
</form>
</div>

20
fedireads/templates/snippets/status.html Normal file
View File

@ -0,0 +1,20 @@
{% load fr_display %}
<div class="post {{ status.status_type|lower }} depth-{{ depth }} {% if main %}main{% else %}reply{% endif %}">
{% include 'snippets/activity_banner.html' with activity=status %}
{% if not hide_book and status.mention_books.count %}
<div class="book-preview">
{% include 'snippets/book.html' with book=status.mention_books.first %}
</div>
{% endif %}
{% if not hide_book and status.book%}
<div class="book-preview">
{% include 'snippets/book.html' with book=status.book %}
</div>
{% endif %}
{% 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 %}
<blockquote>{{ status.content }}</blockquote>
{% include 'snippets/interaction.html' with activity=status %}
</div>

18
fedireads/templates/snippets/thread.html Normal file
View File

@ -0,0 +1,18 @@
{% load fr_display %}
{% with depth=depth|add:1 %}
{% if depth <= max_depth and status.reply_parent and direction <= 0 %}
{% with direction=-1 %}
{% include 'snippets/thread.html' with status=status|parent is_root=False %}
{% endwith %}
{% endif %}
{% include 'snippets/status.html' with status=status main=is_root %}
{% if depth <= max_depth and direction >= 0 %}
{% for reply in status|replies %}
{% with direction=1 %}
{% include 'snippets/thread.html' with status=reply is_root=False %}
{% endwith %}
{% endfor %}
{% endif %}
{% endwith %}

12
fedireads/templates/status.html
View File

@ -2,15 +2,9 @@
{% block content %}
<div id="content">
{% if status.reply_parent %}
{% include 'snippets/status.html' with status=status.reply_parent %}
{% endif %}
{% include 'snippets/status.html' with status=status main=True %}
{% for reply in replies %}
{% include 'snippets/status.html' with status=reply %}
{% endfor %}
<div class="comment-thread">
{% include 'snippets/thread.html' with status=status depth=0 max_depth=6 is_root=True direction=0 %}
</div>
</div>
{% endblock %}