diff --git a/allianceauth/timerboard/templates/timerboard/timertable.html b/allianceauth/timerboard/templates/timerboard/timertable.html new file mode 100644 index 00000000..a3dcce61 --- /dev/null +++ b/allianceauth/timerboard/templates/timerboard/timertable.html @@ -0,0 +1,202 @@ +{% load evelinks %} +{% load i18n %} + +
+ + + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + + {% for timer in timers %} + {% if timer.important == True %} + + {% else %} + + {% endif %} + + + + + + + + + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% endfor %} +
{% translate "Details" %}{% translate "Objective" %}{% translate "System" %}{% translate "Structure" %}{% translate "Eve Time" %}{% translate "Local Time" %}{% translate "Creator" %}{% translate "Action" %}
+ {{ timer.details }} + + {% if timer.timer_type != 'UNSPECIFIED' %} +
({{ timer.get_timer_type_display }}) + {% endif %} + 		+ {% if timer.objective == "Hostile" %} +
+ {% translate "Hostile" %} +
+ {% endif %} + + {% if timer.objective == "Friendly" %} +
+ {% translate "Friendly" %} +
+ {% endif %} + + {% if timer.objective == "Neutral" %} +
+ {% translate "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 }} + + + + + + + +
+
diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html index af6e9491..9028549c 100644 --- a/allianceauth/timerboard/templates/timerboard/view.html +++ b/allianceauth/timerboard/templates/timerboard/view.html @@ -1,362 +1,43 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} -{% get_current_language as LANGUAGE_CODE %} {% load evelinks %} -{% block page_title %}{% translate "Structure Timer Management" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} +{% get_current_language as LANGUAGE_CODE %} + +{% block page_title %} + {% translate "Structure Timer Management" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Structure Timers" %} +{% endblock header_nav_brand %} {% block content %} -
-

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

+
+
+ {% if perms.auth.timer_management %} + + {% translate "Create Structure Timer" %} + + {% endif %} +
+
- {% translate "Current Eve Time:" %} + {% translate "Current Eve Time:" %} +
-
+ {% if corp_timers %}

{% translate "Corp Timers" %}

-
- - - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% for timer in corp_timers %} - {% if timer.important == True %} - - {% else %} - - {% endif %} - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% endfor %} -
{% translate "Details" %}{% translate "Objective" %}{% translate "System" %}{% translate "Structure" %}{% translate "Eve Time" %}{% translate "Local Time" %}{% translate "Creator" %}{% translate "Action" %}
- {{ timer.details }} - {% if timer.timer_type != 'UNSPECIFIED' %} -
({{ timer.get_timer_type_display }}) - {% endif %} - 		- {% if timer.objective == "Hostile" %} -
- {% translate "Hostile" %} -
- {% endif %} - {% if timer.objective == "Friendly" %} -
- {% translate "Friendly" %} -
- {% endif %} - {% if timer.objective == "Neutral" %} -
- {% translate "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 }} - - - - - - -
-
+ {% include "timerboard/timertable.html" with timers=corp_timers %} {% endif %} +

{% translate "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 %} -
{% translate "Details" %}{% translate "Objective" %}{% translate "System" %}{% translate "Structure" %}{% translate "Eve Time" %}{% translate "Local Time" %}{% translate "Creator" %}{% translate "Action" %}
- {{ timer.details }} - {% if timer.timer_type != 'UNSPECIFIED' %} -
({{ timer.get_timer_type_display }}) - {% endif %} - 		- {% if timer.objective == "Hostile" %} -
- {% translate "Hostile" %} -
- {% endif %} - {% if timer.objective == "Friendly" %} -
- {% translate "Friendly" %} -
- {% endif %} - {% if timer.objective == "Neutral" %} -
- {% translate "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 }} - - - - - - -
-
+ {% include "timerboard/timertable.html" with timers=future_timers %} {% else %}
{% translate "No upcoming timers." %} @@ -365,182 +46,21 @@

{% translate "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 %} -
{% translate "Details" %}{% translate "Objective" %}{% translate "System" %}{% translate "Structure" %}{% translate "Eve Time" %}{% translate "Local Time" %}{% translate "Creator" %}{% translate "Action" %}
- {{ timer.details }} - {% if timer.timer_type != 'UNSPECIFIED' %} -
({{ timer.get_timer_type_display }}) - {% endif %} - 		- {% if timer.objective == "Hostile" %} -
- {% translate "Hostile" %} -
- {% endif %} - {% if timer.objective == "Friendly" %} -
- {% translate "Friendly" %} -
- {% endif %} - {% if timer.objective == "Neutral" %} -
- {% translate "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 }} - - - - - - -
-
+ {% include "timerboard/timertable.html" with timers=past_timers %} {% else %}
{% translate "No past timers." %}
{% endif %}
+{% endblock content %} +{% block extra_javascript %} {% include "bundles/moment-js.html" with locale=True %} {% include "bundles/timers-js.html" %} + -{% endblock content %} +{% endblock extra_javascript %}