From 63a1fac94ac454818a58a90373670ffdf0b81265 Mon Sep 17 00:00:00 2001
From: agerbaud <agerbaud>
Date: Thu, 20 Jul 2017 17:33:34 +0200
Subject: [PATCH] Cleanud up unused navbar template tags, restored active state
 on navbar main links

---
 website/templates/base.html    |  4 +--
 website/templatetags/navbar.py | 48 +++-------------------------------
 2 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/website/templates/base.html b/website/templates/base.html
index c36a191..fd64de5 100644
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -30,11 +30,11 @@
           <div class="collapse navbar-collapse" id="navbar-collapse">
             <ul class="nav navbar-nav navbar-left">
               {% if user.is_authenticated %}
-              <li class="dropdown">
+              <li class="dropdown {% active namespace="maraudes" append=True %}">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% bootstrap_icon "road" %}&nbsp; Maraudes</span></a>
                 {% include "maraudes/menu.html" %}
               </li>
-              <li class="dropdown">
+              <li class="dropdown {% active namespace="notes" append=True %}">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% bootstrap_icon "pencil" %}&nbsp; Notes</span></a>
                 {% include "notes/menu.html" %}
               </li>
diff --git a/website/templatetags/navbar.py b/website/templatetags/navbar.py
index 2590d99..c089120 100644
--- a/website/templatetags/navbar.py
+++ b/website/templatetags/navbar.py
@@ -8,56 +8,16 @@ from django.utils.safestring import mark_safe
 register = template.Library()
 
 
-class NavbarNode(template.Node):
-
-    _apps = None
-
-    def get_menus(self, view, user):
-        if not self._apps:
-            from website.navbar import registered
-            if not registered:
-                print('WARNING: No app registered into "navbar" module')
-            self._apps = registered.copy()
-        return [app_menu(view, user) for app_menu in self._apps]
-
-    def get_template(self):
-        return template.loader.get_template('navbar/layout.html')
-
-    def render(self, context):
-        request = context.get('request')
-        user, view = context.get('user'), context.get('view')
-        apps = self.get_menus(view, user)
-        # Add user menu
-        context = template.Context({
-            'apps': apps,
-            'user': user,
-            'user_group': context.get('user_group', None),
-            'next': context.get('next', None),
-
-        })
-        return self.get_template().render(context, request)
-
-@register.tag
-def navbar(parser, token):
-    return NavbarNode()
-
-@register.inclusion_tag("navbar/app-menu.html")
-def navbar_menu(app_menu):
-    return {
-        'active': app_menu.is_active,
-        'header': app_menu.header,
-        'links': app_menu.links,
-    }
-
-
 @register.simple_tag(takes_context=True)
-def active(context, namespace=None, viewname=None):
+def active(context, namespace=None, viewname=None, append=False):
     try:
         (cur_namespace, cur_viewname) = context.request.resolver_match.view_name.split(":")
     except:
         (cur_namespace, cur_viewname) = (None, context.request.resolver_match.view_name)
 
+    string = "class=\"active\"" if not append else "active"
+
     if namespace == cur_namespace:
         if not viewname or viewname == cur_viewname:
-            return mark_safe("class=\"active\"")
+            return mark_safe(string)
     return ""