diff --git a/bookwyrm/templates/groups/create_form.html b/bookwyrm/templates/groups/create_form.html new file mode 100644 index 00000000..dbb8ad88 --- /dev/null +++ b/bookwyrm/templates/groups/create_form.html @@ -0,0 +1,12 @@ +{% extends 'components/inline_form.html' %} +{% load i18n %} + +{% block header %} +{% trans "Create Group" %} +{% endblock %} + +{% block form %} +
+ {% include 'groups/form.html' with group_form=group_form %} +
+{% endblock %} diff --git a/bookwyrm/templates/groups/find_users.html b/bookwyrm/templates/groups/find_users.html index 57d4277c..684cadb1 100644 --- a/bookwyrm/templates/groups/find_users.html +++ b/bookwyrm/templates/groups/find_users.html @@ -1,8 +1,9 @@ {% extends 'groups/group.html' %} +{% load i18n %} {% block searchresults %}

- Add new members! + {% trans "Add new members!" %}

{% include 'groups/suggested_users.html' with suggested_users=suggested_users query=query %} {% endblock %} diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html index f684dd01..c1281172 100644 --- a/bookwyrm/templates/groups/form.html +++ b/bookwyrm/templates/groups/form.html @@ -1,6 +1,5 @@ {% load i18n %} {% csrf_token %} -
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html index 3e4841b1..25dc01e6 100644 --- a/bookwyrm/templates/lists/form.html +++ b/bookwyrm/templates/lists/form.html @@ -37,7 +37,7 @@ {% trans "Group" %}

{% trans "Group members can add to and remove from this list" %}

- {% if user.memberships %} + {% if user.memberships.exists %}
diff --git a/bookwyrm/templates/notifications/items/invite.html b/bookwyrm/templates/notifications/items/invite.html index 63a46260..ddfa3b34 100644 --- a/bookwyrm/templates/notifications/items/invite.html +++ b/bookwyrm/templates/notifications/items/invite.html @@ -12,7 +12,7 @@ {% endblock %} {% block description %} -{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} +{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %} invited you to join the group {{ group_name }} {% endblocktrans %}
diff --git a/bookwyrm/templates/user/groups.html b/bookwyrm/templates/user/groups.html index 9c91fb18..6f3619fd 100644 --- a/bookwyrm/templates/user/groups.html +++ b/bookwyrm/templates/user/groups.html @@ -24,15 +24,10 @@ {% block panel %}
- + +
+ {% include 'groups/create_form.html' with controls_text="create_group" %} +
{% include 'groups/user_groups.html' with memberships=memberships %}