Merge branch 'feature_menu_item_badges' into 'master'

Add menu item badge feature and update group icons

See merge request allianceauth/allianceauth!1240
This commit is contained in:
Ariel Rin
2020-09-11 11:33:14 +00:00
19 changed files with 434 additions and 116 deletions

View File

@@ -1,7 +1,6 @@
{% load i18n %}
{% load navactive %}
{% load menu_items %}
{% load groupmanagement %}
<div class="col-sm-2 auth-side-navbar" role="navigation">
<div class="collapse navbar-collapse auth-menus-collapse auth-side-navbar-collapse">
@@ -14,18 +13,9 @@
</li>
<li>
<a class="{% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
<i class="fas fa-sitemap fa-fw"></i> {% trans "Groups" %}
<i class="fas fa-users fa-fw"></i> {% trans "Groups" %}
</a>
</li>
{% if request.user|can_manage_groups %}
<li>
<a class="{% navactive request 'groupmanagement:management groupmanagement:membership groupmanagement:membership_list' %}"
href="{% url 'groupmanagement:management' %}">
<i class="fas fa-sitemap fa-fw"></i> {% trans "Group Management" %}
</a>
</li>
{% endif %}
</li>
{% menu_items %}