lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix restore compatibility of new navigation style with jmobile

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-18 08:59:58 +02:00
parent d25a2af70c
commit 684686e0f6
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2826,7 +2826,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
{ {
if ($totalnboflines) // If we know total nb of lines 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); $nbpages=ceil($totalnboflines/$conf->liste_limit);
$cpt=($page-$maxnbofpage); $cpt=($page-$maxnbofpage);
@ -2834,31 +2834,31 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
if ($cpt>=1) if ($cpt>=1)
{ {
$pagelist.= '<li><a href="'.$file.'?page=0'.$options.'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">1</a></li>'; $pagelist.= '<li class="pagination"><a href="'.$file.'?page=0'.$options.'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">1</a></li>';
if ($cpt >= 2) $pagelist.='<li><span class="inactive">...</span></li>'; if ($cpt >= 2) $pagelist.='<li><span class="inactive">...</span></li>';
} }
do do
{ {
if ($cpt==$page) if ($cpt==$page)
{ {
$pagelist.= '<li><span class="active">'.($page+1).'</span></li>'; $pagelist.= '<li class="pagination"><span class="active">'.($page+1).'</span></li>';
} }
else else
{ {
$pagelist.= '<li><a href="'.$file.'?page='.$cpt.$options.'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.($cpt+1).'</a></li>'; $pagelist.= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.($cpt+1).'</a></li>';
} }
$cpt++; $cpt++;
} }
while ($cpt < $nbpages && $cpt<=$page+$maxnbofpage); while ($cpt < $nbpages && $cpt<=$page+$maxnbofpage);
if ($cpt<$nbpages) if ($cpt<$nbpages)
{ {
if ($cpt<$nbpages-1) $pagelist.= '<li><span class="inactive">...</span></li>'; if ($cpt<$nbpages-1) $pagelist.= '<li class="pagination"><span class="inactive">...</span></li>';
$pagelist.= '<li><a href="'.$file.'?page='.($nbpages-1).$options.'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$nbpages.'</a></li>'; $pagelist.= '<li class="pagination"><a href="'.$file.'?page='.($nbpages-1).$options.'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$nbpages.'</a></li>';
} }
} }
else 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); print_fleche_navigation($page,$file,$options,$nextpage,$pagelist,$morehtml);

16
htdocs/theme/eldy/style.css.php
View File

@ -1863,17 +1863,18 @@ div.pagination li {
padding-left: 0; padding-left: 0;
border-radius: 4px; border-radius: 4px;
} }
div.pagination li.pagination a,
div.pagination li a, div.pagination li.pagination span {
div.pagination li span {
/*position: relative;*/
/*float: left;*/
padding: 6px 12px; padding: 6px 12px;
margin-left: -1px; margin-left: -1px;
line-height: 1.42857143; line-height: 1.42857143;
color: #000; color: #000;
text-decoration: none; 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; border: 1px solid #ddd;
} }
div.pagination li:first-child a, div.pagination li:first-child a,
@ -1918,7 +1919,8 @@ div.pagination .disabled a:focus {
background-color: #fff; background-color: #fff;
border-color: #ddd; border-color: #ddd;
} }
div.pagination li .active { <?php } ?>
div.pagination li.pagination .active {
text-decoration: underline; text-decoration: underline;
} }
div.pagination li.paginationafterarrows { div.pagination li.paginationafterarrows {