Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

This commit is contained in:
Kevin Granger committed 2013-10-28 16:19:02 +01:00
commit 3798adff2f
119 files changed
+1776 -1025

No files matched your search

@@ -28,7 +28,7 @@
{if count($modules)}
{foreach $modules as $module}
{if $module_instance[$module.name]}
<a class="list-group-item{if ($current_module_name && $current_module_name == $module.name) || (!$current_module_name && $module@first)} active{/if}" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
<a class="list-group-item{if ($current_module_name && $current_module_name == $module.name)} active{/if}" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
{/if}
{/foreach}
{else}