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/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/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 %}