From 5237e88abab9cce0f0120cfb3d67ebbb29c5ff30 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 2 Oct 2021 13:48:53 +1000
Subject: [PATCH] remove user button for groups

---
 bookwyrm/templates/groups/members.html        | 20 ++--------------
 .../snippets/remove_from_group_button.html    | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/remove_from_group_button.html

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 3ee27db6..bd91b418 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -20,24 +20,8 @@
         <span class="is-sr-only">Manager</span>
       </span>
       {% endif %}
-      <!-- TODO: change this to a remove_from_group button -->
-      {% include 'snippets/add_to_group_button.html' with user=member group=group minimal=True %}
-      {% if member.mutuals %}
-      <p class="help">
-          {% blocktrans trimmed with mutuals=member.mutuals|intcomma count counter=member.mutuals %}
-          {{ mutuals }} follower you follow
-          {% plural %}
-          {{ mutuals }} followers you follow{% endblocktrans %}
-      </p>
-      {% elif member.shared_books %}
-      <p class="help">
-          {% blocktrans trimmed with shared_books=member.shared_books|intcomma count counter=member.shared_books %}
-          {{ shared_books }} book on your shelves
-          {% plural %}
-          {{ shared_books }} books on your shelves
-          {% endblocktrans %}
-      </p>
-      {% elif request.user in member.following.all %}
+      {% include 'snippets/remove_from_group_button.html' with user=member group=group minimal=True %}
+      {% if request.user in member.following.all %}
       <p class="help">
           {% trans "Follows you" %}
       </p>
diff --git a/bookwyrm/templates/snippets/remove_from_group_button.html b/bookwyrm/templates/snippets/remove_from_group_button.html
new file mode 100644
index 00000000..938f48b2
--- /dev/null
+++ b/bookwyrm/templates/snippets/remove_from_group_button.html
@@ -0,0 +1,23 @@
+{% load i18n %}
+{% load bookwyrm_group_tags %}
+{% if request.user == user or not request.user == group.user or not request.user.is_authenticated %}
+{% elif user in request.user.blocks.all %}
+{% include 'snippets/block_button.html' with blocks=True %}
+{% else %}
+<div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
+    <div class="control">
+        <form action="{% url 'remove-group-member' %}" method="POST" class="interaction add_{{ user.id }}" data-id="add_{{ user.id }}">
+            {% csrf_token %}
+            <input type="hidden" name="group" value="{{ group.id }}">
+            <input type="hidden" name="user" value="{{ user.username }}">
+            <button class="button is-small is-danger is-light" type="submit">
+              {% if show_username %}
+              {% blocktrans with username=user.localname %}Remove @{{ username }}{% endblocktrans %}
+              {% else %}
+              {% trans "Remove" %}
+              {% endif %}
+          </button>
+        </form>
+    </div>
+</div>
+{% endif %}