Merge branch 'master' of https://github.com/thelia/thelia
Conflicts: core/lib/Thelia/Form/CustomerCreation.php templates/admin/default/customers.html
This commit is contained in:
@@ -104,27 +104,26 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{module_include location='customer_bottom'}
|
||||
<div class="row">
|
||||
<div class="col-md-12 text-center">
|
||||
|
||||
<ul class="pagination pagination-centered">
|
||||
{if #customer_page != 1}
|
||||
{if $customer_page != 1}
|
||||
<li><a href="{url path="/admin/customers" page="1"}">«</a></li>
|
||||
{else}
|
||||
<li class="disabled"><a href="#">«</a></li>
|
||||
{/if}
|
||||
|
||||
{pageloop rel="customer_list"}
|
||||
{if #PAGE != #CURRENT}
|
||||
<li><a href="{url path="/admin/customers" page="#PAGE"}">#PAGE</a></li>
|
||||
{if $PAGE != $CURRENT}
|
||||
<li><a href="{url path="/admin/customers" page="$PAGE"}">{$PAGE}</a></li>
|
||||
{else}
|
||||
<li class="active"><a href="#">#PAGE</a></li>
|
||||
<li class="active"><a href="#">{$PAGE}</a></li>
|
||||
{/if}
|
||||
|
||||
{if #PAGE == #LAST && #LAST != #CURRENT}
|
||||
<li><a href="{url path="/admin/customers" page="#PAGE"}">»</a></li>
|
||||
{if $PAGE == $LAST && $LAST != $CURRENT}
|
||||
<li><a href="{url path="/admin/customers" page="$PAGE"}">»</a></li>
|
||||
{else}
|
||||
<li class="disabled"><a href="#">»</a></li>
|
||||
{/if}
|
||||
@@ -132,10 +131,9 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{* Adding a new Category *}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user