From c17a2ec55ba18d52c5f83a19e1d30550063151a4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@mouses-mbp-new.attlocal.net>
Date: Sun, 5 Nov 2023 10:18:04 -0800
Subject: [PATCH] Creates snippet for user tag in admin view

The existing display wasn't showing the correct colors and was repeating
code unnecessarily
---
 .../templates/settings/users/user_admin.html  | 26 +------------------
 .../templates/settings/users/user_info.html   | 19 +-------------
 .../templates/snippets/user_active_tag.html   | 17 ++++++++++++
 .../snippets/user_active_tag_item.html        | 19 ++++++++++++++
 4 files changed, 38 insertions(+), 43 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/user_active_tag.html
 create mode 100644 bookwyrm/templates/snippets/user_active_tag_item.html

diff --git a/bookwyrm/templates/settings/users/user_admin.html b/bookwyrm/templates/settings/users/user_admin.html
index a1d93ddd0..cc5c51ba7 100644
--- a/bookwyrm/templates/settings/users/user_admin.html
+++ b/bookwyrm/templates/settings/users/user_admin.html
@@ -74,31 +74,7 @@
             <td>{{ user.created_date }}</td>
             <td>{{ user.last_active_date }}</td>
             <td>
-                {% if user.is_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>
-                    </span>
-                    {% trans "Deleted" %}
-                    <span class="help">({{ user.get_deactivation_reason_display }})</span>
-                {% else %}
-                    <span class="tag is-warning" aria-hidden="true">
-                        <span class="icon icon-x"></span>
-                    </span>
-                    {% trans "Inactive" %}
-                    <span class="help">({{ user.get_deactivation_reason_display }})</span>
-                {% endif %}
+                {% include "snippets/user_active_tag.html" with user=user %}
             </td>
             {% if status == "federated" %}
             <td>
diff --git a/bookwyrm/templates/settings/users/user_info.html b/bookwyrm/templates/settings/users/user_info.html
index 368045a0d..f35c60db9 100644
--- a/bookwyrm/templates/settings/users/user_info.html
+++ b/bookwyrm/templates/settings/users/user_info.html
@@ -23,24 +23,7 @@
     <div class="column is-flex is-flex-direction-column is-4">
         <h4 class="title is-4">{% trans "Status" %}</h4>
         <div class="box is-flex-grow-1 has-text-weight-bold">
-            {% if user.is_active %}
-                {% 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" %}
-                {% if user.deactivation_reason %}
-                <span class="help">({% trans user.get_deactivation_reason_display %})</span>
-                {% endif %}
-            </p>
-            {% endif %}
+            {% include "snippets/user_active_tag.html" with large=True %}
             <p class="notification">
                 {% if user.local %}
                 {% trans "Local" %}
diff --git a/bookwyrm/templates/snippets/user_active_tag.html b/bookwyrm/templates/snippets/user_active_tag.html
new file mode 100644
index 000000000..c3f067b43
--- /dev/null
+++ b/bookwyrm/templates/snippets/user_active_tag.html
@@ -0,0 +1,17 @@
+{% load i18n %}
+
+{% if user.is_active %}
+    {% if user.moved_to %}
+        {% trans "Moved" as text %}
+        {% include "snippets/user_active_tag_item.html" with icon="x" text=text level="info" %}
+    {% else %}
+        {% trans "Active" as text %}
+        {% include "snippets/user_active_tag_item.html" with icon="check" text=text level="success" %}
+    {% endif %}
+{% elif user.is_permanently_deleted %}
+    {% trans "Deleted" as text %}
+    {% include "snippets/user_active_tag_item.html" with icon="x" text=text level="danger" deactivation_reason=user.get_deactivation_reason_display %}
+{% else %}
+    {% trans "Inactive" as text %}
+    {% include "snippets/user_active_tag_item.html" with icon="x" text=text level="warning" deactivation_reason=user.get_deactivation_reason_display %}
+{% endif %}
diff --git a/bookwyrm/templates/snippets/user_active_tag_item.html b/bookwyrm/templates/snippets/user_active_tag_item.html
new file mode 100644
index 000000000..e722150f2
--- /dev/null
+++ b/bookwyrm/templates/snippets/user_active_tag_item.html
@@ -0,0 +1,19 @@
+{% if large %}
+
+<p class="notification is-{{ level }}">
+<span class="icon icon-{{ icon }}" aria-hidden="true"></span>
+    {{ text }}
+    {% if deactivation_reason %}
+    <span class="help">({{ deactivation_reason }})</span>
+    {% endif %}
+</p>
+
+{% else %}
+
+<span class="tag is-{{ level }}" aria-hidden="true">
+    <span class="icon icon-{{ icon }}"></span>
+</span>
+{{ text }}
+
+{% endif %}
+