Use regroup to properly separate defined menus and single links in footer.

biscuit/core/templates/footer-menu.html

@@ -2,26 +2,32 @@
 {% load menu_generator font_awesome i18n %}
 
 {% get_menu "FOOTER_MENU_CORE" as footer_menu %}
-{% for item in footer_menu %}
- {% if item.submenu %}
+{% regroup footer_menu by submenu|length_is:"0" as footer_menus %}
+
+{% for menu in footer_menus %}
+ {% if not menu.grouper %}
+  {% for item menu.list %}
+   <div class="col-xs-12 col-sm-4 ">
+    <h5>{{ item.name }}</h5>
+    <ul class="list-unstyled quick-links">
+     {% for menu in item.submenu %}
+      <li><a href="{{ menu.url }}">{% fa 'fa-angle-double-right' %} {{ menu.name }}</a></li>
+     {% endfor %}
+    </ul>
+   </div>
+  {% endfor %}
+ {% endif %}
+{% endfor %}
+
+{% for menu in footer_menus %}
+ {% if menu.grouper %}
   <div class="col-xs-12 col-sm-4 ">
-   <h5>{{ item.name }}</h5>
+   <h5>{% blocktrans %}Assorted{% endblocktrans %}</h5>
    <ul class="list-unstyled quick-links">
-    {% for menu in item.submenu %}
-     <li><a href="{{ menu.url }}">{% fa 'fa-angle-double-right' %} {{ menu.name }}</a></li>
+    {% for item in menu.list %}
+     <li><a href="{{ item.url }}">{% fa 'fa-angle-double-right' %} {{ item.name }}</a></li>
     {% endfor %}
    </ul>
   </div>
  {% endif %}
 {% endfor %}
-
-<div class="col-xs-12 col-sm-4 ">
- <h5>{% blocktrans %}Assorted{% endblocktrans %}</h5>
- <ul class="list-unstyled quick-links">
-  {% for item in footer_menu %}
-   {% if not item.submenu %}
-    <li><a href="{{ item.url }}">{% fa 'fa-angle-double-right' %} {{ item.name }}</a></li>
-   {% endif %}
-  {% endfor %}
- </ul>
-</div>