diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index ea67f420..d56ec4c2 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -15,7 +15,7 @@ {% block header_nav_collapse_left %}
  • - + {% translate "Join Requests" %} {% if acceptrequests %} @@ -37,7 +37,9 @@ {% endif %}
  • {% endblock header_nav_collapse_left %} @@ -71,81 +73,25 @@ {{ acceptrequest.user.username }} {% endif %} + {% if acceptrequest.main_char %} {{ acceptrequest.main_char.corporation_name }} -
    + +
    {{ acceptrequest.main_char.alliance_name|default_if_none:"" }} {% else %} {% translate "(unknown)" %} {% endif %} + {{ acceptrequest.group.name }} + {% translate "Accept" %} - - {% if not show_leave_tab %} -
    - {% if leaverequests %} -
    - - - - - - - - - - - - {% for leaverequest in leaverequests %} - - - - - - - {% endfor %} - -
    {% translate "Character" %}{% translate "Organization" %}{% translate "Group" %}
    - {{ leaverequest.main_char.character_name }} - - {% if leaverequest.main_char %} - - {{ leaverequest.main_char.character_name }} - - {% else %} - {{ leaverequest.user.username }} - {% endif %} - - {% if leaverequest.main_char %} - - {{ leaverequest.main_char.corporation_name }} - -
    - {{ leaverequest.main_char.alliance_name|default_if_none:"" }} - {% else %} - {% translate "(unknown)" %} - {% endif %} -
    {{ leaverequest.group.name }} - - {% translate "Accept" %} - - - - {% translate "Reject" %} - -
    -
    - {% else %} -
    {% translate "No group leave requests." %}
    - {% endif %} -
    - {% endif %} {% endfor %} @@ -153,7 +99,9 @@ {% else %} -
    {% translate "No group add requests." %}
    +
    + {% translate "No group add requests." %} +
    {% endif %} @@ -185,6 +133,7 @@ {{ leaverequest.user.username }} {% endif %} + {% if leaverequest.main_char %} @@ -196,7 +145,9 @@ {% translate "(unknown)" %} {% endif %} + {{ leaverequest.group.name }} + {% translate "Accept" %}