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

This commit is contained in:
rGaillard
2013-11-29 16:40:14 +01:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
<div class="container"> <div class="container">
<a href="{$banner_link}" title="{$banner_desc}"> <a href="{$banner_link}" title="{$banner_desc}">
{if isset($banner_img)} {if isset($banner_img)}
<img class="img-responsive" src="{$module_dir}{$banner_img}" alt=""/> <img class="img-responsive" src="{$module_dir}{$banner_img}" alt="{$banner_desc}" title="{$banner_desc}"/>
{else} {else}
{$banner_desc} {$banner_desc}
{/if} {/if}
@@ -25,7 +25,7 @@
<li class="category_{$node.id}{if isset($last) && $last == 'true'} last{/if}"> <li class="category_{$node.id}{if isset($last) && $last == 'true'} last{/if}">
<a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if} <a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a> title="{$node.name|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
{if $node.children|@count > 0} {if $node.children|@count > 0}
<ul> <ul>
{foreach from=$node.children item=child name=categoryTreeBranch} {foreach from=$node.children item=child name=categoryTreeBranch}