Merge branch 'esi' of https://github.com/r4stl1n/allianceauth into multitenant

This commit is contained in:
Adarnof
2016-12-20 06:54:40 +00:00
39 changed files with 1357 additions and 1295 deletions

View File

@@ -12,7 +12,7 @@
<meta name="description" content="">
<meta name="author" content="">
<title>{% block title %}Empty title{% endblock title %}</title>
<title>{% block title %}Alliance Auth{% endblock title %}</title>
<!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
@@ -153,9 +153,9 @@
</li>
{% endif %}
{% if perms.auth.corp_apis or perms.auth.alliance_apis %}
{% if perms.corputils.view_corp_corpstats or perms.corputils.view_alliance_corpstats or perms.corputils.view_blue_corpstats %}
<li>
<a class="{% navactive request 'auth_corputils auth_corputils_search auth_corputils_corp_view auth_corputils_month' %}" href="{% url 'auth_corputils' %}">
<a class="{% navactive request 'corputils:view corputils:search' %}" href="{% url 'corputils:view' %}">
<i class="fa fa-share-alt fa-fw grayiconecolor"></i>{% trans " Corporation Stats" %}
</a>
</li>