Add context to navigation items

src/admin/navigation_items.py

@@ -4,7 +4,7 @@
 
 
 @register_navigation_item(key="admin")
-def admin_navigation_item(request):
+def admin_navigation_item(request, context):
     """Link to admin category."""
-    return render_to_string("admin/navigation_items/admin.html",
+    return render_to_string("admin/navigation_items/admin.html", context,
                             request=request)

src/events/navigation_items.py

@@ -4,7 +4,7 @@
 
 
 @register_navigation_item(key="events")
-def events_navigation_item(request):
+def events_navigation_item(request, context):
     """Link to events category."""
-    return render_to_string("events/navigation_items/events.html",
+    return render_to_string("events/navigation_items/events.html", context,
                             request=request)

src/happening/context_processors.py

@@ -1,17 +1,7 @@
 """General context processors."""
 from django.contrib.sites.models import Site
-from happening.plugins import render_navigation_items
 
 
 def site(request):
     """Return happening site."""
     return {"happening_site": Site.objects.first().happening_site}
-
-
-def navigation_items(request):
-    """Return navigation items."""
-    if not hasattr(request, "_rendered_navigation_items"):
-        # This is so that it doesn't recursively render
-        request._rendered_navigation_items = True
-        request._rendered_navigation_items = render_navigation_items(request)
-    return {"navigation_items": request._rendered_navigation_items}

src/happening/plugins.py

@@ -131,21 +131,22 @@ def register_navigation_item_inner(func):
     return register_navigation_item_inner
 
 
-def render_navigation_item(item, request):
+def render_navigation_item(item, request, context={}):
     """Turn a navigation item string into HTML."""
     item_name = item.rsplit(".", 1)[1]
     plugin = item.rsplit(".", 1)[0]
     if plugin_enabled(plugin) and item_name in registered_navigation_items.get(
             plugin, {}):
-        return registered_navigation_items[plugin][item_name](request)
+        return registered_navigation_items[plugin][item_name](request, context)
     return ""
 
 
-def render_navigation_items(request):
+def render_navigation_items(context):
     """Render navigation items into a string."""
     items = ["events.events", "members.members", "notifications.notifications",
              "staff.staff", "admin.admin", "pages.sign_in"]
-    return "".join([render_navigation_item(item, request) for item in items])
+    return "".join([render_navigation_item(item, context["request"], context)
+                   for item in items])
 
 
 registered_middlewares = {}

src/happening/settings.py

@@ -57,7 +57,6 @@
                 'events.context_processors.events',
                 'pages.context_processors.pages',
                 'happening.context_processors.site',
-                'happening.context_processors.navigation_items',
             ]
         }
     }

src/happening/templatetags/plugins.py

@@ -8,6 +8,13 @@
 register = template.Library()
 
 
+@register.simple_tag(takes_context=True)
+def navigation_items(context, *params):
+    """Render navigation items."""
+    from happening import plugins
+    return mark_safe(plugins.render_navigation_items(context.flatten()))
+
+
 @register.simple_tag(takes_context=True)
 def plugin_block(context, key, *params):
     """Make a space for plugins to place content in a template."""

src/members/navigation_items.py

@@ -4,7 +4,7 @@
 
 
 @register_navigation_item(key="members")
-def members_navigation_item(request):
+def members_navigation_item(request, context):
     """Link to members category."""
-    return render_to_string("members/navigation_items/members.html",
+    return render_to_string("members/navigation_items/members.html", context,
                             request=request)

src/notifications/navigation_items.py

@@ -4,8 +4,8 @@
 
 
 @register_navigation_item(key="notifications")
-def notifications_navigation_item(request):
+def notifications_navigation_item(request, context):
     """Link to notifications category."""
     return render_to_string(
-        "notifications/navigation_items/notifications.html",
+        "notifications/navigation_items/notifications.html", context,
         request=request)

src/pages/navigation_items.py

@@ -4,7 +4,7 @@
 
 
 @register_navigation_item(key="sign_in")
-def sign_in_navigation_item(request):
+def sign_in_navigation_item(request, context):
     """Link to sign in/sign out."""
-    return render_to_string("pages/navigation_items/sign_in.html",
+    return render_to_string("pages/navigation_items/sign_in.html", context,
                             request=request)

src/staff/navigation_items.py

@@ -5,7 +5,7 @@
 
 
 @register_navigation_item(key="staff")
-def staff_navigation_item(request):
+def staff_navigation_item(request, context):
     """Link to staff category."""
-    return render_to_string("staff/navigation_items/staff.html",
+    return render_to_string("staff/navigation_items/staff.html", context,
                             request=request)

src/templates/base.html

@@ -38,7 +38,7 @@ <h2 class="main-header__heading main-header__padded">
 
             <div class="main-header__menu menu">
                 <ul class="menu__list inline-list">
-                    {{navigation_items|safe}}
+                    {% navigation_items %}
                 </ul>
             </div>
         </div>