diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index 3171b055..ada6b93d 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -19,7 +19,7 @@ {% translate "Join Requests" %} {% if acceptrequests %} - {{ acceptrequests|length }} + {{ acceptrequests|length }} {% endif %} @@ -30,7 +30,7 @@ {% translate "Leave Requests" %} {% if leaverequests %} - {{ leaverequests|length }} + {{ leaverequests|length }} {% endif %} @@ -43,19 +43,19 @@ {% endblock header_nav_collapse_left %} - {% block content %}
| {% translate "Character" %} | {% translate "Organization" %} | {% translate "Group" %} | + | {% translate "Corporation" %} | {{ acceptrequest.group.name }} |
-
+
+ Loading...
+
+
{% translate "Accept" %}
-
+
{% translate "Reject" %}
|
+ + {% if acceptrequest.main_char %} + {{ acceptrequest.main_char.corporation_name }} + {% else %} + {% translate "(unknown)" %} + {% endif %} + | + {% endfor %} @@ -111,14 +122,15 @@ {% if not show_leave_tab %}
|---|
| {% translate "Character" %} | {% translate "Organization" %} | {% translate "Group" %} | + | {% translate "Corporation" %} | {{ leaverequest.group.name }} |
-
+
+ Loading...
+
+
{% translate "Accept" %}
-
-
+
{% translate "Reject" %}
|
+ + {% if leaverequest.main_char %} + {{ leaverequest.main_char.corporation_name }} + {% else %} + {% translate "(unknown)" %} + {% endif %} + | {% endfor %} @@ -172,3 +193,189 @@ {% endif %} {% endblock content %} +{% block extra_javascript %} + {% include 'bundles/datatables-js-bs5.html' %} + {% include "bundles/filterdropdown-js.html" %} + +{% endblock extra_javascript %} +{% block extra_css %} + {% include 'bundles/datatables-css-bs5.html' %} +{% endblock %} diff --git a/allianceauth/static/allianceauth/js/sidebar.js b/allianceauth/static/allianceauth/js/sidebar.js index 6d9303a3..8da8e647 100644 --- a/allianceauth/static/allianceauth/js/sidebar.js +++ b/allianceauth/static/allianceauth/js/sidebar.js @@ -20,7 +20,7 @@ $(document).ready(() => { if (badges.length > 0 && notificationCount > 0) { const notificationBadge = document.createElement('span'); - + notificationBadge.id = "globalNotificationCount"; notificationBadge.classList.add( 'badge', 'text-bg-danger',
|---|