mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-11-23 01:51:08 +00:00
Also in suggestion area
This commit is contained in:
parent
a13db6adc3
commit
f5c129dce7
3 changed files with 37 additions and 4 deletions
|
@ -11,7 +11,14 @@
|
||||||
</a>
|
</a>
|
||||||
<div class="media-content">
|
<div class="media-content">
|
||||||
<a href="{{ user.local_path }}" class="is-block mb-2">
|
<a href="{{ user.local_path }}" class="is-block mb-2">
|
||||||
<span class="title is-4 is-block">{{ user.display_name }}</span>
|
<span class="title is-4 is-block">
|
||||||
|
{{ user.display_name }}
|
||||||
|
{% if user.manually_approves_followers %}
|
||||||
|
<span class="icon icon-lock is-size-7" title="{% trans 'Locked account' %}">
|
||||||
|
<span class="is-sr-only">{% trans "Locked account" %}</span>
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</span>
|
||||||
<span class="subtitle is-7 is-block">@{{ user|username }}</span>
|
<span class="subtitle is-7 is-block">@{{ user|username }}</span>
|
||||||
</a>
|
</a>
|
||||||
{% include 'snippets/follow_button.html' with user=user %}
|
{% include 'snippets/follow_button.html' with user=user %}
|
||||||
|
|
|
@ -13,10 +13,23 @@
|
||||||
{% include 'snippets/follow_button.html' with user=user minimal=True %}
|
{% include 'snippets/follow_button.html' with user=user minimal=True %}
|
||||||
{% if user.mutuals %}
|
{% if user.mutuals %}
|
||||||
<p class="help">
|
<p class="help">
|
||||||
{% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %}
|
{% blocktrans trimmed with mutuals=user.mutuals|intcomma count counter=user.mutuals %}
|
||||||
|
{{ mutuals }} follower you follow
|
||||||
|
{% plural %}
|
||||||
|
{{ mutuals }} followers you follow{% endblocktrans %}
|
||||||
</p>
|
</p>
|
||||||
{% elif user.shared_books %}
|
{% elif user.shared_books %}
|
||||||
<p class="help">{% blocktrans with shared_books=user.shared_books|intcomma count counter=user.shared_books %}{{ shared_books }} book on your shelves{% plural %}{{ shared_books }} books on your shelves{% endblocktrans %}</p>
|
<p class="help">
|
||||||
|
{% blocktrans trimmed with shared_books=user.shared_books|intcomma count counter=user.shared_books %}
|
||||||
|
{{ shared_books }} book on your shelves
|
||||||
|
{% plural %}
|
||||||
|
{{ shared_books }} books on your shelves
|
||||||
|
{% endblocktrans %}
|
||||||
|
</p>
|
||||||
|
{% elif request.user in user.following.all %}
|
||||||
|
<p class="help">
|
||||||
|
{% trans "Follows you" %}
|
||||||
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -10,7 +10,14 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="media-content">
|
<div class="media-content">
|
||||||
<p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
|
<p>
|
||||||
|
{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}
|
||||||
|
{% if user.manually_approves_followers %}
|
||||||
|
<span class="icon icon-lock is-size-7" title="{% trans 'Locked account' %}">
|
||||||
|
<span class="is-sr-only">{% trans "Locked account" %}</span>
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
<p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
|
<p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
|
||||||
<p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
|
<p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
|
||||||
<p>
|
<p>
|
||||||
|
@ -23,7 +30,13 @@
|
||||||
|
|
||||||
{% mutuals_count user as mutuals %}
|
{% mutuals_count user as mutuals %}
|
||||||
<a href="{% url 'user-followers' user|username %}">
|
<a href="{% url 'user-followers' user|username %}">
|
||||||
|
{% if mutuals %}
|
||||||
{% blocktrans with mutuals_display=mutuals|intcomma count counter=mutuals %}{{ mutuals_display }} follower you follow{% plural %}{{ mutuals_display }} followers you follow{% endblocktrans %}
|
{% 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 %}
|
||||||
|
{% trans "Follows you" %}
|
||||||
|
{% else %}
|
||||||
|
{% trans "No followers you follow" %}
|
||||||
|
{% endif %}
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
Loading…
Reference in a new issue