Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion democrasite/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@
<hr class="d-block d-md-none" />
<ul class="navbar-nav">
<li class="nav-item">
<a href="{% url 'social:note-list' %}" class="nav-link">{% trans 'ActivityPub' %}</a>
<a href="{% url 'social:note-list' %}"
class="nav-link
{% if request.resolver_match.app_name == 'activitypub' %}active{% endif %}">{% trans 'ActivityPub' %}</a>
</li>
{% if debug %}
<li class="nav-item">
Expand Down
16 changes: 12 additions & 4 deletions democrasite/templates/social/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,23 @@

{% block nav_user_pages %}
<li class="nav-item">
<a class="nav-link" href="{% url 'social:note-list' %}">Notes</a>
{% url 'social:note-list' as url_notes %}
<a href="{{ url_notes }}"
class="nav-link
{% if request.path == url_notes %}active{% endif %}">Notes</a>
</li>
{% if user.person %}
<li class="nav-item">
<a class="nav-link" href="{% url 'social:following-notes' %}">Following</a>
{% url 'social:following-notes' as url_following %}
<a href="{{ url_following }}"
class="nav-link
{% if request.path == url_following %}active{% endif %}">Following</a>
</li>
<li class="nav-item">
<a class="nav-link"
href="{% url 'social:person-detail' username=user.username %}">Profile</a>
{% url 'social:person-detail' username=user.username as url_profile %}
<a href="{{ url_profile }}"
class="nav-link
{% if request.path == url_profile %}active{% endif %}">Profile</a>
</li>
{% else %}
<form class="form-inline"
Expand Down
16 changes: 12 additions & 4 deletions democrasite/templates/webiscite/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,27 @@
{% block nav_user_pages %}
<li class="nav-item">
{# URL provided by django-allauth/account/urls.py #}
<a class="nav-link"
href="{% url 'users:detail' request.user.username %}">{% trans 'Profile' %}</a>
{% url 'users:detail' request.user.username as url_profile %}
<a href="{{ url_profile }}"
class="nav-link
{% if request.path == url_profile %}active{% endif %}">{% trans 'Profile' %}</a>
</li>
{# lazy way to check if user is logged in with github #}
{% for provider in socialaccount_providers %}
{% if provider.id == 'github' %}
<li class="nav-item">
<a href="{% url 'webiscite:my-bills' %}" class="nav-link">{% trans 'Proposals' %}</a>
{% url 'webiscite:my-bills' as url_proposals %}
<a href="{{ url_proposals }}"
class="nav-link
{% if request.path == url_proposals %}active{% endif %}">{% trans 'Proposals' %}</a>
</li>
{% endif %}
{% endfor %}
<li class="nav-item">
<a href="{% url 'webiscite:my-bill-votes' %}" class="nav-link">{% trans 'Votes Cast' %}</a>
{% url 'webiscite:my-bill-votes' as url_my_votes %}
<a href="{{ url_my_votes }}"
class="nav-link
{% if request.path == url_my_votes %}active{% endif %}">{% trans 'Votes Cast' %}</a>
</li>
{% endblock nav_user_pages %}

Expand Down
Loading