Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 14:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Groupmanagement / Index template

Browse Source 
Somehow this got royally messed up in one of the backport merges
This commit is contained in:
Peter Pfeufer 2023-12-09 19:35:51 +01:00
parent af22222bdf
commit ad92d7a916
No known key found for this signature in database
GPG Key ID: 6051D2C6AD4EBC27
1 changed files with 15 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
allianceauth/groupmanagement/templates/groupmanagement/index.html
View File

@ -15,7 +15,7 @@
{% block header_nav_collapse_left %} {% block header_nav_collapse_left %}
<li class="active"> <li class="active">
<a class="nav-link active" id="add-tab" data-bs-toggle="tab" data-bs-target="#add" type="button" role="tab" aria-controls="addd" aria-selected="true"> <a class="nav-link active" id="add-tab" data-bs-toggle="tab" data-bs-target="#add" type="button" role="tab" aria-controls="add" aria-selected="true">
{% translate "Join Requests" %} {% translate "Join Requests" %}
{% if acceptrequests %} {% if acceptrequests %}
@ -37,7 +37,9 @@
{% endif %} {% endif %}
<li class="nav-item "> <li class="nav-item ">
<a class="nav-link {% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}" href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a> <a class="nav-link {% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}" href="{% url 'groupmanagement:membership' %}">
{% translate "Group Membership" %}
</a>
</li> </li>
{% endblock header_nav_collapse_left %} {% endblock header_nav_collapse_left %}
@ -71,81 +73,25 @@
{{ acceptrequest.user.username }} {{ acceptrequest.user.username }}
{% endif %} {% endif %}
</td> </td>
<td> <td>
{% if acceptrequest.main_char %} {% if acceptrequest.main_char %}
<a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank"> <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
{{ acceptrequest.main_char.corporation_name }} {{ acceptrequest.main_char.corporation_name }}
</a><br> </a>
<br>
{{ acceptrequest.main_char.alliance_name|default_if_none:"" }} {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
{% else %} {% else %}
{% translate "(unknown)" %} {% translate "(unknown)" %}
{% endif %} {% endif %}
</td> </td>
<td>{{ acceptrequest.group.name }}</td> <td>{{ acceptrequest.group.name }}</td>
<td class="text-end"> <td class="text-end">
<a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success"> <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
{% translate "Accept" %} {% translate "Accept" %}
</a> </a>
{% if not show_leave_tab %}
<div id="leave" class="tab-pane">
{% if leaverequests %}
<div class="table-responsive">
<table class="table table-aa">
<thead>
<tr>
<th>{% translate "Character" %}</th>
<th>{% translate "Organization" %}</th>
<th>{% translate "Group" %}</th>
<th></th>
</tr>
</thead>
<tbody>
{% for leaverequest in leaverequests %}
<tr>
<td>
<img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;" alt="{{ leaverequest.main_char.character_name }}">
{% if leaverequest.main_char %}
<a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
{{ leaverequest.main_char.character_name }}
</a>
{% else %}
{{ leaverequest.user.username }}
{% endif %}
</td>
<td>
{% if leaverequest.main_char %}
<a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
{{ leaverequest.main_char.corporation_name }}
</a>
<br>
{{ leaverequest.main_char.alliance_name|default_if_none:"" }}
{% else %}
{% translate "(unknown)" %}
{% endif %}
</td>
<td>{{ leaverequest.group.name }}</td>
<td class="text-right">
<a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
{% translate "Accept" %}
</a>
<a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
{% translate "Reject" %}
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div class="aa-callout aa-callout-warning text-center">{% translate "No group leave requests." %}</div>
{% endif %}
</div>
{% endif %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@ -153,7 +99,9 @@
</table> </table>
</div> </div>
{% else %} {% else %}
<div class="aa-callout aa-callout-warning text-center">{% translate "No group add requests." %}</div> <div class="aa-callout aa-callout-warning text-center">
{% translate "No group add requests." %}
</div>
{% endif %} {% endif %}
</div> </div>
@ -185,6 +133,7 @@
{{ leaverequest.user.username }} {{ leaverequest.user.username }}
{% endif %} {% endif %}
</td> </td>
<td> <td>
{% if leaverequest.main_char %} {% if leaverequest.main_char %}
<a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank"> <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
@ -196,7 +145,9 @@
{% translate "(unknown)" %} {% translate "(unknown)" %}
{% endif %} {% endif %}
</td> </td>
<td>{{ leaverequest.group.name }}</td> <td>{{ leaverequest.group.name }}</td>
<td class="text-end"> <td class="text-end">
<a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success"> <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
{% translate "Accept" %} {% translate "Accept" %}