Merge remote-tracking branch 'remotes/yakky/issue_1314_bis' into develop

Conflicts:
	cms/templates/admin/cms/page/lazy_child_menu.html

cms/templates/admin/cms/page/lazy_child_menu.html

@@ -1,10 +1,8 @@
-{% load cms_admin i18n adminmedia %}<li id="page_{{page.pk}}" class="{% if cl.is_filtered %}leaf{% endif %}{% if forloop.last %} last{% endif %}{% if has_move_page_permission %} moveable{% endif %}{%if page.children.all %} closed{% endif %}"{% if metadata %} mdata="{{ metadata }}{% endif %}" rel="{% ifequal page.level 0 %}topnode{% else %}node{% endifequal %}">
+{% load cms_admin i18n adminmedia %}{% with page.children.exists as has_children %}<li id="page_{{page.pk}}" class="{% if cl.is_filtered %}leaf{% endif %}{% if has_move_page_permission %} moveable{% endif %}{% if has_children %} closed{% endif %}"{% if metadata %} mdata="{{ metadata }}{% endif %}" rel="{% ifequal page.level 0 %}topnode{% else %}node{% endifequal %}">
+
     {% include 'admin/cms/page/menu_item.html' %}
 
-    {% with page.children as children %}
-        {% if children %}<ul{% if page.last %} class="last"{% endif %}>
-        </ul>{% endif %}
-    {% endwith %}
+    {% if has_children %}<ul{% if page.last %} class="last"{% endif %}>
+    </ul>{% endif %}
 </li>
-
-
+{%  endwith %}

cms/templates/admin/cms/page/lazy_menu.html

@@ -1,8 +1,6 @@
 {% load cms_admin i18n adminmedia %}
     {% with page.children.all as children %}
-        {% if children %}
-            {% for child in children %}
-                {% show_lazy_admin_menu child %}
-            {% endfor %}
-        {% endif %}
+        {% for child in children %}
+            {% show_lazy_admin_menu child %}
+        {% endfor %}
     {% endwith %}