Fix optimer, timerboard and corpstats

This commit is contained in:
ErikKalkoken 2020-02-15 23:26:22 +01:00
parent 55a5070691
commit 8771477884
3 changed files with 538 additions and 517 deletions

View File

@ -7,11 +7,12 @@
<div class="col-lg-12 text-center">
<table class="table">
<tr>
<td class="text-center col-lg-6
{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}"><img
class="ra-avatar" src="{{ corpstats.corp.logo_url_128 }}"></td>
<td class="text-center col-lg-6{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}">
<img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}">
</td>
{% if corpstats.corp.alliance %}
<td class="text-center col-lg-6"><img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_128 }}">
<td class="text-center col-lg-6">
<img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}">
</td>
{% endif %}
</tr>
@ -33,8 +34,8 @@
<li><a href="#members" data-toggle="pill">{% trans 'Members' %} ({{ corpstats.member_count }})</a></li>
<li><a href="#unregistered" data-toggle="pill">{% trans 'Unregistered' %} ({{ unregistered.count }})</a></li>
</ul>
<div class="pull-right">
{% trans "Last update:" %} {{ corpstats.last_update|naturaltime }}
<div class="pull-right hidden-xs">
{% trans "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
<a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
<span class="glyphicon glyphicon-refresh"></span>
</a>

View File

@ -2,6 +2,7 @@
{% load evelinks %}
{% block content %}
<div class="table-responsive">
<table class="table">
<thead>
<tr>
@ -42,4 +43,5 @@
</tbody>
{% endfor %}
</table>
</div>
{% endblock content %}

View File

@ -12,7 +12,9 @@
<h1 class="page-header text-center">{% trans "Structure Timers" %}
<div class="text-right">
{% if perms.auth.timer_management %}
<a href="{% url 'timerboard:add' %}" class="btn btn-success">{% trans "Create Structure Timer" %}</a>
<a href="{% url 'timerboard:add' %}" class="btn btn-success">
{% trans "Create Structure Timer" %}
</a>
{% endif %}
</div>
</h1>
@ -24,6 +26,7 @@
</div>
{% if corp_timers %}
<h4><b>{% trans "Corp Timers" %}</b></h4>
<div class="table-responsive">
<table class="table">
<tr>
<th style="width:150px" class="text-center">{% trans "Details" %}</th>
@ -61,8 +64,9 @@
</div>
{% endif %}
</td>
<td class="text-center"><a
href="{{ timer.system|dotlan_solar_system_url }}">{{ timer.system }} {{ timer.planet_moon }} </a>
<td class="text-center"><a href="{{ timer.system|dotlan_solar_system_url }}">
{{ timer.system }} {{ timer.planet_moon }}
</a>
</td>
<td class="text-center">
{% if timer.structure == "POCO" %}
@ -180,9 +184,11 @@
</tr>
{% endfor %}
</table>
</div>
{% endif %}
<h4><b>{% trans "Next Timers" %}</b></h4>
{% if future_timers %}
<div class="table-responsive">
<table class="table">
<tr>
<th style="width:150px" class="text-center">{% trans "Details" %}</th>
@ -221,7 +227,9 @@
{% endif %}
</td>
<td class="text-center">
<a href="{{ timer.system|dotlan_solar_system_url }}">{{ timer.system }} {{ timer.planet_moon }}</a>
<a href="{{ timer.system|dotlan_solar_system_url }}">
{{ timer.system }} {{ timer.planet_moon }}
</a>
</td>
<td class="text-center">
{% if timer.structure == "POCO" %}
@ -339,11 +347,16 @@
</tr>
{% endfor %}
</table>
</div>
{% else %}
<div class="alert alert-warning text-center">{% trans "No upcoming timers." %}</div>
<div class="alert alert-warning text-center">
{% trans "No upcoming timers." %}
</div>
{% endif %}
<h4><b>{% trans "Past Timers" %}</b></h4>
{% if past_timers %}
<div class="table-responsive">
<table class="table">
<tr>
<th style="width:150px" class="text-center">{% trans "Details" %}</th>
@ -382,7 +395,9 @@
{% endif %}
</td>
<td class="text-center">
<a href="{{ timer.system|dotlan_solar_system_url }}">{{ timer.system }} {{ timer.planet_moon }}</a>
<a href="{{ timer.system|dotlan_solar_system_url }}">
{{ timer.system }} {{ timer.planet_moon }}
</a>
</td>
<td class="text-center">
{% if timer.structure == "POCO" %}
@ -500,8 +515,11 @@
</tr>
{% endfor %}
</table>
</div>
{% else %}
<div class="alert alert-warning text-center">{% trans "No past timers." %}</div>
<div class="alert alert-warning text-center">
{% trans "No past timers." %}
</div>
{% endif %}
</div>