zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge pull request #2970 from hughrun/move

Browse source 
Add `Move` activity for user migration
This commit is contained in:
Mouse Reeve 2023-11-01 17:14:34 -07:00 • committed by GitHub
commit 621cfa7ed2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 792 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bookwyrm/templates/settings/users/user_admin.html
View file

@ -75,10 +75,17 @@
<td>{{ user.last_active_date }}</td>
<td>
{% if user.is_active %}
<span class="tag is-success" aria-hidden="true">
<span class="icon icon-check"></span>
</span>
{% trans "Active" %}
{% if user.moved_to %}
<span class="tag is-info" aria-hidden="true">
<span class="icon icon-x"></span>
</span>
{% trans "Moved" %}
{% else %}
<span class="tag is-success" aria-hidden="true">
<span class="icon icon-check"></span>
</span>
{% trans "Active" %}
{% endif %}
{% elif user.deactivation_reason == "moderator_deletion" or user.deactivation_reason == "self_deletion" %}
<span class="tag is-danger" aria-hidden="true">
<span class="icon icon-x"></span>

12
bookwyrm/templates/settings/users/user_info.html
View file

@ -24,9 +24,15 @@
<h4 class="title is-4">{% trans "Status" %}</h4>
<div class="box is-flex-grow-1 has-text-weight-bold">
{% if user.is_active %}
<p class="notification is-success">
{% trans "Active" %}
</p>
{% if user.moved_to %}
<p class="notification is-info">
{% trans "Moved" %}
</p>
{% else %}
<p class="notification is-success">
{% trans "Active" %}
</p>
{% endif %}
{% else %}
<p class="notification is-warning">
{% trans "Inactive" %}