diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html index 8140a78f..32896cbc 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.html +++ b/allianceauth/authentication/templates/authentication/dashboard.html @@ -10,77 +10,99 @@ {% include 'allianceauth/admin-status/include.html' %} {% endif %}
-
+
-

{% trans "Main Character" %}

+
+

{% trans "Main Character" %}

+
{% if request.user.profile.main_character %} - {% with request.user.profile.main_character as main %} -
- - - - - - - -
- -
{{ main.character_name }}
-
-
- - - - - - - -
- -
{{ main.corporation_name }}
-
-
- {% if main.alliance_id %} - - - - - - - -
- -
{{ main.alliance_name }}
- {% endif %} -
- {% endwith %} + {% with request.user.profile.main_character as main %} + +
+

+ + + +

+

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

+
+ {% endwith %} {% else %} - + {% endif %}
-
- {% trans 'Add Character' %} -
-
- {% trans "Change Main" %} +
+
+ {% trans 'Add Character' %} +
+
+ {% trans "Change Main" %} +
-

{% trans "Groups" %}

+
+

{% trans "Groups" %}

+
- +
{% for group in user.groups.all %} - - - + + + {% endfor %}
{{ group.name }}
{{ group.name }}
@@ -90,26 +112,52 @@
-

{% trans 'Characters' %}

-
- - - - - - - - {% for ownership in request.user.character_ownerships.all %} - {% with ownership.character as char %} - - - - - - - {% endwith %} - {% endfor %} +
+

+ {% trans 'Characters' %} +

+
+
+
{% trans 'Name' %}{% trans 'Corp' %}{% trans 'Alliance' %}
- {{ char.character_name }}{{ char.corporation_name }}{{ char.alliance_name }}
+ + + + + + + + + + {% for ownership in request.user.character_ownerships.all %} + {% with ownership.character as char %} + + + + + + + {% endwith %} + {% endfor %} + + + + + {% for ownership in request.user.character_ownerships.all %} + {% with ownership.character as char %} + + + + + {% endwith %} + {% endfor %} +
+ + + {{ char.character_name }}
+ {{ char.corporation_name }}
+ {{ char.alliance_name|default:"" }} +
diff --git a/allianceauth/authentication/templates/public/login.html b/allianceauth/authentication/templates/public/login.html index 428365a8..80d31979 100644 --- a/allianceauth/authentication/templates/public/login.html +++ b/allianceauth/authentication/templates/public/login.html @@ -1,10 +1,8 @@ {% extends 'public/middle_box.html' %} {% load static %} {% block page_title %}Login{% endblock %} -{% block middle_box_content %} -

- - - -

+{% block middle_box_content %} + + + {% endblock %} \ No newline at end of file diff --git a/allianceauth/corputils/templates/corputils/corpstats.html b/allianceauth/corputils/templates/corputils/corpstats.html index bbb12fff..6e24178b 100644 --- a/allianceauth/corputils/templates/corputils/corpstats.html +++ b/allianceauth/corputils/templates/corputils/corpstats.html @@ -7,11 +7,12 @@
- + {% if corpstats.corp.alliance %} - {% endif %} @@ -33,11 +34,11 @@
  • {% trans 'Members' %} ({{ corpstats.member_count }})
  • {% trans 'Unregistered' %} ({{ unregistered.count }})
    • -
    - {% trans "Last update:" %} {{ corpstats.last_update|naturaltime }} - - - +
    diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index 7010ea47..cec10171 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -13,54 +13,95 @@ {{ group }} - {% trans 'Audit Log' %}
    -

    All times displayed are EVE/UTC.

    +

    + + Back + +

    {% if entries %}
    + + + +
    - - + + - {% for entry in entries %} - - - - - - - {% if entry.request_type is None %} - - {% else %} - - {% endif %} - - - {% endfor %} + {% for entry in entries %} + + + + + + + {% if entry.request_type is None %} + + {% else %} + + {% endif %} + + + {% endfor %}
    {% 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.type_to_str }} Removed{{ entry.action_to_str }}{{ entry.request_actor }}
    {{ entry.date }}{{ entry.requestor }}{{ entry.req_char }}{{ entry.req_char.corporation_name }}{{ entry.type_to_str }} Removed{{ entry.action_to_str }}{{ entry.request_actor }}
    +

    + All times displayed are EVE/UTC. +

    - {% else %} -
    {% trans "No entries found for this group." %}
    + {% else %} +
    +
    +
    + {% 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(); + $('#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 0874faf2..2eb97342 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 %}
    @@ -15,57 +14,89 @@
    {{ group.name }} - {% trans 'Members' %}
    -
    -
    - {% 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:"" }} - - - - - -
    - {% else %} -
    {% trans "No group members to list." %}
    - {% endif %} -
    +
    +

    + + Back + +

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

    : Group leader

    +
    + {% else %} +
    + {% 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, 3] }, + ] + }); + }); +{% 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..eee6b0fb 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html @@ -15,44 +15,54 @@
    {% 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..e6f97f75 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..68224f59 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,56 @@
    {% 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 "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" %} + +
    +
    {% else %}
    {% trans "No group add requests." %}
    {% endif %} @@ -81,49 +88,56 @@
    {% 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 "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" %} + +
    +
    {% else %}
    {% trans "No group leave requests." %}
    {% endif %} diff --git a/allianceauth/optimer/templates/optimer/fleetoptable.html b/allianceauth/optimer/templates/optimer/fleetoptable.html index 31543120..a0351ef5 100644 --- a/allianceauth/optimer/templates/optimer/fleetoptable.html +++ b/allianceauth/optimer/templates/optimer/fleetoptable.html @@ -2,44 +2,46 @@ {% load evelinks %} {% block content %} - - - - - - - - - - - {% if perms.auth.optimer_management %} - - - {% endif %} - - - {% for ops in timers %} - - - - - - - - - - {% if perms.auth.optimer_management %} - - - {% endif %} - - - {% endfor %} -
    {% trans "Operation Name" %}{% trans "Doctrine" %}{% trans "Form Up System" %}{% trans "Start Time" %}{% trans "Local Time" %}{% trans "Duration" %}{% trans "FC" %}{% trans "Creator" %}{% trans "Action" %}
    {{ ops.operation_name }}{{ ops.doctrine }} - {{ ops.system }} - {{ ops.start | date:"Y-m-d H:i" }}
    		{{ ops.duration }}{{ ops.fc }}{{ ops.eve_character }} - - - -
    +
    + + + + + + + + + + + {% if perms.auth.optimer_management %} + + + {% endif %} + + + {% for ops in timers %} + + + + + + + + + + {% if perms.auth.optimer_management %} + + + {% endif %} + + + {% endfor %} +
    {% trans "Operation Name" %}{% trans "Doctrine" %}{% trans "Form Up System" %}{% trans "Start Time" %}{% trans "Local Time" %}{% trans "Duration" %}{% trans "FC" %}{% trans "Creator" %}{% trans "Action" %}
    {{ ops.operation_name }}{{ ops.doctrine }} + {{ ops.system }} + {{ ops.start | date:"Y-m-d H:i" }}
    		{{ ops.duration }}{{ ops.fc }}{{ ops.eve_character }} + + + +
    +
    {% endblock content %} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html index 660d8dcb..c967f91f 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html @@ -8,41 +8,85 @@ {% block content %}

    {% trans "Permissions Audit" %}: {{ permission.permission.codename }}

    - - {% 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 "Back" %} + +

    +
    +
    - {% trans "Group" %} - - {% trans "User" %} -
    + + + + + + + + + + {% for user in permission.users %} + {% include 'permissions_tool/audit_row.html' with type="User" name="Permission granted directlty" %} {% 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' with type="Group" name=group%} + {% endfor %} {% endfor %} - {% endfor %} - -
    {% trans "Group" %}{% trans "User / Character" %}{% trans "Organization" %}
    + {% for state in permission.states %} + {% for profile in state.userprofile_set.all %} + {% with profile.user as user %} + {% include 'permissions_tool/audit_row.html' with type="State" name=state%} + {% endwith %} + {% endfor %} + {% endfor %} + + +
    {% 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() { + var groupColumn = 0; + var table = $('#tab_permissions_audit').DataTable({ + columnDefs: [ + { "visible": false, "targets": groupColumn } + ], + order: [[ groupColumn, 'asc' ], [ 2, 'asc' ] ], + filterDropDown: + { + columns: [ + { + idx: 0, + title: 'Source' + } + ], + bootstrap: true + }, + drawCallback: function ( settings ) { + var api = this.api(); + var rows = api.rows( {page:'current'} ).nodes(); + var last=null; + + api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) { + if ( last !== group ) { + $(rows).eq( i ).before( + '' + group + '' + ); + + last = group; + } + } ); + } + } ); + } ); +{% endblock %} \ No newline at end of file diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html b/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html index 7431556b..390e04d7 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html @@ -1,10 +1,25 @@ +{% load evelinks %} + - - {% if forloop.first %} - {{ group }} - {% endif %} + + {{ type }}: {{ name }} + + + - {{ user }} + {{ user }}
     + {{ user.profile.main_character.character_name }} + + + {% if user.profile.main_character %} + + {{ user.profile.main_character.corporation_name }} +
    + {{ user.profile.main_character.alliance_name|default_if_none:"" }} + {% else %} + (unknown) + {% endif %} + diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit_state_row.html b/allianceauth/permissions_tool/templates/permissions_tool/audit_state_row.html deleted file mode 100644 index dd8baa5f..00000000 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit_state_row.html +++ /dev/null @@ -1,11 +0,0 @@ -{% load i18n %} - - - {% if forloop.first %} - {% trans 'State' %}: {{ state }} - {% endif %} - - - {{ user }} - - diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html index 3e8f509d..6cb1703c 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html @@ -8,72 +8,120 @@ {% block content %}

    {% trans "Permissions Overview" %}

    - {% if request.GET.all != 'yes' %} - - {% blocktrans %}Showing only applied permissions{% endblocktrans %} - {% trans "Show All" %} - +

    + {% if request.GET.all != 'yes' %} + {% blocktrans %}Showing only applied permissions{% endblocktrans %} + {% trans "Show All" %} {% else %} - - {% blocktrans %}Showing all permissions{% endblocktrans %} - {% trans "Show Applied" %} - + {% blocktrans %}Showing all permissions{% endblocktrans %} + {% 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() { + var groupColumn = 0; + var table = $('#tab_permissions_overview').DataTable({ + columnDefs: [ + { "visible": false, "targets": groupColumn } + ], + order: [[ groupColumn, 'asc' ], [ 1, 'asc' ], [ 2, 'asc' ] ], + filterDropDown: + { + columns: [ + { + idx: 0 + }, + { + idx: 1 + } + ], + bootstrap: true + }, + drawCallback: function ( settings ) { + var api = this.api(); + var rows = api.rows( {page:'current'} ).nodes(); + var last=null; + + api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) { + if ( last !== group ) { + $(rows).eq( i ).before( + '' + group + '' + ); + + last = group; + } + } ); + } + } ); + } ); +{% endblock %} \ No newline at end of file diff --git a/allianceauth/services/templates/services/services.html b/allianceauth/services/templates/services/services.html index 6f4d39f1..0f2d10d7 100755 --- a/allianceauth/services/templates/services/services.html +++ b/allianceauth/services/templates/services/services.html @@ -8,17 +8,23 @@ {% block content %}

    {% trans "Available Services" %}

    - - - - - - - - {% for svc in service_ctrls %} - {{ svc }} - {% endfor %} -
    {% trans "Service" %}{% trans "Username" %}{% trans "Domain" %}{% trans "Action" %}
    +
    + + + + + + + + + + + {% for svc in service_ctrls %} + {{ svc }} + {% endfor %} + +
    {% trans "Service" %}{% trans "Username" %}{% trans "Domain" %}{% trans "Action" %}
    +
    {% endblock content %} 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 %} + + + {% endfor %} + + {% else %} -
    {% trans "No SRP fleets created." %}
    +
    + {% trans "No SRP fleets created." %} +
    {% endif %} diff --git a/allianceauth/static/css/auth-base.css b/allianceauth/static/css/auth-base.css index 7ce03d2a..73400a1f 100644 --- a/allianceauth/static/css/auth-base.css +++ b/allianceauth/static/css/auth-base.css @@ -42,3 +42,51 @@ ul.list-group.list-group-horizontal > li.list-group-item { .flex-center-horizontal { justify-content: center; } + +/* 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) { + + /* class for vertically aligning columns in a bootstrap row */ + .row.vertical-flexbox-row2 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + flex-wrap: wrap; + } + + .row.vertical-flexbox-row2 > [class*='col-'] { + display: flex; + flex-direction: column; + } +} + +/* Extra Small devices (Phones, <768px) */ +@media (max-width: 767px) { + .button-wrapper .btn { + margin-bottom:5px; + } +} \ No newline at end of file diff --git a/allianceauth/static/js/filterDropDown/filterDropDown.min.js b/allianceauth/static/js/filterDropDown/filterDropDown.min.js new file mode 100644 index 00000000..d19686ff --- /dev/null +++ b/allianceauth/static/js/filterDropDown/filterDropDown.min.js @@ -0,0 +1 @@ +!function(t){function e(t){var e={columns:[],columnsIdxList:[],bootstrap:!1,autoSize:!0,label:"Filter "};if("bootstrap"in t&&"boolean"==typeof t.bootstrap&&(e.bootstrap=t.bootstrap),"autoSize"in t&&"boolean"==typeof t.autoSize&&(e.autoSize=t.autoSize),"label"in t&&"string"==typeof t.label&&(e.label=t.label),"columns"in t)for(var i=0;i'+r.label+""),o.columns(r.columnsIdxList).every(function(){var e=this.index(),i=null!==r.columns[e].title?r.columns[e].title:t(this.header()).html();""==i&&(i="column "+(e+1));var n="form-control "+a+"_filterSelect",o=a+"_filterSelect"+e;t("#"+s).append('');var l=t("#"+o).empty().append('");r.autoSize&&r.columns[e].autoSize&&screen.width>768&&l.css("max-width",l.outerWidth()),null!==r.columns[e].maxWidth&&l.css("max-width",r.columns[e].maxWidth)})}}}}),t(document).on("init.dt",function(i,n){if("dt"===i.namespace){var o=new t.fn.dataTable.Api(n),a=o.table().node().id,l=o.init();if("filterDropDown"in l){var r=e(l.filterDropDown);o.table().container();o.columns(r.columnsIdxList).every(function(){var e=this,i=e.index(),n=t("#"+(a+"_filterSelect"+i));n.on("change",function(){var i=t.fn.dataTable.util.escapeRegex(t(this).val());e.search(i?"^"+i+"$":"",!0,!1).draw()}),e.data().unique().sort().each(function(t,e){""!=t&&n.append('")})})}}})}(jQuery); \ No newline at end of file diff --git a/allianceauth/static/js/filterDropDown/filterDropDown.min.js:Zone.Identifier b/allianceauth/static/js/filterDropDown/filterDropDown.min.js:Zone.Identifier new file mode 100644 index 00000000..8408f13c --- /dev/null +++ b/allianceauth/static/js/filterDropDown/filterDropDown.min.js:Zone.Identifier @@ -0,0 +1,4 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=https://github.com/ErikKalkoken/filterDropDown/blob/master/js/filterDropDown.min.js +HostUrl=https://raw.githubusercontent.com/ErikKalkoken/filterDropDown/master/js/filterDropDown.min.js diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html index 5c45b80c..af24cd2f 100644 --- a/allianceauth/templates/allianceauth/admin-status/overview.html +++ b/allianceauth/templates/allianceauth/admin-status/overview.html @@ -1,6 +1,6 @@ {% load i18n %}
    -
    +

    {% trans "Alliance Auth Notifications" %}

    @@ -31,33 +31,36 @@
    • -

      {% trans "Current" %}

      +
      {% trans "Current" %}

      {{ current_version }}

    • -

      {% trans "Latest Major" %}

      +
      {% trans "Latest Major" %}

      - + + {{ latest_major_version }} {% if not latest_major %}
      {% trans "Update available" %}{% endif %}

    • -

      {% trans "Latest Minor" %}

      +
      {% trans "Latest Minor" %}

      - + + {{ latest_minor_version }} {% if not latest_minor %}
      {% trans "Update available" %}{% endif %}

    • -

      {% trans "Latest Patch" %}

      +
      {% trans "Latest Patch" %}

      - + + {{ latest_patch_version }} {% if not latest_patch %}
      {% trans "Update available" %}{% endif %} diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html index 4dd4c85a..dcf82a4d 100644 --- a/allianceauth/timerboard/templates/timerboard/view.html +++ b/allianceauth/timerboard/templates/timerboard/view.html @@ -12,7 +12,9 @@

      {% trans "Structure Timers" %}
      {% if perms.auth.timer_management %} - {% trans "Create Structure Timer" %} + + {% trans "Create Structure Timer" %} + {% endif %}

      @@ -24,484 +26,500 @@
    {% if corp_timers %}

    {% trans "Corp Timers" %}

    - - - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% for timer in corp_timers %} - {% if timer.important == True %} - - {% else %} - - {% endif %} - - - - - - - - {% if perms.auth.timer_management %} +
    +
    {% trans "Details" %}{% trans "Objective" %}{% trans "System" %}{% trans "Structure" %}{% trans "Eve Time" %}{% trans "Local Time" %}{% trans "Creator" %}{% trans "Action" %}
    {{ timer.details }} - {% if timer.objective == "Hostile" %} -
    - {% trans "Hostile" %} -
    - {% endif %} - {% if timer.objective == "Friendly" %} -
    - {% trans "Friendly" %} -
    - {% endif %} - {% if timer.objective == "Neutral" %} -
    - {% trans "Neutral" %} -
    - {% endif %} -     		{{ timer.system }} {{ timer.planet_moon }} - - {% if timer.structure == "POCO" %} -
    - POCO -
    - {% endif %} - {% if timer.structure == "I-HUB" %} -
    - I-HUB -
    - {% endif %} - {% if timer.structure == "TCU" %} -
    - TCU -
    - {% endif %} - {% if timer.structure == "POS[S]" %} -
    - POS [S] -
    - {% endif %} - {% if timer.structure == "POS[M]" %} -
    - POS [M] -
    - {% endif %} - {% if timer.structure == "POS[L]" %} -
    - POS [L] -
    - {% endif %} - {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %} -
    - Astrahus -
    - {% endif %} - {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %} -
    - Fortizar -
    - {% endif %} - {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %} -
    - Keepstar -
    - {% endif %} - {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %} -
    - Raitaru -
    - {% endif %} - {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %} -
    - Azbel -
    - {% endif %} - {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %} -
    - Sotiyo -
    - {% endif %} - {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %} -
    - Athanor -
    - {% endif %} - {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara"%} -
    - Tatara -
    - {% endif %} - {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %} -
    - Cyno Beacon -
    - {% endif %} - {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %} -
    - Tenebrex Cyno Jammer -
    - {% endif %} - {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %} -
    - Ansiblex Jump Gate -
    - {% endif %} - {% if timer.structure == "Moon Mining Cycle" %} -
    - Moon Mining Cycle -
    - {% endif %} - {% if timer.structure == "Other" %} -
    - Other -
    - {% endif %} -     		{{ timer.eve_time | date:"Y-m-d H:i" }} -
    -
    -     		{{ timer.eve_character.character_name }}
    + + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% for timer in corp_timers %} + {% if timer.important == True %} + + {% else %} + + {% endif %} + + - {% endif %} - - {% endfor %} -
    {% trans "Details" %}{% trans "Objective" %}{% trans "System" %}{% trans "Structure" %}{% trans "Eve Time" %}{% trans "Local Time" %}{% trans "Creator" %}{% trans "Action" %}
    {{ timer.details }} - - - - - + {% if timer.objective == "Hostile" %} +
    + {% trans "Hostile" %} +
    + {% endif %} + {% if timer.objective == "Friendly" %} +
    + {% trans "Friendly" %} +
    + {% endif %} + {% if timer.objective == "Neutral" %} +
    + {% trans "Neutral" %} +
    + {% endif %} +     		+ {{ timer.system }} {{ timer.planet_moon }}
    + + {% if timer.structure == "POCO" %} +
    + POCO +
    + {% endif %} + {% if timer.structure == "I-HUB" %} +
    + I-HUB +
    + {% endif %} + {% if timer.structure == "TCU" %} +
    + TCU +
    + {% endif %} + {% if timer.structure == "POS[S]" %} +
    + POS [S] +
    + {% endif %} + {% if timer.structure == "POS[M]" %} +
    + POS [M] +
    + {% endif %} + {% if timer.structure == "POS[L]" %} +
    + POS [L] +
    + {% endif %} + {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %} +
    + Astrahus +
    + {% endif %} + {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %} +
    + Fortizar +
    + {% endif %} + {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %} +
    + Keepstar +
    + {% endif %} + {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %} +
    + Raitaru +
    + {% endif %} + {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %} +
    + Azbel +
    + {% endif %} + {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %} +
    + Sotiyo +
    + {% endif %} + {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %} +
    + Athanor +
    + {% endif %} + {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara"%} +
    + Tatara +
    + {% endif %} + {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %} +
    + Cyno Beacon +
    + {% endif %} + {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %} +
    + Tenebrex Cyno Jammer +
    + {% endif %} + {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %} +
    + Ansiblex Jump Gate +
    + {% endif %} + {% if timer.structure == "Moon Mining Cycle" %} +
    + Moon Mining Cycle +
    + {% endif %} + {% if timer.structure == "Other" %} +
    + Other +
    + {% endif %} + + {{ timer.eve_time | date:"Y-m-d H:i" }} + +
    +
    + + {{ timer.eve_character.character_name }} + {% if perms.auth.timer_management %} + + + + + + + + + {% endif %} + + {% endfor %} + +
    {% endif %}

    {% trans "Next Timers" %}

    {% if future_timers %} - - - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% for timer in future_timers %} - {% if timer.important == True %} - - {% else %} - - {% endif %} - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% endfor %} -
    {% trans "Details" %}{% trans "Objective" %}{% trans "System" %}{% trans "Structure" %}{% trans "Eve Time" %}{% trans "Local Time" %}{% trans "Creator" %}{% trans "Action" %}
    {{ timer.details }} - {% if timer.objective == "Hostile" %} -
    - {% trans "Hostile" %} -
    - {% endif %} - {% if timer.objective == "Friendly" %} -
    - {% trans "Friendly" %} -
    - {% endif %} - {% if timer.objective == "Neutral" %} -
    - {% trans "Neutral" %} -
    - {% endif %} -     		- {{ timer.system }} {{ timer.planet_moon }} - - {% if timer.structure == "POCO" %} -
    - POCO -
    - {% endif %} - {% if timer.structure == "I-HUB" %} -
    - I-HUB -
    - {% endif %} - {% if timer.structure == "TCU" %} -
    - TCU -
    - {% endif %} - {% if timer.structure == "POS[S]" %} -
    - POS [S] -
    - {% endif %} - {% if timer.structure == "POS[M]" %} -
    - POS [M] -
    - {% endif %} - {% if timer.structure == "POS[L]" %} -
    - POS [L] -
    - {% endif %} - {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %} -
    - Astrahus -
    - {% endif %} - {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %} -
    - Fortizar -
    - {% endif %} - {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %} -
    - Keepstar -
    - {% endif %} - {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %} -
    - Raitaru -
    - {% endif %} - {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %} -
    - Azbel -
    - {% endif %} - {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %} -
    - Sotiyo -
    - {% endif %} - {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %} -
    - Athanor -
    - {% endif %} - {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %} -
    - Tatara -
    - {% endif %} - {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %} -
    - Pharolux Cyno Beacon -
    - {% endif %} - {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %} -
    - Tenebrex Cyno Jammer -
    - {% endif %} - {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %} -
    - Ansiblex Jump Gate -
    - {% endif %} - {% if timer.structure == "Moon Mining Cycle" %} -
    - Moon Mining Cycle -
    - {% endif %} - {% if timer.structure == "Other" %} -
    - Other -
    - {% endif %} -     		{{ timer.eve_time | date:"Y-m-d H:i" }} -
    -
    -     		{{ timer.eve_character.character_name }} - - - - - - -
    +
    + + + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% for timer in future_timers %} + {% if timer.important == True %} + + {% else %} + + {% endif %} + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% endfor %} +
    {% trans "Details" %}{% trans "Objective" %}{% trans "System" %}{% trans "Structure" %}{% trans "Eve Time" %}{% trans "Local Time" %}{% trans "Creator" %}{% trans "Action" %}
    {{ timer.details }} + {% if timer.objective == "Hostile" %} +
    + {% trans "Hostile" %} +
    + {% endif %} + {% if timer.objective == "Friendly" %} +
    + {% trans "Friendly" %} +
    + {% endif %} + {% if timer.objective == "Neutral" %} +
    + {% trans "Neutral" %} +
    + {% endif %} +     		+ + {{ timer.system }} {{ timer.planet_moon }} + + + {% if timer.structure == "POCO" %} +
    + POCO +
    + {% endif %} + {% if timer.structure == "I-HUB" %} +
    + I-HUB +
    + {% endif %} + {% if timer.structure == "TCU" %} +
    + TCU +
    + {% endif %} + {% if timer.structure == "POS[S]" %} +
    + POS [S] +
    + {% endif %} + {% if timer.structure == "POS[M]" %} +
    + POS [M] +
    + {% endif %} + {% if timer.structure == "POS[L]" %} +
    + POS [L] +
    + {% endif %} + {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %} +
    + Astrahus +
    + {% endif %} + {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %} +
    + Fortizar +
    + {% endif %} + {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %} +
    + Keepstar +
    + {% endif %} + {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %} +
    + Raitaru +
    + {% endif %} + {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %} +
    + Azbel +
    + {% endif %} + {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %} +
    + Sotiyo +
    + {% endif %} + {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %} +
    + Athanor +
    + {% endif %} + {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %} +
    + Tatara +
    + {% endif %} + {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %} +
    + Pharolux Cyno Beacon +
    + {% endif %} + {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %} +
    + Tenebrex Cyno Jammer +
    + {% endif %} + {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %} +
    + Ansiblex Jump Gate +
    + {% endif %} + {% if timer.structure == "Moon Mining Cycle" %} +
    + Moon Mining Cycle +
    + {% endif %} + {% if timer.structure == "Other" %} +
    + Other +
    + {% endif %} +     		{{ timer.eve_time | date:"Y-m-d H:i" }} +
    +
    +     		{{ timer.eve_character.character_name }} + + + + + + +
    +
    {% else %} -
    {% trans "No upcoming timers." %}
    +
    + {% trans "No upcoming timers." %} +
    {% endif %} +

    {% trans "Past Timers" %}

    {% if past_timers %} - - - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% for timer in past_timers %} - {% if timer.important == True %} - - {% else %} - - {% endif %} - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% endfor %} -
    {% trans "Details" %}{% trans "Objective" %}{% trans "System" %}{% trans "Structure" %}{% trans "Eve Time" %}{% trans "Local Time" %}{% trans "Creator" %}{% trans "Action" %}
    {{ timer.details }} - {% if timer.objective == "Hostile" %} -
    - {% trans "Hostile" %} -
    - {% endif %} - {% if timer.objective == "Friendly" %} -
    - {% trans "Friendly" %} -
    - {% endif %} - {% if timer.objective == "Neutral" %} -
    - {% trans "Neutral" %} -
    - {% endif %} -     		- {{ timer.system }} {{ timer.planet_moon }} - - {% if timer.structure == "POCO" %} -
    - POCO -
    - {% endif %} - {% if timer.structure == "I-HUB" %} -
    - I-HUB -
    - {% endif %} - {% if timer.structure == "TCU" %} -
    - TCU -
    - {% endif %} - {% if timer.structure == "POS[S]" %} -
    - POS [S] -
    - {% endif %} - {% if timer.structure == "POS[M]" %} -
    - POS [M] -
    - {% endif %} - {% if timer.structure == "POS[L]" %} -
    - POS [L] -
    - {% endif %} - {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %} -
    - Astrahus -
    - {% endif %} - {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %} -
    - Fortizar -
    - {% endif %} - {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %} -
    - Keepstar -
    - {% endif %} - {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %} -
    - Raitaru -
    - {% endif %} - {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %} -
    - Azbel -
    - {% endif %} - {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %} -
    - Sotiyo -
    - {% endif %} - {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %} -
    - Athanor -
    - {% endif %} - {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %} -
    - Tatara -
    - {% endif %} - {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %} -
    - Pharolux Cyno Beacon -
    - {% endif %} - {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %} -
    - Tenebrex Cyno Jammer -
    - {% endif %} - {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %} -
    - Ansiblex Jump Gate -
    - {% endif %} - {% if timer.structure == "Moon Mining Cycle" %} -
    - Moon Mining Cycle -
    - {% endif %} - {% if timer.structure == "Other" %} -
    - Other -
    - {% endif %} -     		{{ timer.eve_time | date:"Y-m-d H:i" }} -
    -
    -     		{{ timer.eve_character.character_name }} - - - - - - -
    +
    + + + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% for timer in past_timers %} + {% if timer.important == True %} + + {% else %} + + {% endif %} + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% endfor %} +
    {% trans "Details" %}{% trans "Objective" %}{% trans "System" %}{% trans "Structure" %}{% trans "Eve Time" %}{% trans "Local Time" %}{% trans "Creator" %}{% trans "Action" %}
    {{ timer.details }} + {% if timer.objective == "Hostile" %} +
    + {% trans "Hostile" %} +
    + {% endif %} + {% if timer.objective == "Friendly" %} +
    + {% trans "Friendly" %} +
    + {% endif %} + {% if timer.objective == "Neutral" %} +
    + {% trans "Neutral" %} +
    + {% endif %} +     		+ + {{ timer.system }} {{ timer.planet_moon }} + + + {% if timer.structure == "POCO" %} +
    + POCO +
    + {% endif %} + {% if timer.structure == "I-HUB" %} +
    + I-HUB +
    + {% endif %} + {% if timer.structure == "TCU" %} +
    + TCU +
    + {% endif %} + {% if timer.structure == "POS[S]" %} +
    + POS [S] +
    + {% endif %} + {% if timer.structure == "POS[M]" %} +
    + POS [M] +
    + {% endif %} + {% if timer.structure == "POS[L]" %} +
    + POS [L] +
    + {% endif %} + {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %} +
    + Astrahus +
    + {% endif %} + {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %} +
    + Fortizar +
    + {% endif %} + {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %} +
    + Keepstar +
    + {% endif %} + {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %} +
    + Raitaru +
    + {% endif %} + {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %} +
    + Azbel +
    + {% endif %} + {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %} +
    + Sotiyo +
    + {% endif %} + {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %} +
    + Athanor +
    + {% endif %} + {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %} +
    + Tatara +
    + {% endif %} + {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %} +
    + Pharolux Cyno Beacon +
    + {% endif %} + {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %} +
    + Tenebrex Cyno Jammer +
    + {% endif %} + {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %} +
    + Ansiblex Jump Gate +
    + {% endif %} + {% if timer.structure == "Moon Mining Cycle" %} +
    + Moon Mining Cycle +
    + {% endif %} + {% if timer.structure == "Other" %} +
    + Other +
    + {% endif %} +     		{{ timer.eve_time | date:"Y-m-d H:i" }} +
    +
    +     		{{ timer.eve_character.character_name }} + + + + + + +
    +
    {% else %} -
    {% trans "No past timers." %}
    +
    + {% trans "No past timers." %} +
    {% endif %}