diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html index a73d78250..4fea5a84e 100644 --- a/bookwyrm/templates/groups/group.html +++ b/bookwyrm/templates/groups/group.html @@ -8,7 +8,7 @@
- {% include "groups/users.html" %} + {% include "groups/members.html" %}

Lists

{% if not group.lists.exists %} diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html new file mode 100644 index 000000000..b10cdd5f4 --- /dev/null +++ b/bookwyrm/templates/groups/members.html @@ -0,0 +1,65 @@ +{% load i18n %} +{% load utilities %} +{% load humanize %} + +{% if request.GET.updated %} +
+ {% trans "You successfully added a user to this group!" %} +
+{% endif %} + +

Group Members

+

{% trans "Members can add and remove books on your group's book lists" %}

+ +{% block panel %} +
+
+
+ +
+
+ +
+
+ {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %} +
+{% endblock %} + + \ No newline at end of file diff --git a/bookwyrm/templates/groups/users.html b/bookwyrm/templates/groups/users.html deleted file mode 100644 index c7470b328..000000000 --- a/bookwyrm/templates/groups/users.html +++ /dev/null @@ -1,41 +0,0 @@ -{% load i18n %} - -{% if request.GET.updated %} -
- {% trans "You successfully added a user to this group!" %} -
-{% endif %} - -

Group Members

-

{% trans "Members can add and remove books on your group's book lists" %}

- -{% block panel %} -
-
-
- - {% if request.GET.query and no_results %} -

{% blocktrans with query=request.GET.query %}No users found for "{{ query }}"{% endblocktrans %}

- {% endif %} -
-
- -
-
- {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %} -
-{% endblock %} - - \ No newline at end of file diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index cdf7493f1..e688f813f 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -255,7 +255,7 @@ urlpatterns = [ re_path(rf"{USER_PATH}/groups/?$", views.UserGroups.as_view(), name="user-groups"), re_path(r"^create-group/?$", views.create_group, name="create-group"), re_path(r"^group/(?P\d+)(.json)?/?$", views.Group.as_view(), name="group"), - re_path(r"^group/(?P\d+)/find-users/?$", views.FindAndAddUsers.as_view(), name="group-find-users"), + re_path(r"^group/(?P\d+)/add-users/?$", views.FindAndAddUsers.as_view(), name="group-find-users"), # lists re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"), re_path(r"^list/?$", views.Lists.as_view(), name="lists"),