Prepare for feincms3 updates

matthiask · matthiask · commit 999b0e92cc0d · 2017-04-05T11:41:04.000+02:00
diff --git a/app/templates/base.html b/app/templates/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% load i18n feincms3_pages %}
+{% load i18n menus %}
 <html lang="{{ request.LANGUAGE_CODE }}">
 <head>
   <title>{% block title %}feincms3{% endblock %}</title>
@@ -90,11 +90,10 @@ <h1><a href="/{{ request.LANGUAGE_CODE }}/">feincms3</a></h1>
     </nav>
   </header>
 
-  {% menu "main" level=1 language_code=page.language_code as nav %}
+  {% menus as menus %}
   <nav class="nav main-nav">
-    {% for p in nav %}
-    {% is_descendant_of page p include_self=True as active %}
-    <a {% if active %}class="active"{% endif %}
+    {% for p in menus.main %}
+    <a {% if p.id in page.cte_path %}class="active"{% endif %}
       href="{{ p.get_absolute_url }}">{{ p }}</a>
     {% endfor %}
   </nav>
@@ -103,11 +102,9 @@ <h1><a href="/{{ request.LANGUAGE_CODE }}/">feincms3</a></h1>
     {% block content %}{% endblock %}
   </div>
 
-  {% menu "footer" level=1 language_code=page.language_code as nav %}
   <nav class="nav footer-nav">
-    {% for p in nav %}
-    {% is_descendant_of page p include_self=True as active %}
-    <a {% if active %}class="active"{% endif %}
+    {% for p in menus.footer %}
+    <a {% if p.id in page.cte_path %}class="active"{% endif %}
       href="{{ p.get_absolute_url }}">{{ p }}</a>
     {% endfor %}
   </nav>
diff --git a/app/templatetags/__init__.py b/app/templatetags/__init__.py
diff --git a/app/templatetags/menus.py b/app/templatetags/menus.py
@@ -0,0 +1,52 @@
+from collections import defaultdict
+
+from django import template
+from django.db.models import Q
+from django.utils.translation import get_language
+
+from app.pages.models import Page
+
+
+register = template.Library()
+
+
+@register.simple_tag
+def menus():
+    menus = defaultdict(list)
+    pages = Page.objects.filter(
+        Q(is_active=True),
+        Q(language_code=get_language()),
+        ~Q(menu=''),
+    ).extra(
+        where=['depth BETWEEN 2 AND 3'],
+    )
+    for page in pages:
+        menus[page.menu].append(page)
+    return menus
+
+
+@register.filter
+def group_by_tree(iterable):
+    """
+    Given a list of pages in tree order, generate pairs consisting of the
+    parents and their descendants in a list.
+    """
+
+    parent = None
+    children = []
+    depth = -1
+
+    for element in iterable:
+        if parent is None or element.depth == depth:
+            if parent:
+                yield parent, children
+                parent = None
+                children = []
+
+            parent = element
+            depth = element.depth
+        else:
+            children.append(element)
+
+    if parent:
+        yield parent, children
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Django
+Django<1.11  # django-versatileimagefield is not there yet.
 feincms3[all]
 psycopg2
 pytz
