diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 18eb95fdbb8c1883ede77fad18900c78ed63ba3f..f067dcaf4171b851f5a98690e82d4d9207873df5 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2826,7 +2826,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so { if ($totalnboflines) // If we know total nb of lines { - $maxnbofpage=10; // nb before and after selected page + $maxnbofpage=(empty($conf->dol_optimize_smallscreen)?10:3); // nb before and after selected page $nbpages=ceil($totalnboflines/$conf->liste_limit); $cpt=($page-$maxnbofpage); @@ -2834,31 +2834,31 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so if ($cpt>=1) { - $pagelist.= '<li><a href="'.$file.'?page=0'.$options.'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">1</a></li>'; + $pagelist.= '<li class="pagination"><a href="'.$file.'?page=0'.$options.'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">1</a></li>'; if ($cpt >= 2) $pagelist.='<li><span class="inactive">...</span></li>'; } do { if ($cpt==$page) { - $pagelist.= '<li><span class="active">'.($page+1).'</span></li>'; + $pagelist.= '<li class="pagination"><span class="active">'.($page+1).'</span></li>'; } else { - $pagelist.= '<li><a href="'.$file.'?page='.$cpt.$options.'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">'.($cpt+1).'</a></li>'; + $pagelist.= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">'.($cpt+1).'</a></li>'; } $cpt++; } while ($cpt < $nbpages && $cpt<=$page+$maxnbofpage); if ($cpt<$nbpages) { - if ($cpt<$nbpages-1) $pagelist.= '<li><span class="inactive">...</span></li>'; - $pagelist.= '<li><a href="'.$file.'?page='.($nbpages-1).$options.'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">'.$nbpages.'</a></li>'; + if ($cpt<$nbpages-1) $pagelist.= '<li class="pagination"><span class="inactive">...</span></li>'; + $pagelist.= '<li class="pagination"><a href="'.$file.'?page='.($nbpages-1).$options.'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">'.$nbpages.'</a></li>'; } } else { - $pagelist.= '<li><span class="active">'.($page+1)."</li>"; + $pagelist.= '<li class="pagination"><span class="active">'.($page+1)."</li>"; } } print_fleche_navigation($page,$file,$options,$nextpage,$pagelist,$morehtml); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d987741eb266ff4c257fbb2f23ea7d45e807bc1f..fbdf781a677977f3f47290e92549cf2eb18e13fd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1863,17 +1863,18 @@ div.pagination li { padding-left: 0; border-radius: 4px; } - -div.pagination li a, -div.pagination li span { - /*position: relative;*/ - /*float: left;*/ +div.pagination li.pagination a, +div.pagination li.pagination span { padding: 6px 12px; margin-left: -1px; line-height: 1.42857143; color: #000; text-decoration: none; - background-color: #fff; +} +<?php if (empty($conf->dol_use_jmobile)) { ?> +div.pagination li a, +div.pagination li span { + background-color: #fff; border: 1px solid #ddd; } div.pagination li:first-child a, @@ -1918,7 +1919,8 @@ div.pagination .disabled a:focus { background-color: #fff; border-color: #ddd; } -div.pagination li .active { +<?php } ?> +div.pagination li.pagination .active { text-decoration: underline; } div.pagination li.paginationafterarrows {