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

Merge branch 'main' into redis-activity-stream

Browse source
This commit is contained in:
Mouse Reeve 2021-03-23 12:53:12 -07:00
commit 2acf1355e9
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bookwyrm/templates/book/book.html
View file

@ -296,3 +296,7 @@
</div> </div>
{% endblock %} {% endblock %}
{% block scripts %}
<script src="/static/js/tabs.js"></script>
{% endblock %}

5
bookwyrm/templates/feed/feed.html
View file

@ -31,7 +31,7 @@
</a> </a>
{# announcements and system messages #} {# announcements and system messages #}
{% if request.user.show_goal and not goal and tab == 'home' %} {% if request.user.show_goal and not goal and tab == 'home' and not activities.number > 1 %}
{% now 'Y' as year %} {% now 'Y' as year %}
<section class="block"> <section class="block">
{% include 'snippets/goal_card.html' with year=year %} {% include 'snippets/goal_card.html' with year=year %}
@ -43,9 +43,10 @@
{% if not activities %} {% if not activities %}
<p>{% trans "There aren't any activities right now! Try following a user to get started" %}</p> <p>{% trans "There aren't any activities right now! Try following a user to get started" %}</p>
{% endif %} {% endif %}
{% for activity in activities %} {% for activity in activities %}
<div class="block"> <div class="block">
{% include 'snippets/status/status.html' with status=activity %} {% include 'snippets/status/status.html' with status=activity %}
</div> </div>
{% endfor %} {% endfor %}