TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia into coupon

Browse Source 
* 'master' of https://github.com/thelia/thelia:
  theliatype in form : types now extends bastype which implement typeinterface basetype provides verifiyForm method wich can be call in Callback constraint
  restart thelia form type
  thelia type constraints
  tax management
  fix menu when child > 0
  taxes management
  tax rule edition
This commit is contained in:
gmorel
2013-10-17 01:38:35 +02:00
parent d2851b1c93 a2048bec24
commit cf78c7c5d5
47 changed files with 1619 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/default/category.html
View File

@@ -46,6 +46,4 @@
</aside>
</div>
</div><!-- /.container -->
{/block}

31
templates/default/includes/menu.html
View File

@@ -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>
</section>