diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html index 99d43ee7..32896cbc 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.html +++ b/allianceauth/authentication/templates/authentication/dashboard.html @@ -98,7 +98,7 @@
- +
{% for group in user.groups.all %} @@ -118,7 +118,7 @@
-
{{ group.name }}
+ @@ -141,7 +141,7 @@ {% endfor %} - +
{% for ownership in request.user.character_ownerships.all %} {% with ownership.character as char %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index e95459c2..cec10171 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -14,12 +14,9 @@

- -   - - Back - - + + Back +

{% if entries %}
@@ -27,8 +24,8 @@
- - + + @@ -39,7 +36,7 @@ - + {% if entry.request_type is None %} @@ -55,10 +52,12 @@ All times displayed are EVE/UTC.

- {% else %} -
+ {% else %} +
+
+
{% trans "No entries found for this group." %} -
+
{% endif %} @@ -67,6 +66,7 @@ {% block extra_javascript %} {% include 'bundles/datatables-js.html' %} + {% endblock %} {% block extra_css %} @@ -75,7 +75,33 @@ {% block extra_script %} $(document).ready(function(){ - $('#log-entries').DataTable(); + $('#log-entries').DataTable({ + order: [[ 0, 'desc' ], [ 1, 'asc' ] ], + filterDropDown: + { + columns: [ + { + idx: 1 + }, + { + idx: 2 + }, + { + idx: 3 + }, + { + idx: 4 + }, + { + idx: 5 + }, + { + idx: 6 + } + ], + bootstrap: true + }, + }); }); {% endblock %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html index 0c565e33..2eb97342 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html @@ -15,17 +15,14 @@ {{ group.name }} - {% trans 'Members' %}
-

- -   - - Back - - +

+ + Back +

{% if group.user_set %}
-
{% trans "Date/Time" %} {% trans "Requestor" %}{% trans "Main Character" %}{% trans "Group" %}{% trans "Character" %}{% trans "Corporation" %} {% trans "Type" %} {% trans "Action" %} {% trans "Actor" %}{{ entry.date }} {{ entry.requestor }} {{ entry.req_char }}{{ entry.group }}{{ entry.req_char.corporation_name }} {{ entry.type_to_str }} Removed
+
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html index 08d5f5e5..eee6b0fb 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html @@ -16,7 +16,7 @@
{% if groups %}
-
{% trans "Portrait" %}
+
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html index 37f654e1..e6f97f75 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html @@ -9,7 +9,7 @@ url

{% trans "Available Groups" %}

{% if groups %} -
{% trans "Name" %}
+
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index f9069b43..68224f59 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -30,7 +30,7 @@
{% if acceptrequests %}
-
{% trans "Name" %}
+
@@ -89,7 +89,7 @@
{% if leaverequests %}
-
+
diff --git a/allianceauth/static/css/auth-base.css b/allianceauth/static/css/auth-base.css index 1448a323..73400a1f 100644 --- a/allianceauth/static/css/auth-base.css +++ b/allianceauth/static/css/auth-base.css @@ -43,12 +43,29 @@ ul.list-group.list-group-horizontal > li.list-group-item { justify-content: center; } -/* group headers within a table */ +/* style group headers within a table */ .tr-group { font-weight: bold; background-color: #e6e6e6 !important; } +/* default style for tables */ +.table-aa > thead > tr > th{ + border-bottom: 1px solid #f2f2f2; +} +.table-aa > thead > tr > th{ + vertical-align: middle; +} +.table-aa > tbody > tr > td{ + border-bottom: 1px solid #f2f2f2; +} +.table-aa > tbody > tr > td { + vertical-align: middle; +} +.table-aa > tbody > tr:last-child { + border-bottom: none; +} + /* Small devices (tablets, 768px and up) */ @media (min-width: 768px) {