dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kevin Granger
2013-10-21 18:03:15 +02:00
parent 2e13013657 d6ad300625
commit 3ae1f68b3b
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/list/list_footer.tpl
+5 -3
View File
@@ -110,12 +110,12 @@
</li>
{/if}
{/while}
<li {if $page > $total_pages}class="disabled"{/if}>
<li {if $page >= $total_pages}class="disabled"{/if}>
<a href="javascript:void(0);" class="pagination-link" data-page="{$page + 1}" data-list-id="{$list_id}">
<i class="icon-angle-right"></i>
</a>
</li>
<li {if $page > $total_pages}class="disabled"{/if}>
<li {if $page >= $total_pages}class="disabled"{/if}>
<a href="javascript:void(0);" class="pagination-link" data-page="{$total_pages}" data-list-id="{$list_id}">
<i class="icon-double-angle-right"></i>
</a>
@@ -124,7 +124,9 @@
<script type="text/javascript">
$('.pagination-link').on('click',function(e){
e.preventDefault();
$('#submitFilter'+$(this).data("list-id")).val($(this).data("page")).closest("form").submit();
if (!$(this).parent().hasClass('disabled'))
$('#submitFilter'+$(this).data("list-id")).val($(this).data("page")).closest("form").submit();
});
</script>
</div>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -76,6 +76,7 @@
{if !$simple_header}
<form method="post" action="{$action}" class="form-horizontal">
<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
{block name="override_form_extra"}{/block}
<div class="panel col-lg-12">
<div class="panel-heading">
@@ -300,7 +301,6 @@
{if $has_actions}
<td class="actions">
{if $show_filters}
<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
<span class="pull-right">
{*Search must be before reset for default form submit*}
<button type="submit" id="submitFilterButton{$list_id}" name="submitFilter" class="btn btn-default" data-list-id="{$list_id}">