Merge branch 'master' into template

Conflicts:
	templates/admin/default/customers.html
	templates/default/register.html
This commit is contained in:
Manuel Raynaud
2013-09-10 17:09:22 +02:00
46 changed files with 1500 additions and 739 deletions

View File

@@ -119,12 +119,13 @@
{pageloop rel="customer_list"}
{if $PAGE != $CURRENT}
<li><a href="{url path="/admin/customers" page="{$PAGE}"}">{$PAGE}</a></li>
{else}
<li class="active"><a href="#">{$PAGE}</a></li>
{/if}
{if $PAGE == $LAST && $LAST != $CURRENT}
<li><a href="{url path="/admin/customers" page="{$PAGE}"}">&raquo;</a></li>
<li><a href="{url path="/admin/customers" page="$PAGE"}">&raquo;</a></li>
{else}
<li class="disabled"><a href="#">&raquo;</a></li>
{/if}