From fffb21bb4f9718be7779ca2a3d6c498e6814801f Mon Sep 17 00:00:00 2001 From: ErikKalkoken Date: Mon, 17 Feb 2020 00:59:47 +0100 Subject: [PATCH] Fix spr, permissions_tool, improve group_management --- .../templates/groupmanagement/audit.html | 12 +- .../groupmanagement/groupmembers.html | 56 ++--- .../groupmanagement/groupmembership.html | 4 +- .../templates/groupmanagement/index.html | 80 ++++---- .../templates/permissions_tool/audit.html | 65 +++--- .../templates/permissions_tool/overview.html | 130 +++++++----- allianceauth/srp/templates/srp/data.html | 191 +++++++++--------- .../srp/templates/srp/management.html | 170 ++++++++-------- 8 files changed, 380 insertions(+), 328 deletions(-) diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index f4acf2d0..e95459c2 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -13,7 +13,14 @@ {{ group }} - {% trans 'Audit Log' %}
-

All times displayed are EVE/UTC.

+

+ +   + + Back + + +

{% if entries %}
@@ -44,6 +51,9 @@ {% endfor %}
+

+ All times displayed are EVE/UTC. +

{% else %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html index 45f29f9b..0c565e33 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html @@ -14,17 +14,23 @@
{{ group.name }} - {% trans 'Members' %}
-
-
- {% if group.user_set %} +
+

+ +   + + Back + + +

+ {% if group.user_set %}
- - + @@ -38,20 +44,24 @@ - + {% else %} + (unknown) + {% endif %} +
{% trans "Portrait" %} {% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}{% trans "Organization" %}
- - {{ member.main_char.character_name }} - + {% if member.main_char %} + + {{ member.main_char.character_name }} + + {% else %} + {{ member.user.username }} + {% endif %} - - {{ member.main_char.corporation_name }} - - - + {% if member.main_char %} + + {{ member.main_char.corporation_name }} +
{{ member.main_char.alliance_name|default_if_none:"" }} - - 		@@ -64,13 +74,13 @@

: Group leader

- {% else %} -
- {% trans "No group members to list." %} -
- {% endif %} -
+ {% else %} +
+ {% trans "No group members to list." %} +
+ {% endif %}
+
{% endblock content %} @@ -88,7 +98,7 @@ $('#tab_group_members').DataTable({ order: [ [ 1, "asc" ] ], columnDefs: [ - { "sortable": false, "targets": [0, 4] }, + { "sortable": false, "targets": [0, 3] }, ] }); }); diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html index e8e8611e..08d5f5e5 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html @@ -29,7 +29,9 @@ {% for group in groups %} - {{ group.name }} + + {{ group.name }} + {{ group.authgroup.description }} {% if group.authgroup.hidden %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index 493371ae..f9069b43 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -32,38 +32,39 @@
- - - + + - - + {% for acceptrequest in acceptrequests %} - - - + - + {% else %} + (unknown) + {% endif %} + + + {% endfor %} +
{% trans "#" %}{% trans "Portrait" %}
{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}{% trans "Organization" %} {% trans "Group" %}
{{ acceptrequest.id }} +
- - {{ acceptrequest.main_char.character_name }} - + {% if acceptrequest.main_char %} + + {{ acceptrequest.main_char.character_name }} + + {% else %} + {{ acceptrequest.user.username }} + {% endif %} - - {{ acceptrequest.main_char.corporation_name }} - - - + {% if acceptrequest.main_char %} + + {{ acceptrequest.main_char.corporation_name }} +
{{ acceptrequest.main_char.alliance_name|default_if_none:"" }} - - 		{{ acceptrequest.group.name }} @@ -90,38 +91,39 @@
- - - + + - - + {% for leaverequest in leaverequests %} - - - + - + {% if leaverequest.main_char %} + + {{ leaverequest.main_char.corporation_name }} +
+ {{ leaverequest.main_char.alliance_name|default_if_none:"" }} + {% else %} + (unknown) + {% endif %} + + {% include 'permissions_tool/audit_state_row.html' %} + + {% endwith %} + {% endfor %} + {% endfor %} + +
{% trans "#" %}{% trans "Portrait" %}
{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}{% trans "Organization" %} {% trans "Group" %}
{{ leaverequest.id }} +
- - {{ leaverequest.main_char.character_name }} - + {% if leaverequest.main_char %} + + {{ leaverequest.main_char.character_name }} + + {% else %} + {{ leaverequest.user.username }} + {% endif %} - - {{ leaverequest.main_char.corporation_name }} - - - - {{ leaverequest.main_char.alliance_name|default_if_none:"" }} - - {{ leaverequest.group.name }} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html index 660d8dcb..2b1c78a4 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html @@ -11,38 +11,41 @@ {% trans "Back" %} - - - - - - - - - {% for user in permission.users %} - - {% include 'permissions_tool/audit_row.html' with group="Permission Granted Directly (No Group)" %} - - {% endfor %} - {% for group in permission.groups %} - {% for user in group.user_set.all %} - {% include 'permissions_tool/audit_row.html' %} +
+
- {% trans "Group" %} - - {% trans "User" %} -
+ + + + + + + + {% for user in permission.users %} + + {% include 'permissions_tool/audit_row.html' with group="Permission Granted Directly (No Group)" %} + {% endfor %} - {% endfor %} - {% for state in permission.states %} - {% for profile in state.userprofile_set.all %} - {% with profile.user as user %} - - {% include 'permissions_tool/audit_state_row.html' %} - - {% endwith %} + {% for group in permission.groups %} + {% for user in group.user_set.all %} + {% include 'permissions_tool/audit_row.html' %} + {% endfor %} {% endfor %} - {% endfor %} - -
+ {% trans "Group" %} + + {% trans "User" %} +
+ {% for state in permission.states %} + {% for profile in state.userprofile_set.all %} + {% with profile.user as user %} +
+
{% endblock content %} + diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html index 3e8f509d..75b7a0b0 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html @@ -19,61 +19,79 @@ {% trans "Show Applied" %} {% endif %} - - - - - - - - - - - - - - {% for perm in permissions %} - - - - - - - - - - {% endfor %} - -
- {% trans "App" %} - - {% trans "Model" %} - - {% trans "Code Name" %} - - {% trans "Name" %} - - {% trans "Users" %} - - {% trans "Groups" %} - - {% trans "States" %} -
- {{ perm.permission.content_type.app_label }} - - {{ perm.permission.content_type.model }} - - - {{ perm.permission.codename }} - - - {{ perm.permission.name }} - - {{ perm.users }} - - {{ perm.groups }} ({{ perm.group_users }}) - - {{ perm.states }} ({{ perm.state_users }}) -
+
+ + + + + + + + + + + + + + {% for perm in permissions %} + + + + + + + + + + {% endfor %} + +
+ {% trans "App" %} + + {% trans "Model" %} + + {% trans "Code Name" %} + + {% trans "Name" %} + + {% trans "Users" %} + + {% trans "Groups" %} + + {% trans "States" %} +
+ {{ perm.permission.content_type.app_label }} + + {{ perm.permission.content_type.model }} + + + {{ perm.permission.codename }} + + + {{ perm.permission.name }} + + {{ perm.users }} + + {{ perm.groups }} ({{ perm.group_users }}) + + {{ perm.states }} ({{ perm.state_users }}) +
+
{% endblock content %} + +{% block extra_javascript %} + {% include 'bundles/datatables-js.html' %} +{% endblock %} + +{% block extra_css %} + {% include 'bundles/datatables-css.html' %} +{% endblock %} + +{% block extra_script %} + $(document).ready(function(){ + $('#tab_permissions_overview').DataTable({ + order: [ [ 0, "asc" ], [ 1, "asc" ], [ 2, "asc" ] ] + }); + }); +{% endblock %} \ No newline at end of file diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html index 3d4bacd5..074f4b0f 100644 --- a/allianceauth/srp/templates/srp/data.html +++ b/allianceauth/srp/templates/srp/data.html @@ -62,104 +62,107 @@ {% if srpfleetrequests %} -
- {% csrf_token %} - - - - - - - - - - {% endblocktrans %} - - - {% if perms.auth.srp_management %} - - {% endif %} - - {% for srpfleetrequest in srpfleetrequests %} - - - - - - - - - + + {% csrf_token %} + + + + {% endif %} - - {% endfor %} -
{% trans "Pilot Name" %}{% trans "Killboard Link" %}{% trans "Additional Info" %}{% trans "Ship Type" %}{% trans "Killboard Loss Amt" %}{% trans "SRP ISK Cost" %} - {% blocktrans %}{% trans "Post Time" %}{% trans "Status" %}{% trans "Actions" %}
{{ srpfleetrequest.character.character_name }} - Link - {{ srpfleetrequest.additional_info }}{{ srpfleetrequest.srp_ship_name }}{{ srpfleetrequest.kb_total_loss | intcomma }} ISK{{ srpfleetrequest.srp_total_amount | intcomma }} ISK{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }} - {% if srpfleetrequest.srp_status == "Approved" %} -
- {% trans "Approved" %} -
- {% elif srpfleetrequest.srp_status == "Rejected" %} -
- {% trans "Rejected" %} -
- {% else %} -
- {% trans "Pending" %} -
- {% endif %} - 		-
- -
-
- - -
+
+ + + + + + + + {% endblocktrans %} + + + {% if perms.auth.srp_management %} + + {% endif %} + + {% for srpfleetrequest in srpfleetrequests %} + + + + + + + + + + {% if perms.auth.srp_management %} + + {% endif %} + + {% endfor %} +
{% trans "Pilot Name" %}{% trans "Killboard Link" %}{% trans "Additional Info" %}{% trans "Ship Type" %}{% trans "Killboard Loss Amt" %}{% trans "SRP ISK Cost" %} + {% blocktrans %}{% trans "Post Time" %}{% trans "Status" %}{% trans "Actions" %}
{{ srpfleetrequest.character.character_name }} + Link + {{ srpfleetrequest.additional_info }}{{ srpfleetrequest.srp_ship_name }}{{ srpfleetrequest.kb_total_loss | intcomma }} ISK{{ srpfleetrequest.srp_total_amount | intcomma }} ISK{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }} + {% if srpfleetrequest.srp_status == "Approved" %} +
+ {% trans "Approved" %} +
+ {% elif srpfleetrequest.srp_status == "Rejected" %} +
+ {% trans "Rejected" %} +
+ {% else %} +
+ {% trans "Pending" %} +
+ {% endif %} + 		+
+ +
+
+
+ + {% else %} -
{% trans "No SRP requests for this fleet." %}
+
+ {% trans "No SRP requests for this fleet." %} +
{% endif %} diff --git a/allianceauth/srp/templates/srp/management.html b/allianceauth/srp/templates/srp/management.html index 863e97ac..4b97fbb4 100644 --- a/allianceauth/srp/templates/srp/management.html +++ b/allianceauth/srp/templates/srp/management.html @@ -31,94 +31,98 @@ {% if srpfleets %} - - - - - - - - - - - - - - {% for srpfleet in srpfleets %} - - - - - - - - +
+
{% trans "Fleet Name" %}{% trans "Fleet Time" %}{% trans "Fleet Doctrine" %}{% trans "Fleet Commander" %}{% trans "Fleet AAR" %}{% trans "Fleet SRP Code" %}{% trans "Fleet ISK Cost" %}{% trans "SRP Status" %}{% trans "Pending Requests" %}{% trans "Actions" %}
-
- {{ srpfleet.fleet_name }} -
- 		{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}{{ srpfleet.fleet_doctrine }} -
- {{ srpfleet.fleet_commander.character_name }} -
- 		- {% if srpfleet.fleet_srp_aar_link %} - {% trans 'Link' %} - {% endif %} - - {% if srpfleet.fleet_srp_code %} - {{ srpfleet.fleet_srp_code }} - {% else %} -
- {% trans "Disabled" %} -
- {% endif %} - 		ISK: {{ srpfleet.total_cost | intcomma }}
+ + + + + + + + + + + + + {% for srpfleet in srpfleets %} + + + + + + + + - - - + + - - {% endfor %} -
{% trans "Fleet Name" %}{% trans "Fleet Time" %}{% trans "Fleet Doctrine" %}{% trans "Fleet Commander" %}{% trans "Fleet AAR" %}{% trans "Fleet SRP Code" %}{% trans "Fleet ISK Cost" %}{% trans "SRP Status" %}{% trans "Pending Requests" %}{% trans "Actions" %}
+
+ {{ srpfleet.fleet_name }} +
+ 		{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}{{ srpfleet.fleet_doctrine }} +
+ {{ srpfleet.fleet_commander.character_name }} +
+ 		+ {% if srpfleet.fleet_srp_aar_link %} + {% trans 'Link' %} + {% endif %} + + {% if srpfleet.fleet_srp_code %} + {{ srpfleet.fleet_srp_code }} + {% else %} +
+ {% trans "Disabled" %} +
+ {% endif %} + 		ISK: {{ srpfleet.total_cost | intcomma }} - {% if srpfleet.fleet_srp_status == "" %} -
- {% trans "Pending" %} -
- {% else %} -
- {% trans "Completed" %} -
- {% endif %} - 		-
{{ srpfleet.pending_requests }}
- 		+ + {% if srpfleet.fleet_srp_status == "" %} +
+ {% trans "Pending" %} +
+ {% else %} +
+ {% trans "Completed" %} +
+ {% endif %} + 		+
{{ srpfleet.pending_requests }}
+ 		- - - - - {% if perms.auth.srp_management %} - - - - - - - - {% if srpfleet.fleet_srp_code %} - - + + - {% else %} - - - - {% endif %} - {% endif %} -
+ {% if perms.auth.srp_management %} + + + + + + + + {% if srpfleet.fleet_srp_code %} + + + + {% else %} + + + + {% endif %} + + {% endif %} +
+
{% else %} -
{% trans "No SRP fleets created." %}
+
+ {% trans "No SRP fleets created." %} +
{% endif %}