Switched to use navactive for menu highlighting

This commit is contained in:
Basraah 2016-12-05 14:35:08 +10:00
parent ed461d9e7a
commit 5fb64d8c06
4 changed files with 6 additions and 5 deletions

View File

@ -9,7 +9,7 @@
{% block content %} {% block content %}
<div class="col-lg-12"> <div class="col-lg-12">
{% include 'registered/groupmanagementmenu.html' with page="auth_group_management" %} {% include 'registered/groupmanagementmenu.html' %}
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#add">{% trans "Group Add Requests" %}</a></li> <li class="active"><a data-toggle="tab" href="#add">{% trans "Group Add Requests" %}</a></li>
<li><a data-toggle="tab" href="#leave">{% trans "Group Leave Requests" %}</a></li> <li><a data-toggle="tab" href="#leave">{% trans "Group Leave Requests" %}</a></li>

View File

@ -1,5 +1,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load i18n %} {% load i18n %}
{% load navactive %}
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container-fluid"> <div class="container-fluid">
@ -14,10 +15,10 @@
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li {% if page == 'auth_group_management' %}class="active"{% endif %}> <li class="{% navactive request 'auth_group_management' %}">
<a href="{% url 'auth_group_management' %}">{% trans "Group Requests" %}</a> <a href="{% url 'auth_group_management' %}">{% trans "Group Requests" %}</a>
</li> </li>
<li {% if page == 'auth_group_membership' %}class="active"{% endif %}> <li class="{% navactive request 'auth_group_membership auth_group_membership_list' %}">
<a href="{% url 'auth_group_membership' %}">{% trans "Group Membership" %}</a> <a href="{% url 'auth_group_membership' %}">{% trans "Group Membership" %}</a>
</li> </li>
</ul> </ul>

View File

@ -9,7 +9,7 @@
{% block content %} {% block content %}
<div class="col-lg-12"> <div class="col-lg-12">
{% include 'registered/groupmanagementmenu.html' with page="auth_group_membership" %} {% include 'registered/groupmanagementmenu.html' %}
<h3>{{ group.name }} {% trans 'Members' %}</h3> <h3>{{ group.name }} {% trans 'Members' %}</h3>
<div id="list" class=""> <div id="list" class="">
{% if group.user_set %} {% if group.user_set %}

View File

@ -9,7 +9,7 @@
{% block content %} {% block content %}
<div class="col-lg-12"> <div class="col-lg-12">
{% include 'registered/groupmanagementmenu.html' with page="auth_group_membership" %} {% include 'registered/groupmanagementmenu.html' %}
<div> <div>
{% if groups %} {% if groups %}
<h3>Groups</h3> <h3>Groups</h3>