Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-10 17:16:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'notifications_refresh' into 'master'"

Browse Source 
This reverts merge request !1215
This commit is contained in:
Ariel Rin
2020-06-04 11:21:50 +00:00
parent 3a984e8a4d
commit ae3f5a0f62
6 changed files with 12 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
allianceauth/templates/allianceauth/base.html
View File

@@ -45,7 +45,6 @@
{% endif %}
{% include 'bundles/bootstrap-js.html' %}
{% block extra_javascript %}
<script src="{% static 'js/base.js' %}"></script>
{% endblock extra_javascript %}
<script>
{% block extra_script %}

9
allianceauth/templates/allianceauth/notifications_menu_item.html
View File

@@ -1,9 +0,0 @@
{% if notifications %}
<a href="{% url 'notifications:list' %}">Notifications
<span class="badge">{{ notifications }}</span>
</a>
{% else %}
<a href="{% url 'notifications:list' %}">
<i class="fa fa-bell-o"></i>
</a>
{% endif %}

20
allianceauth/templates/allianceauth/top-menu.html
View File

@@ -20,11 +20,17 @@
<li>
{% include 'allianceauth/night-toggle.html' %}
</li>
<li
class="{% navactive request 'notifications:' %}" id="menu_item_notifications"
>
{% include 'allianceauth/notifications_menu_item.html' %}
{% if notifications %}
<li class="{% navactive request 'notifications:' %}">
<a href="{% url 'notifications:list' %}">Notifications
<span class="badge">{{ notifications }}</span>
</a>
</li>
{% else %}
<li><a href="{% url 'notifications:list' %}">
<i class="fa fa-bell-o"></i></a>
</li>
{% endif %}
{% if user.is_authenticated %}
{% if user.is_staff %}
<li><a href="{% url 'admin:index' %}">{% trans "Admin" %}</a></li>
@@ -58,9 +64,3 @@
</div>
</div>
</nav>
<!-- share data with JS part -->
<div
id="dataExport"
data-notificationsRenderUrl="{% url 'authentication:notifications_render' %}"
>
</div>