Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2024-01-23 22:17:46 +01:00
parent 1e8c7bf918 cca01cbda4
commit ce21af7b6c
28 changed files with 91 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/lib/functions.lib.php
View File

@@ -5868,11 +5868,11 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
if ($cpt >= 1) {
if (empty($pagenavastextinput)) {
$pagelist .= '<li class="pagination"><a href="'.$file.'?page=0'.$options.'">1</a></li>';
$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page=0'.$options.'">1</a></li>';
if ($cpt > 2) {
$pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
} elseif ($cpt == 2) {
$pagelist .= '<li class="pagination"><a href="'.$file.'?page=1'.$options.'">2</a></li>';
$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page=1'.$options.'">2</a></li>';
}
}
}
@@ -5887,7 +5887,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
if ($cpt == $page) {
$pagelist .= '<li class="pagination"><span class="active">'.($page + 1).'</span></li>';
} else {
$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';
$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';
}
}
$cpt++;
@@ -5898,13 +5898,13 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
if ($cpt < $nbpages - 2) {
$pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
} elseif ($cpt == $nbpages - 2) {
$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';
$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';
}
$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
}
} else {
//var_dump($page.' '.$cpt.' '.$nbpages);
$pagelist .= '<li class="pagination paginationlastpage"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
$pagelist .= '<li class="pagination paginationlastpage"><a class="reposition" href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
}
} else {
$pagelist .= '<li class="pagination"><span class="active">'.($page + 1)."</li>";
@@ -6010,7 +6010,7 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
print '</li>';
}
if ($page > 0) {
print '<li class="pagination paginationpage paginationpageleft"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
print '<li class="pagination paginationpage paginationpageleft"><a class="paginationprevious reposition" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
}
if ($betweenarrows) {
print '<!--<div class="betweenarrows nowraponall inline-block">-->';
@@ -6018,7 +6018,7 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
print '<!--</div>-->';
}
if ($nextpage > 0) {
print '<li class="pagination paginationpage paginationpageright"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
print '<li class="pagination paginationpage paginationpageright"><a class="paginationnext reposition" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
}
if ($afterarrows) {
print '<li class="paginationafterarrows">';