Navigation trees rendering fixes

- Update used tag
- Resolve nested trees using mptt helpers

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index 40adeaa..212ec3a 100644 (file)
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -111,7 +111,7 @@
               {% endif %}
                    <ul>
                        {% block page.nav %}
-                           {% feincms_navigation of feincms_page as sublevel level=2,depth=1 %}
+                           {% feincms_nav feincms_page level=2 depth=1 as sublevel %}
                            {% for p in sublevel %}
                            <li class="{% if p|is_equal_or_parent_of:feincms_page %}active{% endif %}">
                            <a href="{{ p.get_absolute_url }}">{{ p.title }}</a></li>
@@ -121,7 +121,7 @@
                    <ul>
                        {% block page.subnav %}
                            {% if feincms_page.override_url != "/" %}
-                           {% feincms_navigation of feincms_page as sublevel level=3,depth=1 %}
+                           {% feincms_nav feincms_page level=3 depth=1 as sublevel %}
                            {% for p in sublevel %}
                            <li class="{% if p|is_equal_or_parent_of:feincms_page or p.url == request.path %}active{% endif %}">
                            <a href="{{ p.get_absolute_url }}">{{ p.title }}</a></li>

diff --git a/cloudcms/templates/cms/footer.html b/cloudcms/templates/cms/footer.html
index 3d87acf..e9613ee 100644 (file)
--- a/cloudcms/templates/cms/footer.html
+++ b/cloudcms/templates/cms/footer.html
@@ -1,24 +1,27 @@
+{% load feincms_tags mptt_tags feincms_page_tags %}
 {% if APP.footer_top %}
 <p>
     {{ APP.footer_top|safe }}
 </p>
 {% endif %}
 <div class="clearfix">
-       {% load feincms_tags feincms_page_tags %}
-       {% feincms_navigation of feincms_page as sublevel level=2,depth=1 %}
-       {% for p in sublevel %}
-       <ul class="col">
-               <li>
-                       <a href="{{ p.get_absolute_url }}">{{ p.title }}</a>
-               </li>
-       {% feincms_navigation of p as innerlinks level=3,depth=2 %}
-       {% for innerp in innerlinks %}
-               <li>
-                       <a href="{{ innerp.get_absolute_url }}">{{ innerp.title }}</a>
-               </li>
-       {% endfor %}
-       </ul>
-       {% endfor %}
+    {% feincms_nav feincms_page level=2 depth=1 as sublevel %}
+    {% recursetree sublevel %}
+    {% with node as p %}
+    <ul class="col">
+        <li>
+            <a href="{{ p.get_absolute_url }}">{{ p.title }}</a>
+            </li>
+            {% if not p.is_leaf_node %} 
+    {% for innerp in children %}
+        <li>
+            <a href="{{ innerp.get_absolute_url }}">{{ innerp.title }}</a>
+        </li>
+        {% endfor %}
+        {% endif %}
+    </ul>
+    {% endwith %}
+    {% endrecursetree %}
 </div>
 
 {% if APP.footer_bottom %}

diff --git a/cloudcmsblog/models.py b/cloudcmsblog/models.py
index 989f19f..f08db50 100644 (file)
--- a/cloudcmsblog/models.py
+++ b/cloudcmsblog/models.py
@@ -207,6 +207,7 @@ class BlogCategoriesNavigationExtension(NavigationExtension):
                 url=url,
                 lft=0,
                 rght=0,
+                level=page.level,
                 slug=category.translation.slug,
             )
 

diff --git a/cloudcmsfaq/models.py b/cloudcmsfaq/models.py
index e687618..465c0d7 100644 (file)
--- a/cloudcmsfaq/models.py
+++ b/cloudcmsfaq/models.py
@@ -213,6 +213,7 @@ class FaqServicesNavigationExtension(NavigationExtension):
                 url=url,
                 lft=0,
                 rght=0,
+                level=page.level,
                 slug=category.translation.slug,
             )