From 87c0c3ac73e8cff2f9444cf8e67c5c045dcb020d Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Sun, 25 Oct 2020 11:55:03 +0100 Subject: [PATCH] tables formatted properly align center is horrible to read .... --- .../templates/groupmanagement/audit.html | 79 +++--- .../groupmanagement/groupmembers.html | 68 ++--- .../groupmanagement/groupmembership.html | 37 ++- .../templates/groupmanagement/groups.html | 16 +- .../templates/groupmanagement/index.html | 232 +++++++++--------- 5 files changed, 226 insertions(+), 206 deletions(-) diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index 51cc2ef5..7273107e 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -8,58 +8,65 @@

{% include 'groupmanagement/menu.html' %} +
- {{ group }} - {% trans 'Audit Log' %} + {{ group }} - {% trans "Audit Log" %}
-
-

+ +

+

{% trans "Back" %} -

+

+ {% if entries %}
- - - - - - - + + + + + + + + {% for entry in entries %} - - - - - + + + + + + {% if entry.request_type is None %} - + {% else %} - + {% endif %} - + + {% endfor %}
{% trans "Date/Time" %}{% trans "Requestor" %}{% trans "Character" %}{% trans "Corporation" %}{% trans "Type" %}{% trans "Action" %}{% trans "Actor" %}{% trans "Date/Time" %}{% trans "Requestor" %}{% trans "Character" %}{% trans "Corporation" %}{% trans "Type" %}{% trans "Action" %}{% trans "Actor" %}
{{ entry.date|date:"Y-M-d, H:i" }}{{ entry.requestor }}{{ entry.req_char }}{{ entry.req_char.corporation_name }}{{ entry.type_to_str }}{{ entry.date|date:"Y-M-d, H:i" }}{{ entry.requestor }}{{ entry.req_char }}{{ entry.req_char.corporation_name }}{{ entry.type_to_str }} Removed{% trans "Removed" %}{{ entry.action_to_str }}{{ entry.action_to_str }}{{ entry.request_actor }}{{ entry.request_actor }}
+

- All times displayed are EVE/UTC. + {% trans "All times displayed are EVE/UTC." %}

- {% else %} + {% else %}

-
+
{% trans "No entries found for this group." %} -
+
{% endif %} -
+
{% endblock %} @@ -75,31 +82,30 @@ {% endblock %} {% block extra_script %} - - $.fn.dataTable.moment = function ( format, locale ) { + $.fn.dataTable.moment = function(format, locale) { var types = $.fn.dataTable.ext.type; - + // Add type detection - types.detect.unshift( function ( d ) { - return moment( d, format, locale, true ).isValid() ? + types.detect.unshift(function(d) { + return moment(d, format, locale, true).isValid() ? 'moment-'+format : null; - } ); - + }); + // Add sorting method - use an integer for the sorting - types.order[ 'moment-'+format+'-pre' ] = function ( d ) { - return moment( d, format, locale, true ).unix(); + types.order[ 'moment-'+format+'-pre' ] = function(d) { + return moment(d, format, locale, true).unix(); }; }; $(document).ready(function(){ - $.fn.dataTable.moment( 'YYYY-MMM-D, HH:mm' ); + $.fn.dataTable.moment('YYYY-MMM-D, HH:mm'); $('#log-entries').DataTable({ - order: [[ 0, 'desc' ], [ 1, 'asc' ] ], + order: [[0, 'desc'], [1, 'asc']], filterDropDown: { - columns: [ + columns: [ { idx: 1 }, @@ -124,4 +130,3 @@ }); }); {% endblock %} - diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html index 438137fc..f7b58d54 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html @@ -9,38 +9,35 @@

{% include 'groupmanagement/menu.html' %} - +
{{ group.name }} - {% trans 'Members' %}
-
-

+ +

+

{% trans "Back" %} -

- {% if group.user_set %} +

+ + {% if group.user_set %}
- - - - - + + + + + {% for member in members %} - - - + - - + + {% endfor %}
{% trans "Portrait" %}{% trans "Character" %}{% trans "Organization" %}
{% trans "Character" %}{% trans "Organization" %}
- {% if member.is_leader %} -   - {% endif %} - - +
+ {% if member.main_char %} {{ member.main_char.character_name }} @@ -48,28 +45,36 @@ {% else %} {{ member.user.username }} {% endif %} + + {% if member.is_leader %} +   + {% endif %} + + {% if member.main_char %} {{ member.main_char.corporation_name }}
{{ member.main_char.alliance_name|default_if_none:"" }} {% else %} - (unknown) + {% trans "(unknown)" %} {% endif %} - 		- - + + +
-

: Group leader

+ +

+ : {% trans "Group leader" %} +

{% else %}
@@ -77,7 +82,7 @@
{% endif %}
- +
{% endblock content %} @@ -93,10 +98,13 @@ {% block extra_script %} $(document).ready(function(){ $('#tab_group_members').DataTable({ - order: [ [ 1, "asc" ] ], + order: [[0, "asc"]], columnDefs: [ - { "sortable": false, "targets": [0, 3] }, + { + "sortable": false, + "targets": [2] + }, ] }); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html index 1ddd9c89..c2291f7f 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html @@ -9,31 +9,36 @@

{% include 'groupmanagement/menu.html' %} +
{% trans "Groups" %}
+
{% if groups %}
- - - - - + + + + + + {% for group in groups %} - - - + + - - + {% for leaverequest in leaverequests %} + + + + + + + {% endfor %} + +
{% trans "Name" %}{% trans "Description" %}{% trans "Status" %}{% trans "Member Count" %}{% trans "Name" %}{% trans "Description" %}{% trans "Status" %}{% trans "Member Count" %}
+ {{ group.name }} {{ group.authgroup.description }} + + {{ group.authgroup.description }} {% if group.authgroup.hidden %} {% trans "Hidden" %} {% elif group.authgroup.open %} @@ -42,16 +47,20 @@ {% trans "Requestable" %} {% endif %} + + {{ group.num_members }} + + + + @@ -71,9 +80,11 @@ {% endblock content %} + {% block extra_javascript %} {% include 'bundles/clipboard-js.html' %} - + + {% endblock %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html index d2c2b036..a94f4cd4 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html @@ -4,7 +4,7 @@ {% block page_title %}{% trans "Available Groups" %}{% endblock page_title %} {% block extra_css %}{% endblock extra_css %} -url + {% block content %}

{% trans "Available Groups" %}

@@ -12,17 +12,18 @@ url - - - + + + + {% for g in groups %} - - - + + + {% for acceptrequest in acceptrequests %} + + + + + + + {% endfor %} + +
{% trans "Name" %}{% trans "Description" %}{% trans "Action" %}{% trans "Name" %}{% trans "Description" %}
{{ g.group.name }}{{ g.group.authgroup.description|urlize }} + {{ g.group.name }}{{ g.group.authgroup.description|urlize }} {% if g.group in user.groups.all %} {% if not g.request %} @@ -59,5 +60,4 @@ url {% endif %} - {% endblock content %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index 117bbd79..138122e5 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -4,25 +4,25 @@ {% load evelinks %} {% block page_title %}{% trans "Groups Management" %}{% endblock page_title %} -{% block extra_css %} - +{% block extra_css %} + {% endblock extra_css %} {% block content %}

{% include 'groupmanagement/menu.html' %} - + - -
+
- {% if acceptrequests %} -
- - - - - - - - - - - - {% for acceptrequest in acceptrequests %} - - - - - - + {% if acceptrequests %} +
+
{% trans "Character" %}{% trans "Organization" %}{% trans "Group" %}
- - - {% if acceptrequest.main_char %} - - {{ acceptrequest.main_char.character_name }} - - {% else %} - {{ acceptrequest.user.username }} - {% endif %} - - {% if acceptrequest.main_char %} - - {{ acceptrequest.main_char.corporation_name }} -
- {{ acceptrequest.main_char.alliance_name|default_if_none:"" }} - {% else %} - (unknown) - {% endif %} - 		{{ acceptrequest.group.name }} - - {% trans "Accept" %} - - - {% trans "Reject" %} - -
+ + + + + + - {% endfor %} - -
{% trans "Character" %}{% trans "Organization" %}{% trans "Group" %}
-
- {% else %} -
{% trans "No group add requests." %}
- {% endif %} + + +
+ + {% if acceptrequest.main_char %} + + {{ acceptrequest.main_char.character_name }} + + {% else %} + {{ acceptrequest.user.username }} + {% endif %} + + {% if acceptrequest.main_char %} + + {{ acceptrequest.main_char.corporation_name }} +
+ {{ acceptrequest.main_char.alliance_name|default_if_none:"" }} + {% else %} + {% trans "(unknown)" %} + {% endif %} + 		{{ acceptrequest.group.name }} + + {% trans "Accept" %} + + + + {% trans "Reject" %} + +
+
+ {% else %} +
{% trans "No group add requests." %}
+ {% endif %}
- {% if leaverequests %} -
- - - - - - - - - - - - {% for leaverequest in leaverequests %} - - - - - - + {% if leaverequests %} +
+
{% trans "Character" %}{% trans "Organization" %}{% trans "Group" %}
- - - {% 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 %} - (unknown) - {% endif %} - 		{{ leaverequest.group.name }} - - {% trans "Accept" %} - - - {% trans "Reject" %} - -
+ + + + + + - {% endfor %} - -
{% trans "Character" %}{% trans "Organization" %}{% trans "Group" %}
-
- {% else %} -
{% trans "No group leave requests." %}
- {% endif %} + + +
+ + {% 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 %} + (unknown) + {% endif %} + 		{{ leaverequest.group.name }} + + {% trans "Accept" %} + + + + {% trans "Reject" %} + +
+
+ {% else %} +
{% trans "No group leave requests." %}
+ {% endif %}
-
{% endblock content %}