From e15eef16c54647dce53bcdc1f4f01fb73587752b Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 27 Sep 2021 21:21:00 +1000
Subject: [PATCH] improve new group member adding

The add-members page now looks almost identical to the group
page and is clearer.
---
 bookwyrm/templates/groups/find_users.html     |  6 +++--
 bookwyrm/templates/groups/group.html          | 24 ++++++++++++++++-
 bookwyrm/templates/groups/members.html        | 26 +------------------
 .../templates/groups/suggested_users.html     | 15 +----------
 4 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/bookwyrm/templates/groups/find_users.html b/bookwyrm/templates/groups/find_users.html
index 9154a527..99ec67bc 100644
--- a/bookwyrm/templates/groups/find_users.html
+++ b/bookwyrm/templates/groups/find_users.html
@@ -1,6 +1,8 @@
 {% extends 'groups/group.html' %}
 
-{% block panel %}
-<h1 class="title">Add users to <a href="{{ group.local_path }}">{{ group.name }}</a></h1>
+{% block searchresults %}
+<h2 class="title is-5">
+    Add new members!
+</h2>
   {% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %}
 {% endblock %}
\ No newline at end of file
diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 6c44e3b4..9617e133 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -8,9 +8,12 @@
 <div class="columns mt-3">
     <section class="column is-three-quarters">
 
+        {% block searchresults %}
+        {% endblock %}
+
         {% include "groups/members.html" %}
 
-        <h2 class="heading">Lists</h2>
+        <h2 class="title is-5">Lists</h2>
         {% if not lists %}
         <p>{% trans "This group has no lists" %}</p>
         {% else %}
@@ -57,5 +60,24 @@
         {% endif %}
         {% include "snippets/pagination.html" with page=items %}
     </section>
+
+    <section class="column is-one-quarter">
+      <div class="block">
+          <h2 class="title is-5">Find new members</h2>
+          <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
+              <div class="control">
+                  <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
+              </div>
+              <div class="control">
+                  <button class="button" type="submit">
+                      <span class="icon icon-search" title="{% trans 'Search' %}">
+                          <span class="is-sr-only">{% trans "Search" %}</span>
+                      </span>
+                  </button>
+              </div>
+          </form>
+      </div>
+    </section>
+
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index df5f1602..a64d840e 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -2,34 +2,10 @@
 {% load utilities %}
 {% load humanize %}
 {% load bookwyrm_tags %}
-<!-- TODO: do we need this? -->
-{% if request.GET.updated %}
-<div class="notification is-primary">
-    {% trans "You successfully added a user to this group!" %}
-</div>
-{% endif %}
 
-<h2 class="heading">Group Members</h2>
+<h2 class="title is-5">Group Members</h2>
 <p class="subtitle is-6">{% trans "Members can add and remove books on your group's book lists" %}</p>
 
-{% block panel %}
-<div class="block">
-    <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
-        <div class="control">
-            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
-        </div>
-        <div class="control">
-            <button class="button" type="submit">
-                <span class="icon icon-search" title="{% trans 'Search' %}">
-                    <span class="is-sr-only">{% trans "Search" %}</span>
-                </span>
-            </button>
-        </div>
-    </form>
-    {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %}
-</div>
-{% endblock %}
-
 <div class="column is-flex is-flex-grow-0">
   {% for member in group.members.all %}
   <div class="box has-text-centered is-shadowless has-background-white-bis my-0 mx-2">
diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 40d32f3f..91b3784d 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -1,20 +1,7 @@
 {% load i18n %}
 {% load utilities %}
 {% load humanize %}
-<div class="block">
-  <form class="field has-addons" method="get" action="{% url 'group-find-users' group.id %}">
-      <div class="control">
-          <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search to add a user' %}" aria-label="{% trans 'Search to add a user' %}">
-      </div>
-      <div class="control">
-          <button class="button" type="submit">
-              <span class="icon icon-search" title="{% trans 'Search' %}">
-                  <span class="is-sr-only">{% trans "Search" %}</span>
-              </span>
-          </button>
-      </div>
-  </form>
-</div>
+
 {% if suggested_users %}
 <div class="columns is-mobile scroll-x mb-0">
     {% for user in suggested_users %}