diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html index ebea7e05..99d43ee7 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.html +++ b/allianceauth/authentication/templates/authentication/dashboard.html @@ -18,57 +18,64 @@
{% if request.user.profile.main_character %} - {% with request.user.profile.main_character as main %} -
- - - - - - - -
- -
- - - {{ main.character_name }}
- {{ main.corporation_name }}
- {{ main.alliance_name }} - -
-
-
- - - - - - - - -
-
- {% if main.alliance_id %} - - - - - - - - - {% endif %} -
- {% endwith %} + {% with request.user.profile.main_character as main %} + +
+

+ + + +

+

+ {{ main.character_name }}
+ {{ main.corporation_name }}
+ {{ main.alliance_name }} +

+
+ {% endwith %} {% else %} - + {% endif %}
@@ -93,9 +100,9 @@
{% for group in user.groups.all %} - - - + + + {% endfor %}
{{ group.name }}
{{ group.name }}
@@ -123,13 +130,13 @@ {% for ownership in request.user.character_ownerships.all %} {% with ownership.character as char %} - - - - {{ char.character_name }} - {{ char.corporation_name }} - {{ char.alliance_name }} - + + + + {{ char.character_name }} + {{ char.corporation_name }} + {{ char.alliance_name }} + {% endwith %} {% endfor %} @@ -138,16 +145,16 @@ {% for ownership in request.user.character_ownerships.all %} {% with ownership.character as char %} - - - - - - {{ char.character_name }}
- {{ char.corporation_name }}
- {{ char.alliance_name|default:"" }} - - + + + + + + {{ char.character_name }}
+ {{ char.corporation_name }}
+ {{ char.alliance_name|default:"" }} + + {% endwith %} {% endfor %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index 7010ea47..f4acf2d0 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -27,37 +27,42 @@ {% trans "Actor" %} - {% for entry in entries %} - - {{ entry.date }} - {{ entry.requestor }} - {{ entry.req_char }} - {{ entry.group }} - {{ entry.type_to_str }} - {% if entry.request_type is None %} - Removed - {% else %} - {{ entry.action_to_str }} - {% endif %} - {{ entry.request_actor }} - - {% endfor %} + {% for entry in entries %} + + {{ entry.date }} + {{ entry.requestor }} + {{ entry.req_char }} + {{ entry.group }} + {{ entry.type_to_str }} + {% if entry.request_type is None %} + Removed + {% else %} + {{ entry.action_to_str }} + {% endif %} + {{ entry.request_actor }} + + {% endfor %}
{% else %} -
{% trans "No entries found for this group." %}
+
+ {% trans "No entries found for this group." %} +
{% endif %}
{% endblock %} + {% block extra_javascript %} {% include 'bundles/datatables-js.html' %} {% endblock %} + {% block extra_css %} {% include 'bundles/datatables-css.html' %} {% endblock %} + {% block extra_script %} $(document).ready(function(){ $('#log-entries').DataTable(); diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html index 0874faf2..45f29f9b 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html @@ -4,7 +4,6 @@ {% load evelinks %} {% block page_title %}{% trans "Group Members" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} {% block content %}
@@ -18,54 +17,79 @@
{% if group.user_set %} - - - - - - - - - - {% for member in members %} - - - - - - - - - {% endfor %} -
{% trans "Leader" %}{% trans "Portrait" %}{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}{% trans "Action" %}
- {% if member.is_leader %} - - {% endif %} - - - - - {{ member.main_char.character_name }} - - - - {{ member.main_char.corporation_name }} - - - - {{ member.main_char.alliance_name|default_if_none:"" }} - - - - - -
+
+ + + + + + + + + + + + {% for member in members %} + + + + + + + + {% endfor %} + +
{% trans "Portrait" %}{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}
+ {% if member.is_leader %} +   + {% endif %} + + + + {{ member.main_char.character_name }} + + + + {{ member.main_char.corporation_name }} + + + + {{ member.main_char.alliance_name|default_if_none:"" }} + + + + + +
+

: Group leader

+
{% else %} -
{% trans "No group members to list." %}
+
+ {% trans "No group members to list." %} +
{% endif %}
{% 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_group_members').DataTable({ + order: [ [ 1, "asc" ] ], + columnDefs: [ + { "sortable": false, "targets": [0, 4] }, + ] + }); + }); +{% endblock %} \ No newline at end of file diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html index dd6584cf..e8e8611e 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html @@ -15,44 +15,52 @@
{% if groups %} - - - - - - - - - {% for group in groups %} - - - - - - - - {% endfor %} -
{% trans "Name" %}{% trans "Description" %}{% trans "Status" %}{% trans "Member Count" %}{% trans "Action" %}
{{ group.name }}{{ group.authgroup.description }} - {% if group.authgroup.hidden %} - {% trans "Hidden" %} - {% elif group.authgroup.open %} - {% trans "Open" %} - {% else %} - {% trans "Requestable" %} - {% endif %} - - {{ group.num_members }} - - - - - - - -
+
+ + + + + + + + + + + + {% for group in groups %} + + + + + + + + {% endfor %} + +
{% trans "Name" %}{% trans "Description" %}{% trans "Status" %}{% trans "Member Count" %}
{{ group.name }}{{ group.authgroup.description }} + {% if group.authgroup.hidden %} + {% trans "Hidden" %} + {% elif group.authgroup.open %} + {% trans "Open" %} + {% else %} + {% trans "Requestable" %} + {% endif %} + + {{ group.num_members }} + + + + + + + +
+
{% else %} -
{% trans "No groups to list." %}
+
+ {% trans "No groups to list." %} +
{% endif %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html index 008b11e4..37f654e1 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html @@ -9,49 +9,54 @@ url

{% trans "Available Groups" %}

{% if groups %} - - - - - - - - {% for g in groups %} - - - - - - {% endfor %} -
{% trans "Name" %}{% trans "Description" %}{% trans "Action" %}
{{ g.group.name }}{{ g.group.authgroup.description|urlize }} - {% if g.group in user.groups.all %} - {% if not g.request %} - - {% trans "Leave" %} - - {% else %} - - {% endif %} - {% elif not g.request %} - {% if g.group.authgroup.open %} - - {% trans "Join" %} - - {% else %} - - {% trans "Request" %} - - {% endif %} - {% else %} - - {% endif %} -
+ + + + + + + + + + {% for g in groups %} + + + + + + {% endfor %} + +
{% trans "Name" %}{% trans "Description" %}{% trans "Action" %}
{{ g.group.name }}{{ g.group.authgroup.description|urlize }} + {% if g.group in user.groups.all %} + {% if not g.request %} + + {% trans "Leave" %} + + {% else %} + + {% endif %} + {% elif not g.request %} + {% if g.group.authgroup.open %} + + {% trans "Join" %} + + {% else %} + + {% trans "Request" %} + + {% endif %} + {% else %} + + {% endif %} +
{% else %} -
{% trans "No groups available." %}
+
+ {% trans "No groups available." %} +
{% endif %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index e44fd4f9..493371ae 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -20,8 +20,8 @@ {% include 'groupmanagement/menu.html' %}
@@ -29,49 +29,55 @@
{% if acceptrequests %} - - - - - - - - - - - {% for acceptrequest in acceptrequests %} - - - - - - - - - - {% endfor %} -
{% trans "#" %}{% trans "Portrait" %}{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}{% trans "Group" %}
{{ acceptrequest.id }} - - - - {{ acceptrequest.main_char.character_name }} - - - - {{ acceptrequest.main_char.corporation_name }} - - - - {{ acceptrequest.main_char.alliance_name|default_if_none:"" }} - - {{ acceptrequest.group.name }} - - {% trans "Accept" %} - - - {% trans "Reject" %} - -
+
+ + + + + + + + + + + + + + {% for acceptrequest in acceptrequests %} + + + + + + + + + + {% endfor %} + +
{% trans "#" %}{% trans "Portrait" %}{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}{% trans "Group" %}
{{ acceptrequest.id }} + + + + {{ acceptrequest.main_char.character_name }} + + + + {{ acceptrequest.main_char.corporation_name }} + + + + {{ acceptrequest.main_char.alliance_name|default_if_none:"" }} + + {{ acceptrequest.group.name }} + + {% trans "Accept" %} + + + {% trans "Reject" %} + +
+
{% else %}
{% trans "No group add requests." %}
{% endif %} @@ -81,49 +87,55 @@
{% if leaverequests %} - - - - - - - - - - - {% for leaverequest in leaverequests %} - - - - - - - - - - {% endfor %} -
{% trans "#" %}{% trans "Portrait" %}{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}{% trans "Group" %}
{{ leaverequest.id }} - - - - {{ leaverequest.main_char.character_name }} - - - - {{ leaverequest.main_char.corporation_name }} - - - - {{ leaverequest.main_char.alliance_name|default_if_none:"" }} - - {{ leaverequest.group.name }} - - {% trans "Accept" %} - - - {% trans "Reject" %} - -
+
+ + + + + + + + + + + + + + {% for leaverequest in leaverequests %} + + + + + + + + + + {% endfor %} + +
{% trans "#" %}{% trans "Portrait" %}{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}{% trans "Group" %}
{{ leaverequest.id }} + + + + {{ leaverequest.main_char.character_name }} + + + + {{ leaverequest.main_char.corporation_name }} + + + + {{ leaverequest.main_char.alliance_name|default_if_none:"" }} + + {{ leaverequest.group.name }} + + {% trans "Accept" %} + + + {% trans "Reject" %} + +
+
{% else %}
{% trans "No group leave requests." %}
{% endif %}