Merge branch 'ticket-fidelite' into develop

This commit is contained in:
Marion Muszynski 2016-06-06 15:56:56 +02:00
commit a966ed080e

View File

@ -69,7 +69,7 @@
{/if} {/if}
</div> </div>
<div id="pagination" class="pagination"> <div id="pagination" class="pagination">
{if $nbpagination < $nb_orders|@count} {if $nbpagination < $nb_orders}
<ul class="pagination"> <ul class="pagination">
{if $page != 1} {if $page != 1}
{assign var='p_previous' value=$page-1} {assign var='p_previous' value=$page-1}
@ -87,7 +87,7 @@
{section name=pagination start=$page-1 loop=$page+2 step=1} {section name=pagination start=$page-1 loop=$page+2 step=1}
{if $page == $smarty.section.pagination.index} {if $page == $smarty.section.pagination.index}
<li class="current"><span>{$page|escape:'htmlall':'UTF-8'}</span></li> <li class="current"><span>{$page|escape:'htmlall':'UTF-8'}</span></li>
{elseif $smarty.section.pagination.index > 0 && $nb_orders|@count+$nbpagination > ($smarty.section.pagination.index)*($nbpagination)} {elseif $smarty.section.pagination.index > 0 && $nb_orders+$nbpagination > ($smarty.section.pagination.index)*($nbpagination)}
<li><a href="{$pagination_link}?p={$smarty.section.pagination.index}&n={$nbpagination}">{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</a></li> <li><a href="{$pagination_link}?p={$smarty.section.pagination.index}&n={$nbpagination}">{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</a></li>
{/if} {/if}
{/section} {/section}
@ -97,7 +97,7 @@
{/if} {/if}
<li><a href="{$pagination_link}?p={$max_page}&n={$nbpagination}">{$max_page}</a></li> <li><a href="{$pagination_link}?p={$max_page}&n={$nbpagination}">{$max_page}</a></li>
{/if} {/if}
{if $nb_orders|@count > $page * $nbpagination} {if $nb_orders > $page * $nbpagination}
{assign var='p_next' value=$page+1} {assign var='p_next' value=$page+1}
<li id="pagination_next"><a href="{$pagination_link}?p={$p_next}&n={$nbpagination}">&nbsp;&raquo;</a></li> <li id="pagination_next"><a href="{$pagination_link}?p={$p_next}&n={$nbpagination}">&nbsp;&raquo;</a></li>
{else} {else}