From b3c761798b1c29e8549f2ce1ea65b86504bc9637 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 16 Oct 2013 11:45:18 +0200
Subject: [PATCH] fix menu when child > 0

---
 .../Core/Template/Loop/CategoryTree.php       | 12 ++++---
 templates/default/category.html               |  2 --
 templates/default/includes/menu.html          | 31 ++++++++++---------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/CategoryTree.php b/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
index 009e2204f..b7c262649 100755
--- a/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
+++ b/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
@@ -84,10 +84,14 @@ class CategoryTree extends BaseI18nLoop
             $loopResultRow = new LoopResultRow();
 
             $loopResultRow
-                ->set("ID", $result->getId())->set("TITLE", $result->getVirtualColumn('i18n_TITLE'))
-                ->set("PARENT", $result->getParent())->set("URL", $result->getUrl($locale))
-                ->set("VISIBLE", $result->getVisible() ? "1" : "0")->set("LEVEL", $level)
-                ->set('CHILD_COUNT', $result->countChild())->set('PREV_LEVEL', $previousLevel)
+                ->set("ID", $result->getId())
+                ->set("TITLE", $result->getVirtualColumn('i18n_TITLE'))
+                ->set("PARENT", $result->getParent())
+                ->set("URL", $result->getUrl($locale))
+                ->set("VISIBLE", $result->getVisible() ? "1" : "0")
+                ->set("LEVEL", $level)
+                ->set('CHILD_COUNT', $result->countChild())
+                ->set('PREV_LEVEL', $previousLevel)
             ;
 
             $loopResult->addRow($loopResultRow);
diff --git a/templates/default/category.html b/templates/default/category.html
index 99db32948..419207426 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -46,6 +46,4 @@
         </aside>
 
     </div>
-
-    </div><!-- /.container -->
 {/block}
diff --git a/templates/default/includes/menu.html b/templates/default/includes/menu.html
index 083c74ef2..476e3ecd0 100644
--- a/templates/default/includes/menu.html
+++ b/templates/default/includes/menu.html
@@ -3,25 +3,28 @@
     <div class="block-content">
         <nav class="nav-categories">
             <ul id="category" class="accordion">
-                {assign "previousLevel" 0}
-                {loop name="cat-parent" type="category-tree" category="0"}
+            {assign "previousLevel" 0}
+            {loop name="cat-parent" type="category-tree" category="0"}
 
-                {for $foo=1 to $previousLevel-$LEVEL}
-            </ul>
-            </li>
+            {for $foo=1 to $previousLevel-$LEVEL}
+                    </ul>
+                </li>
             {/for}
 
             {if $CHILD_COUNT > 0 }
-            <li><a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="{$URL}#collapse{$ID}">{$TITLE} <span class="amount">({$CHILD_COUNT})</span></a>
-
+            <li>
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="{$URL}#collapse{$ID}">{$TITLE} <span class="amount">({$CHILD_COUNT})</span></a>
                 <ul id="collapse{$ID}" class="collapse">
-                    {else}
-
-                    <li><a href="{$URL}">{$TITLE} <span class="amount">(0)</span></a></li>
-                    {/if}
-                    {assign "previousLevel" $LEVEL}
-                    {/loop}
+            {else}
+                <li><a href="{$URL}">{$TITLE} <span class="amount">(0)</span></a></li>
+            {/if}
+                {assign "previousLevel" $LEVEL}
+            {/loop}
+            {for $i=$previousLevel to 1 step -1}
                 </ul>
+            </li>
+            {/for}
+            </ul>
         </nav>
     </div>
-</section>
\ No newline at end of file
+</section>