From 5fb64d8c068589c3b0caac08069214d48ad79455 Mon Sep 17 00:00:00 2001
From: Basraah <basraaheve@gmail.com>
Date: Mon, 5 Dec 2016 14:35:08 +1000
Subject: [PATCH] Switched to use navactive for menu highlighting

---
 stock/templates/registered/groupmanagement.html     | 2 +-
 stock/templates/registered/groupmanagementmenu.html | 5 +++--
 stock/templates/registered/groupmembers.html        | 2 +-
 stock/templates/registered/groupmembership.html     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/stock/templates/registered/groupmanagement.html b/stock/templates/registered/groupmanagement.html
index 7eeec15f..767d7e75 100644
--- a/stock/templates/registered/groupmanagement.html
+++ b/stock/templates/registered/groupmanagement.html
@@ -9,7 +9,7 @@
 
 {% block content %}
     <div class="col-lg-12">
-        {% include 'registered/groupmanagementmenu.html' with page="auth_group_management"  %}
+        {% include 'registered/groupmanagementmenu.html' %}
         <ul class="nav nav-tabs">
             <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>
diff --git a/stock/templates/registered/groupmanagementmenu.html b/stock/templates/registered/groupmanagementmenu.html
index d0823779..2423f3e0 100644
--- a/stock/templates/registered/groupmanagementmenu.html
+++ b/stock/templates/registered/groupmanagementmenu.html
@@ -1,5 +1,6 @@
 {% load staticfiles %}
 {% load i18n %}
+{% load navactive %}
 
 <nav class="navbar navbar-default">
 <div class="container-fluid">
@@ -14,10 +15,10 @@
     </div>
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <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>
             </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>
             </li>
         </ul>
diff --git a/stock/templates/registered/groupmembers.html b/stock/templates/registered/groupmembers.html
index b83e3b12..586b49a2 100644
--- a/stock/templates/registered/groupmembers.html
+++ b/stock/templates/registered/groupmembers.html
@@ -9,7 +9,7 @@
 
 {% block content %}
     <div class="col-lg-12">
-        {% include 'registered/groupmanagementmenu.html' with page="auth_group_membership"  %}
+        {% include 'registered/groupmanagementmenu.html' %}
         <h3>{{ group.name }} {% trans 'Members' %}</h3>
         <div id="list" class="">
             {% if group.user_set %}
diff --git a/stock/templates/registered/groupmembership.html b/stock/templates/registered/groupmembership.html
index 173b152e..66c7c7a7 100644
--- a/stock/templates/registered/groupmembership.html
+++ b/stock/templates/registered/groupmembership.html
@@ -9,7 +9,7 @@
 
 {% block content %}
     <div class="col-lg-12">
-        {% include 'registered/groupmanagementmenu.html' with page="auth_group_membership"  %}
+        {% include 'registered/groupmanagementmenu.html' %}
         <div>
             {% if groups %}
             <h3>Groups</h3>