diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html
index 7c7c842..22d874a 100644
--- a/brutaldon/templates/base.html
+++ b/brutaldon/templates/base.html
@@ -1,4 +1,5 @@
{% load static %}
+{% load taglinks %}
@@ -7,30 +8,31 @@
{% block title %}
- {% if own_acct %}
- brutaldon ('{{ own_acct.username }}')
- {% else %}
- brutaldon
- {% endif %}
+ {% if own_acct %}
+ brutaldon ('{{ own_acct.username }}')
+ {% else %}
+ brutaldon
+ {% endif %}
{% endblock %}
-
- {% if not preferences %}
-
-
-
- {% else %}
-
-
- {% if not preferences.theme.is_brutalist %}
-
-
-
+
+ {% if not preferences %}
+
+
+
+ {% else %}
+
+
+ {% if not preferences.theme.is_brutalist %}
+
+
+
+
@@ -101,13 +103,18 @@
ic-indicator="#page-load-indicator">
{% if not preferences.theme.is_brutalist %}
-
- Notifications
-
+
+ Notifications
+
{% elif notifications %}
Notifications ({{ notifications }})
{% else %}
diff --git a/brutaldon/templates/intercooler/notes.html b/brutaldon/templates/intercooler/notes.html
index 1506e5e..8d88fdd 100644
--- a/brutaldon/templates/intercooler/notes.html
+++ b/brutaldon/templates/intercooler/notes.html
@@ -1,7 +1,7 @@
-
- Notifications
+
+ Notifications
diff --git a/brutaldon/views.py b/brutaldon/views.py
index 1eefea9..136184f 100644
--- a/brutaldon/views.py
+++ b/brutaldon/views.py
@@ -108,6 +108,8 @@ def timeline(request, timeline='home', timeline_name='Home', max_id=None, since_
except (IndexError, AttributeError):
next = None
+ notifications = _notes_count(request)
+
# This filtering has to be done *after* getting next/prev links
if account.preferences.filter_replies:
data = [x for x in data if not x.in_reply_to_id]
@@ -118,6 +120,7 @@ def timeline(request, timeline='home', timeline_name='Home', max_id=None, since_
'timeline_name': timeline_name,
'own_acct': request.session['user'],
'preferences': account.preferences,
+ 'notifications': notifications,
'prev': prev, 'next': next})
@br_login_required