zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merges follower/following views

Browse source 
They were almost identical!
This commit is contained in:
Mouse Reeve 2022-07-29 13:07:15 -07:00
parent 4929dd3b26
commit d458001491
9 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
{% load utilities %}
{% block primary_link %}{% spaceless %}
{% url 'user-followers' request.user.localname %}
{% url 'user-relationships' request.user.localname 'followers' %}
{% endspaceless %}{% endblock %}
{% block icon %}

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

@ -4,7 +4,7 @@
{% load utilities %}
{% block primary_link %}{% spaceless %}
{% url 'user-followers' request.user.localname %}
{% url 'user-relationships' request.user.localname 'followers' %}
{% endspaceless %}{% endblock %}
{% block icon %}

4
bookwyrm/templates/user/relationships/layout.html
View file

@ -6,11 +6,11 @@
{% with user|username as username %}
<nav class="tabs">
<ul>
{% url 'user-followers' user|username as url %}
{% url 'user-relationships' user|username 'followers' as url %}
<li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
<a href="{{ url }}">{% trans "Followers" %}</a>
</li>
{% url 'user-following' user|username as url %}
{% url 'user-relationships' user|username 'following' as url %}
<li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
<a href="{{ url }}">{% trans "Following" %}</a>
</li>

12
bookwyrm/templates/user/user_preview.html
View file

@ -23,8 +23,14 @@
<p>
{% if request.user.id == user.id or admin_mode %}
<a href="{% url 'user-followers' user|username %}">{% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}</a>,
<a href="{% url 'user-following' user|username %}">{% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %}</a>
<a href="{% url 'user-relationships' user|username 'followers' %}">{% blocktrans trimmed count counter=user.followers.count %}
{{ counter }} follower
{% plural %}
{{ counter }} followers
{% endblocktrans %}</a>,
<a href="{% url 'user-relationships' user|username 'following' %}">{% blocktrans trimmed with counter=user.following.count %}
{{ counter }} following
{% endblocktrans %}</a>
{% elif request.user.is_authenticated %}
@ -34,7 +40,7 @@
{% endif %}
{% else %}
{% mutuals_count user as mutuals %}
<a href="{% url 'user-followers' user|username %}">
<a href="{% url 'user-relationships' user|username 'followers' %}">
{% if mutuals %}
{% blocktrans with mutuals_display=mutuals|intcomma count counter=mutuals %}{{ mutuals_display }} follower you follow{% plural %}{{ mutuals_display }} followers you follow{% endblocktrans %}
{% elif request.user in user.following.all %}