diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 8fd26b52b7f..ee16bdd0711 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -133,7 +133,7 @@ $form=new Form($db); $userstatic=new User($db); $nav=''; -$nav.='  
'; +$nav.=''; if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav.=''; if ($status || isset($_GET['status']) || isset($_POST['status'])) $nav.=''; if ($filter) $nav.=''; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index a396d9fdf1d..08a14b75602 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -323,7 +323,7 @@ if ($resql) $formother->select_year($year?$year:-1,'year',1, 20, 5); print ''; print ' '; - print ''; + print ''; print ''; print ' '; print ''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 27ea19e971d..9472118d64f 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; + $maxnbofpage=10; // nb before and after selected page $nbpages=ceil($totalnboflines/$conf->liste_limit); $cpt=($page-$maxnbofpage); @@ -2834,36 +2834,34 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so if ($cpt>=1) { - $pagelist.= '
  • 1
    • '."\n"; - if ($cpt >= 2) $pagelist.='
  • ...
    • '; + $pagelist.= '
  • 1
    • '; + if ($cpt >= 2) $pagelist.='
  • ...
    • '; } do { if ($cpt==$page) { - $pagelist.= '
  • '.($page+1).'
    • '."\n"; + $pagelist.= '
  • '.($page+1).'
    • '; } else { - $pagelist.= '
  • '.($cpt+1).'
    • '."\n"; + $pagelist.= '
  • '.($cpt+1).'
    • '; } $cpt++; } while ($cpt < $nbpages && $cpt<=$page+$maxnbofpage); if ($cpt<$nbpages) { - if ($cpt<$nbpages-1) $pagelist.= '
  • ...
    • '; - $pagelist.= '
  • '.$nbpages.'
    • '."\n"; + if ($cpt<$nbpages-1) $pagelist.= '
  • ...
    • '; + $pagelist.= '
  • '.$nbpages.'
    • '; } } else { - $pagelist.= '
  • '.($page+1)."
    • \n"; + $pagelist.= '
  • '.($page+1)."
    • "; } } - print "\n"; - print_fleche_navigation($page,$file,$options,$nextpage,$pagelist); - if ($morehtml) print $morehtml; + print_fleche_navigation($page,$file,$options,$nextpage,$pagelist,$morehtml); print ''; print ''."\n"; @@ -2874,28 +2872,35 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so * Function to show navigation arrows into lists * * @param int $page Number of page - * @param string $file Page + * @param string $file Page URL (in most cases provided with $_SERVER["PHP_SELF"]) * @param string $options Other url paramaters to propagate ("" by default) * @param integer $nextpage Do we show a next page button - * @param string $betweenarrows HTML Content to show between arrows + * @param string $betweenarrows HTML content to show between arrows. Must contains '
    • ' tags. + * @param string $afterarraws HTML content to show after arrows. Must NOT contains '
    • ' tags. * @return void */ -function print_fleche_navigation($page,$file,$options='',$nextpage=0,$betweenarrows='') +function print_fleche_navigation($page,$file,$options='',$nextpage=0,$betweenarrows='',$afterarrows='') { global $conf, $langs; print ''."\n"; } diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index 25255880bdd..dcf966eb475 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -10,6 +10,10 @@ if ($dolibarr_main_prod) { $usedolheader=1; // 1 = Test inside a dolibarr page, 0 = Use hard coded header +$form=new Form($db); + + + // HEADER //-------- @@ -125,6 +129,21 @@ $tasksarray=array(1,2,3); // To force having several lines $tagidfortablednd='tablelines3'; if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; +$nav=''; +$nav.=''; +if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav.=''; +if ($status || isset($_GET['status']) || isset($_POST['status'])) $nav.=''; +if ($filter) $nav.=''; +if ($filtert) $nav.=''; +if ($socid) $nav.=''; +if ($showbirthday) $nav.=''; +if ($pid) $nav.=''; +if ($type) $nav.=''; +if ($usergroup) $nav.=''; +$nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); +$nav.=' '; +$nav.='
    '; + print_barre_liste('Title of my list', 3, $_SERVER["PHP_SELF"], '', '', '', 'Text in middle', 20, 5000, '', 0, $nav); ?> diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index e7ae83cbe3e..d987741eb26 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1837,19 +1837,26 @@ table.liste td { /* Pagination */ - +div.pagination { + float: right; +} div.pagination a { font-weight: normal; } -div.pagination ul, div.pagination li +div.pagination ul { list-style: none; display: inline-block; padding-left: 0px; + padding-right: 0px; + margin: 0; } - div.pagination li { - display: inline; + display: inline-block; + padding-left: 0px; + padding-right: 0px; + padding-top: 6px; + padding-bottom: 6px; } .pagination { display: inline-block; @@ -1859,8 +1866,8 @@ div.pagination li { div.pagination li a, div.pagination li span { - position: relative; - float: left; + /*position: relative;*/ + /*float: left;*/ padding: 6px 12px; margin-left: -1px; line-height: 1.42857143; @@ -1914,6 +1921,9 @@ div.pagination .disabled a:focus { div.pagination li .active { text-decoration: underline; } +div.pagination li.paginationafterarrows { + margin-left: 10px; +} /* Prepare to remove class pair - impair .noborder > tbody > tr:nth-child(even) td { @@ -2305,7 +2315,6 @@ div.titre { color: rgb(); text-decoration: none; text-shadow: 1px 1px 2px #FFFFFF; - dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?> } #dolpaymenttable { width: 600px; font-size: 13px; }