Conflicts:
	core/lib/Thelia/Form/CustomerCreation.php
	templates/admin/default/customers.html
This commit is contained in:
mespeche
2013-09-10 16:44:24 +02:00
27 changed files with 1331 additions and 552 deletions

View File

@@ -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"}">&laquo;</a></li>
{else}
<li class="disabled"><a href="#">&laquo;</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"}">&raquo;</a></li>
{if $PAGE == $LAST && $LAST != $CURRENT}
<li><a href="{url path="/admin/customers" page="$PAGE"}">&raquo;</a></li>
{else}
<li class="disabled"><a href="#">&raquo;</a></li>
{/if}
@@ -132,10 +131,9 @@
</ul>
</div>
</div>
</div>
</div>
{* Adding a new Category *}