diff --git a/allianceauth/timerboard/form.py b/allianceauth/timerboard/form.py index 3c9fa31c..8a485436 100755 --- a/allianceauth/timerboard/form.py +++ b/allianceauth/timerboard/form.py @@ -34,6 +34,7 @@ class TimerForm(forms.ModelForm): structure_choices = [('POCO', 'POCO'), ('I-HUB', 'I-HUB'), + ('TCU', 'TCU'), ('POS[S]', 'POS[S]'), ('POS[M]', 'POS[M]'), ('POS[L]', 'POS[L]'), @@ -45,8 +46,9 @@ class TimerForm(forms.ModelForm): ('Engineering Complex[XL]', 'Engineering Complex[XL]'), ('Refinery[M]', 'Refinery[M]'), ('Refinery[L]', 'Refinery[L]'), - ('Station', 'Station'), - ('TCU', 'TCU'), + ('Cyno Beacon','Cyno Beacon'), + ('Cyno Jammer','Cyno Jammer'), + ('Jump Gate','Jump Gate'), ('Moon Mining Cycle', 'Moon Mining Cycle'), (_('Other'), _('Other'))] objective_choices = [('Friendly', _('Friendly')), diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html index 20ef563a..52fdd954 100644 --- a/allianceauth/timerboard/templates/timerboard/view.html +++ b/allianceauth/timerboard/templates/timerboard/view.html @@ -64,14 +64,19 @@ href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} + {% ifequal timer.structure "POCO" %} +
+ POCO +
+ {% endifequal %} {% ifequal timer.structure "I-HUB" %}
I-HUB
{% endifequal %} - {% ifequal timer.structure "POCO" %} -
- POCO + {% ifequal timer.structure "TCU" %} +
+ TCU
{% endifequal %} {% ifequal timer.structure "POS[S]" %} @@ -119,16 +124,6 @@ Engineering Complex [XL]
{% endifequal %} - {% ifequal timer.structure "Station" %} -
- Station -
- {% endifequal %} - {% ifequal timer.structure "TCU" %} -
- TCU -
- {% endifequal %} {% ifequal timer.structure "Refinery[M]" %}
Refinery [M] @@ -139,6 +134,21 @@ Refinery [L]
{% endifequal %} + {% ifequal timer.structure "Cyno Beacon" %} +
+ Cyno Beacon +
+ {% endifequal %} + {% ifequal timer.structure "Cyno Jammer" %} +
+ Cyno Jammer +
+ {% endifequal %} + {% ifequal timer.structure "Jump Gate" %} +
+ Jump Gate +
+ {% endifequal %} {% ifequal timer.structure "Moon Mining Cycle" %}
Moon Mining Cycle @@ -213,91 +223,101 @@ {{ timer.system }} {{ timer.planet_moon }} - {% ifequal timer.structure "I-HUB" %} -
- I-HUB -
- {% endifequal %} - {% ifequal timer.structure "POCO" %} -
- POCO -
- {% endifequal %} - {% ifequal timer.structure "POS[S]" %} -
- POS [S] -
- {% endifequal %} - {% ifequal timer.structure "POS[M]" %} -
- POS [M] -
- {% endifequal %} - {% ifequal timer.structure "POS[L]" %} -
- POS [L] -
- {% endifequal %} - {% ifequal timer.structure "Citadel[M]" %} -
- Citadel [M] -
- {% endifequal %} - {% ifequal timer.structure "Citadel[L]" %} -
- Citadel [L] -
- {% endifequal %} - {% ifequal timer.structure "Citadel[XL]" %} -
- Citadel [XL] -
- {% endifequal %} - {% ifequal timer.structure "Engineering Complex[M]" %} -
- Engineering Complex [M] -
- {% endifequal %} - {% ifequal timer.structure "Engineering Complex[L]" %} -
- Engineering Complex [L] -
- {% endifequal %} - {% ifequal timer.structure "Engineering Complex[XL]" %} -
- Engineering Complex [XL] -
- {% endifequal %} - {% ifequal timer.structure "Station" %} -
- Station -
- {% endifequal %} - {% ifequal timer.structure "TCU" %} -
- TCU -
- {% endifequal %} - {% ifequal timer.structure "Refinery[M]" %} -
- Refinery [M] -
- {% endifequal %} - {% ifequal timer.structure "Refinery[L]" %} -
- Refinery [L] -
- {% endifequal %} - {% ifequal timer.structure "Moon Mining Cycle" %} -
- Moon Mining Cycle -
- {% endifequal %} - {% ifequal timer.structure "Other" %} -
- Other -
- {% endifequal %} + {% ifequal timer.structure "POCO" %} +
+ POCO +
+ {% endifequal %} + {% ifequal timer.structure "I-HUB" %} +
+ I-HUB +
+ {% endifequal %} + {% ifequal timer.structure "TCU" %} +
+ TCU +
+ {% endifequal %} + {% ifequal timer.structure "POS[S]" %} +
+ POS [S] +
+ {% endifequal %} + {% ifequal timer.structure "POS[M]" %} +
+ POS [M] +
+ {% endifequal %} + {% ifequal timer.structure "POS[L]" %} +
+ POS [L] +
+ {% endifequal %} + {% ifequal timer.structure "Citadel[M]" %} +
+ Citadel [M] +
+ {% endifequal %} + {% ifequal timer.structure "Citadel[L]" %} +
+ Citadel [L] +
+ {% endifequal %} + {% ifequal timer.structure "Citadel[XL]" %} +
+ Citadel [XL] +
+ {% endifequal %} + {% ifequal timer.structure "Engineering Complex[M]" %} +
+ Engineering Complex [M] +
+ {% endifequal %} + {% ifequal timer.structure "Engineering Complex[L]" %} +
+ Engineering Complex [L] +
+ {% endifequal %} + {% ifequal timer.structure "Engineering Complex[XL]" %} +
+ Engineering Complex [XL] +
+ {% endifequal %} + {% ifequal timer.structure "Refinery[M]" %} +
+ Refinery [M] +
+ {% endifequal %} + {% ifequal timer.structure "Refinery[L]" %} +
+ Refinery [L] +
+ {% endifequal %} + {% ifequal timer.structure "Cyno Beacon" %} +
+ Cyno Beacon +
+ {% endifequal %} + {% ifequal timer.structure "Cyno Jammer" %} +
+ Cyno Jammer +
+ {% endifequal %} + {% ifequal timer.structure "Jump Gate" %} +
+ Jump Gate +
+ {% endifequal %} + {% ifequal timer.structure "Moon Mining Cycle" %} +
+ Moon Mining Cycle +
+ {% endifequal %} + {% ifequal timer.structure "Other" %} +
+ Other +
+ {% endifequal %} {{ timer.eve_time | date:"Y-m-d H:i" }}