diff --git a/kitsune/groups/jinja2/groups/edit.html b/kitsune/groups/jinja2/groups/edit.html index 29fe480f6bb..dd4e99af1e4 100644 --- a/kitsune/groups/jinja2/groups/edit.html +++ b/kitsune/groups/jinja2/groups/edit.html @@ -4,7 +4,8 @@ {% block content %}
-

{{ _('Edit {group} profile information')|f(group=profile.group.name) }}

+

{{ _('Edit Group Description') }}

+ {{ _('Editing description for group {group}')|f(group=profile.group.name) }}
{% csrf_token %} diff --git a/kitsune/groups/jinja2/groups/profile.html b/kitsune/groups/jinja2/groups/profile.html index 1a811916f13..231f6ee1804 100755 --- a/kitsune/groups/jinja2/groups/profile.html +++ b/kitsune/groups/jinja2/groups/profile.html @@ -1,82 +1,73 @@ {% extends "groups/base.html" %} {% from "layout/errorlist.html" import errorlist %} {% set title = _('{group} | Groups')|f(group=profile.group.name) %} +{% set avatar_alt = _('Avatar for {group} group')|f(group=profile.group.name) %} {% block content %}
- + {{ avatar_alt }} {% if user_can_edit %} -

{{ _('Change') }}

+

{{ _('Change Group Avatar') }}

{% if profile.avatar %} -

{{ _('Delete') }}

+

{{ _('Delete Group Avatar') }}

{% endif %} {% endif %}
- {% if user.is_staff and user.has_perm('groups.change_groupprofile') %} - {{ _('Edit in admin') }} - {% endif %} +

{{ profile.group.name }}

- {% if user_can_edit %} - {{ _('Edit group profile') }} +
+
+ {% if profile.information_html %} +
{{ profile.information_html|safe }}
{% endif %} -
- {{ profile.information_html|safe }} -
- -
- {% if user_can_manage_leaders %} - {{ _('Edit group leaders') }} +
+ {% if user_can_edit %} + {{ _('Edit group profile') }} {% endif %} +
+

{{ _('Group Leaders') }}

    {% for user in leaders %}
  • {{ user_row(user) }} - {% if user_can_manage_leaders %} -
    - -
    - {% endif %}
  • {% endfor %}
{% if user_can_manage_leaders %} - + {% csrf_token %} {{ errorlist(leader_form) }} - {{ leader_form.users|safe }} - +
+

{{ _('Search for a user or users below. When you are ready to add them, click the Add Leaders button.') }}

+ {{ leader_form.users|safe }} + +
{% endif %}
- -
- {% if user_can_edit %} - {{ _('Edit group members') }} - {% endif %} +

{{ _('Group Members') }}

- {% if user_can_edit %} -
- {% csrf_token %} - {{ errorlist(member_form) }} - {{ member_form.users|safe }} - -
- {% endif %}
    {% for user in members %}
  • {{ user_row(user) }} - {% if user_can_edit %} -
    - -
    - {% endif %}
  • {% endfor %}
+ {% if user_can_edit %} +
+ {% csrf_token %} + {{ errorlist(member_form) }} +
+

{{ _('Search for a user or users below. When you are ready to add them, click the Add Members button.') }}

+ {{ member_form.users|safe }} + +
+
+ {% endif %}
{% if is_paginated %}