Skip to content

Commit 2229fbc

Browse files
authored
Mark navbar link to current page as active (#317)
* Mark navbar link to current page as active * Fix link
1 parent 873a048 commit 2229fbc

3 files changed

Lines changed: 27 additions & 9 deletions

File tree

democrasite/templates/base.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@
114114
<hr class="d-block d-md-none" />
115115
<ul class="navbar-nav">
116116
<li class="nav-item">
117-
<a href="{% url 'social:note-list' %}" class="nav-link">{% trans 'ActivityPub' %}</a>
117+
<a href="{% url 'social:note-list' %}"
118+
class="nav-link
119+
{% if request.resolver_match.app_name == 'activitypub' %}active{% endif %}">{% trans 'ActivityPub' %}</a>
118120
</li>
119121
{% if debug %}
120122
<li class="nav-item">

democrasite/templates/social/base.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,23 @@
1010

1111
{% block nav_user_pages %}
1212
<li class="nav-item">
13-
<a class="nav-link" href="{% url 'social:note-list' %}">Notes</a>
13+
{% url 'social:note-list' as url_notes %}
14+
<a href="{{ url_notes }}"
15+
class="nav-link
16+
{% if request.path == url_notes %}active{% endif %}">Notes</a>
1417
</li>
1518
{% if user.person %}
1619
<li class="nav-item">
17-
<a class="nav-link" href="{% url 'social:following-notes' %}">Following</a>
20+
{% url 'social:following-notes' as url_following %}
21+
<a href="{{ url_following }}"
22+
class="nav-link
23+
{% if request.path == url_following %}active{% endif %}">Following</a>
1824
</li>
1925
<li class="nav-item">
20-
<a class="nav-link"
21-
href="{% url 'social:person-detail' username=user.username %}">Profile</a>
26+
{% url 'social:person-detail' username=user.username as url_profile %}
27+
<a href="{{ url_profile }}"
28+
class="nav-link
29+
{% if request.path == url_profile %}active{% endif %}">Profile</a>
2230
</li>
2331
{% else %}
2432
<form class="form-inline"

democrasite/templates/webiscite/base.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,27 @@
55
{% block nav_user_pages %}
66
<li class="nav-item">
77
{# URL provided by django-allauth/account/urls.py #}
8-
<a class="nav-link"
9-
href="{% url 'users:detail' request.user.username %}">{% trans 'Profile' %}</a>
8+
{% url 'users:detail' request.user.username as url_profile %}
9+
<a href="{{ url_profile }}"
10+
class="nav-link
11+
{% if request.path == url_profile %}active{% endif %}">{% trans 'Profile' %}</a>
1012
</li>
1113
{# lazy way to check if user is logged in with github #}
1214
{% for provider in socialaccount_providers %}
1315
{% if provider.id == 'github' %}
1416
<li class="nav-item">
15-
<a href="{% url 'webiscite:my-bills' %}" class="nav-link">{% trans 'Proposals' %}</a>
17+
{% url 'webiscite:my-bills' as url_proposals %}
18+
<a href="{{ url_proposals }}"
19+
class="nav-link
20+
{% if request.path == url_proposals %}active{% endif %}">{% trans 'Proposals' %}</a>
1621
</li>
1722
{% endif %}
1823
{% endfor %}
1924
<li class="nav-item">
20-
<a href="{% url 'webiscite:my-bill-votes' %}" class="nav-link">{% trans 'Votes Cast' %}</a>
25+
{% url 'webiscite:my-bill-votes' as url_my_votes %}
26+
<a href="{{ url_my_votes }}"
27+
class="nav-link
28+
{% if request.path == url_my_votes %}active{% endif %}">{% trans 'Votes Cast' %}</a>
2129
</li>
2230
{% endblock nav_user_pages %}
2331

0 commit comments

Comments
 (0)