Merged changes in master.

This commit is contained in:
Ydmir
2016-01-24 00:27:03 +01:00
23 changed files with 889 additions and 382 deletions

View File

@@ -144,11 +144,27 @@
href="{% url 'auth_fleet_fits' %}"><i
class="fa fa-bolt fa-fw grayiconecolor"></i> Fleet Doctrines</a>
</li>
{% endif %}
{% if perms.auth.member or perms.auth.blue_member %}
<li>
<a {% ifequal request.path "/sigtracker" %} class="active" {% endifequal %}
href="{% url 'auth_signature_view' %}"><i
class="fa fa-compass fa-fw grayiconecolor"></i> Signature Tracker</a>
</li>
<li>
<a {% ifequal request.path "/optimer" %} class="active" {% endifequal %}
href="{% url 'auth_optimer_view' %}"><i
class="fa fa-exclamation fa-fw grayiconecolor"></i> Fleet Operations</a>
</li>
{% if perms.auth.timer_view %}
<li>
<a {% ifequal request.path "/timer_management" %} class="active" {% endifequal %}
href="{% url 'auth_timer_view' %}"><i
class="fa fa-clock-o fa-fw grayiconecolor"></i> OP Timers</a>
class="fa fa-clock-o fa-fw grayiconecolor"></i> Structure Timers</a>
</li>
{% endif %}