Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-15 23:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'timer-change' into 'master'

Browse Source 
Rename Citadels and FLEX Structures

See merge request allianceauth/allianceauth!1126
This commit is contained in:
Basraah 2019-03-12 10:06:53 +00:00
commit fe3fe0527a
2 changed files with 181 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
allianceauth/timerboard/form.py
View File

@ -38,17 +38,17 @@ class TimerForm(forms.ModelForm):
('POS[S]', 'POS[S]'), ('POS[S]', 'POS[S]'),
('POS[M]', 'POS[M]'), ('POS[M]', 'POS[M]'),
('POS[L]', 'POS[L]'), ('POS[L]', 'POS[L]'),
('Citadel[M]', 'Citadel[M]'), ('Astrahus', 'Astrahus'),
('Citadel[L]', 'Citadel[L]'), ('Fortizar', 'Fortizar'),
('Citadel[XL]', 'Citadel[XL]'), ('Keepstar', 'Keepstar'),
('Engineering Complex[M]', 'Engineering Complex[M]'), ('Raitaru', 'Raitaru'),
('Engineering Complex[L]', 'Engineering Complex[L]'), ('Azbel', 'Azbel'),
('Engineering Complex[XL]', 'Engineering Complex[XL]'), ('Sotiyo', 'Sotiyo'),
('Refinery[M]', 'Refinery[M]'), ('Athanor', 'Athanor'),
('Refinery[L]', 'Refinery[L]'), ('Tatara', 'Tatara'),
('Cyno Beacon','Cyno Beacon'), ('Pharolux Cyno Beacon', 'Pharolux Cyno Beacon'),
('Cyno Jammer','Cyno Jammer'), ('Tenebrex Cyno Jammer', 'Tenebrex Cyno Jammer'),
('Jump Gate','Jump Gate'), ('Ansiblex Jump Gate', 'Ansiblex Jump Gate'),
('Moon Mining Cycle', 'Moon Mining Cycle'), ('Moon Mining Cycle', 'Moon Mining Cycle'),
(_('Other'), _('Other'))] (_('Other'), _('Other'))]
objective_choices = [('Friendly', _('Friendly')), objective_choices = [('Friendly', _('Friendly')),

340
allianceauth/timerboard/templates/timerboard/view.html
View File

@ -37,128 +37,128 @@
{% endif %} {% endif %}
</tr> </tr>
{% for timer in corp_timers %} {% for timer in corp_timers %}
{% ifequal timer.important True %} {% if timer.important == True %}
<tr class="danger"> <tr class="danger">
{% else %} {% else %}
<tr class="info"> <tr class="info">
{% endifequal %} {% endif %}
<td style="width:150px" class="text-center">{{ timer.details }}</td> <td style="width:150px" class="text-center">{{ timer.details }}</td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.objective "Hostile" %} {% if timer.objective == "Hostile" %}
<div class="label label-danger"> <div class="label label-danger">
{% trans "Hostile" %} {% trans "Hostile" %}
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.objective "Friendly" %} {% if timer.objective == "Friendly" %}
<div class="label label-primary"> <div class="label label-primary">
{% trans "Friendly" %} {% trans "Friendly" %}
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.objective "Neutral" %} {% if timer.objective == "Neutral" %}
<div class="label label-default"> <div class="label label-default">
{% trans "Neutral" %} {% trans "Neutral" %}
</div> </div>
{% endifequal %} {% endif %}
</td> </td>
<td class="text-center"><a <td class="text-center"><a
href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a> href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
</td> </td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.structure "POCO" %} {% if timer.structure == "POCO" %}
<div class="label label-info"> <div class="label label-info">
POCO POCO
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "I-HUB" %} {% if timer.structure == "I-HUB" %}
<div class="label label-warning"> <div class="label label-warning">
I-HUB I-HUB
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "TCU" %} {% if timer.structure == "TCU" %}
<div class="label label-danger"> <div class="label label-danger">
TCU TCU
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[S]" %} {% if timer.structure == "POS[S]" %}
<div class="label label-info"> <div class="label label-info">
POS [S] POS [S]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[M]" %} {% if timer.structure == "POS[M]" %}
<div class="label label-info"> <div class="label label-info">
POS [M] POS [M]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[L]" %} {% if timer.structure == "POS[L]" %}
<div class="label label-info"> <div class="label label-info">
POS [L] POS [L]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[M]" %} {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [M] Astrahus
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[L]" %} {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [L] Fortizar
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[XL]" %} {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [XL] Keepstar
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[M]" %} {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [M] Raitaru
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[L]" %} {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [L] Azbel
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[XL]" %} {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [XL] Sotiyo
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Refinery[M]" %} {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
<div class="label label-warning"> <div class="label label-warning">
Refinery [M] Athanor
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Refinery[L]" %} {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara"%}
<div class="label label-warning"> <div class="label label-warning">
Refinery [L] Tatara
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Cyno Beacon" %} {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
<div class="label label-warning"> <div class="label label-warning">
Cyno Beacon Cyno Beacon
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Cyno Jammer" %} {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
<div class="label label-warning"> <div class="label label-warning">
Cyno Jammer Tenebrex Cyno Jammer
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Jump Gate" %} {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
<div class="label label-warning"> <div class="label label-warning">
Jump Gate Ansiblex Jump Gate
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Moon Mining Cycle" %} {% if timer.structure == "Moon Mining Cycle" %}
<div class="label label-success"> <div class="label label-success">
Moon Mining Cycle Moon Mining Cycle
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Other" %} {% if timer.structure == "Other" %}
<div class="label label-default"> <div class="label label-default">
Other Other
</div> </div>
{% endifequal %} {% endif %}
</td> </td>
<td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td> <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
<td class="text-center" nowrap> <td class="text-center" nowrap>
@ -196,128 +196,128 @@
{% endif %} {% endif %}
</tr> </tr>
{% for timer in future_timers %} {% for timer in future_timers %}
{% ifequal timer.important True %} {% if timer.important == True %}
<tr class="danger"> <tr class="danger">
{% else %} {% else %}
<tr class="info"> <tr class="info">
{% endifequal %} {% endif %}
<td style="width:150px" class="text-center">{{ timer.details }}</td> <td style="width:150px" class="text-center">{{ timer.details }}</td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.objective "Hostile" %} {% if timer.objective == "Hostile" %}
<div class="label label-danger"> <div class="label label-danger">
{% trans "Hostile" %} {% trans "Hostile" %}
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.objective "Friendly" %} {% if timer.objective == "Friendly" %}
<div class="label label-primary"> <div class="label label-primary">
{% trans "Friendly" %} {% trans "Friendly" %}
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.objective "Neutral" %} {% if timer.objective == "Neutral" %}
<div class="label label-default"> <div class="label label-default">
{% trans "Neutral" %} {% trans "Neutral" %}
</div> </div>
{% endifequal %} {% endif %}
</td> </td>
<td class="text-center"> <td class="text-center">
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a> <a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
</td> </td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.structure "POCO" %} {% if timer.structure == "POCO" %}
<div class="label label-info"> <div class="label label-info">
POCO POCO
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "I-HUB" %} {% if timer.structure == "I-HUB" %}
<div class="label label-warning"> <div class="label label-warning">
I-HUB I-HUB
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "TCU" %} {% if timer.structure == "TCU" %}
<div class="label label-danger"> <div class="label label-danger">
TCU TCU
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[S]" %} {% if timer.structure == "POS[S]" %}
<div class="label label-info"> <div class="label label-info">
POS [S] POS [S]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[M]" %} {% if timer.structure == "POS[M]" %}
<div class="label label-info"> <div class="label label-info">
POS [M] POS [M]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[L]" %} {% if timer.structure == "POS[L]" %}
<div class="label label-info"> <div class="label label-info">
POS [L] POS [L]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[M]" %} {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [M] Astrahus
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[L]" %} {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [L] Fortizar
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[XL]" %} {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [XL] Keepstar
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[M]" %} {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [M] Raitaru
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[L]" %} {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [L] Azbel
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[XL]" %} {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [XL] Sotiyo
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Refinery[M]" %} {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
<div class="label label-warning"> <div class="label label-warning">
Refinery [M] Athanor
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Refinery[L]" %} {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
<div class="label label-warning"> <div class="label label-warning">
Refinery [L] Tatara
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Cyno Beacon" %} {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
<div class="label label-warning"> <div class="label label-warning">
Cyno Beacon Pharolux Cyno Beacon
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Cyno Jammer" %} {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
<div class="label label-warning"> <div class="label label-warning">
Cyno Jammer Tenebrex Cyno Jammer
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Jump Gate" %} {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
<div class="label label-warning"> <div class="label label-warning">
Jump Gate Ansiblex Jump Gate
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Moon Mining Cycle" %} {% if timer.structure == "Moon Mining Cycle" %}
<div class="label label-success"> <div class="label label-success">
Moon Mining Cycle Moon Mining Cycle
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Other" %} {% if timer.structure == "Other" %}
<div class="label label-default"> <div class="label label-default">
Other Other
</div> </div>
{% endifequal %} {% endif %}
</td> </td>
<td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td> <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
<td class="text-center" nowrap> <td class="text-center" nowrap>
@ -357,128 +357,128 @@
{% endif %} {% endif %}
</tr> </tr>
{% for timer in past_timers %} {% for timer in past_timers %}
{% ifequal timer.important True %} {% if timer.important == True %}
<tr class="danger"> <tr class="danger">
{% else %} {% else %}
<tr class="info"> <tr class="info">
{% endifequal %} {% endif %}
<td style="width:150px" class="text-center">{{ timer.details }}</td> <td style="width:150px" class="text-center">{{ timer.details }}</td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.objective "Hostile" %} {% if timer.objective == "Hostile" %}
<div class="label label-danger"> <div class="label label-danger">
{% trans "Hostile" %} {% trans "Hostile" %}
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.objective "Friendly" %} {% if timer.objective == "Friendly" %}
<div class="label label-primary"> <div class="label label-primary">
{% trans "Friendly" %} {% trans "Friendly" %}
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.objective "Neutral" %} {% if timer.objective == "Neutral" %}
<div class="label label-default"> <div class="label label-default">
{% trans "Neutral" %} {% trans "Neutral" %}
</div> </div>
{% endifequal %} {% endif %}
</td> </td>
<td class="text-center"> <td class="text-center">
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a> <a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
</td> </td>
<td class="text-center"> <td class="text-center">
{% ifequal timer.structure "POCO" %} {% if timer.structure == "POCO" %}
<div class="label label-info"> <div class="label label-info">
POCO POCO
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "I-HUB" %} {% if timer.structure == "I-HUB" %}
<div class="label label-warning"> <div class="label label-warning">
I-HUB I-HUB
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "TCU" %} {% if timer.structure == "TCU" %}
<div class="label label-danger"> <div class="label label-danger">
TCU TCU
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[S]" %} {% if timer.structure == "POS[S]" %}
<div class="label label-info"> <div class="label label-info">
POS [S] POS [S]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[M]" %} {% if timer.structure == "POS[M]" %}
<div class="label label-info"> <div class="label label-info">
POS [M] POS [M]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "POS[L]" %} {% if timer.structure == "POS[L]" %}
<div class="label label-info"> <div class="label label-info">
POS [L] POS [L]
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[M]" %} {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [M] Astrahus
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[L]" %} {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [L] Fortizar
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Citadel[XL]" %} {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
<div class="label label-danger"> <div class="label label-danger">
Citadel [XL] Keepstar
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[M]" %} {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [M] Raitaru
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[L]" %} {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [L] Azbel
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Engineering Complex[XL]" %} {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
<div class="label label-warning"> <div class="label label-warning">
Engineering Complex [XL] Sotiyo
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Refinery[M]" %} {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
<div class="label label-warning"> <div class="label label-warning">
Refinery [M] Athanor
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Refinery[L]" %} {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
<div class="label label-warning"> <div class="label label-warning">
Refinery [L] Tatara
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Cyno Beacon" %} {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
<div class="label label-warning"> <div class="label label-warning">
Cyno Beacon Pharolux Cyno Beacon
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Cyno Jammer" %} {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
<div class="label label-warning"> <div class="label label-warning">
Cyno Jammer Tenebrex Cyno Jammer
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Jump Gate" %} {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
<div class="label label-warning"> <div class="label label-warning">
Jump Gate Ansiblex Jump Gate
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Moon Mining Cycle" %} {% if timer.structure == "Moon Mining Cycle" %}
<div class="label label-success"> <div class="label label-success">
Moon Mining Cycle Moon Mining Cycle
</div> </div>
{% endifequal %} {% endif %}
{% ifequal timer.structure "Other" %} {% if timer.structure == "Other" %}
<div class="label label-default"> <div class="label label-default">
Other Other
</div> </div>
{% endifequal %} {% endif %}
</td> </td>
<td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td> <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
<td class="text-center" nowrap> <td class="text-center" nowrap>