From 2802be2ed5d0209048763802ebfe2de00343844b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Dec 2016 02:20:13 +0100 Subject: [PATCH 1/3] Fix bad limit --- htdocs/projet/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index b98126a6bd0..fd3a65df1af 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -58,7 +58,7 @@ $page = is_numeric($page) ? $page : 0; $page = $page == -1 ? 0 : $page; if (! $sortfield) $sortfield="p.ref"; if (! $sortorder) $sortorder="ASC"; -$offset = $conf->liste_limit * $page ; +$offset = $limit * $page ; $pageprev = $page - 1; $pagenext = $page + 1; From 4e75f064fea8bc307e3ce294efe1558cbd875328 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Dec 2016 02:22:54 +0100 Subject: [PATCH 2/3] Fix popup of selection of fields --- htdocs/theme/eldy/style.css.php | 3 ++- htdocs/theme/md/style.css.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 6c7d039239c..af83c01986c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -590,7 +590,8 @@ div.myavailability { }*/ .div-table-responsive { overflow-x: auto; - min-height: 0.01%; + /*min-height: 0.01%;*/ + min-height: 350px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 266ad076822..0d802a2c345 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -595,7 +595,8 @@ div.myavailability { } .div-table-responsive { overflow-x: auto; - min-height: 0.01%; + /*min-height: 0.01%;*/ + min-height: 350px; } From 7d5c7080435af91787d61d7a9e054787dff1a02d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Dec 2016 02:31:59 +0100 Subject: [PATCH 3/3] Fix size of field for member list --- htdocs/adherents/list.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 77519b0e570..579c6cdf344 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -395,8 +395,8 @@ if (! empty($arrayfields['d.town']['checked'])) print_liste_field_titr if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($langs->trans("StateShort"),$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder); if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($langs->trans("Country"),$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder); if (! empty($arrayfields['d.phone']['checked'])) print_liste_field_titre($arrayfields['d.phone']['label'],$_SERVER["PHP_SELF"],'d.phone','',$param,'',$sortfield,$sortorder); -if (! empty($arrayfields['d.phone_perso']['checked'])) print_liste_field_titre($arrayfields['d.phone_perso']['label'],$_SERVER["PHP_SELF"],'d.phone_perso','',$param,'',$sortfield,$sortorder); -if (! empty($arrayfields['d.phone_mobile']['checked'])) print_liste_field_titre($arrayfields['d.phone_mobile']['label'],$_SERVER["PHP_SELF"],'d.phone_mobile','',$param,'',$sortfield,$sortorder); +if (! empty($arrayfields['d.phone_perso']['checked'])) print_liste_field_titre($arrayfields['d.phone_perso']['label'],$_SERVER["PHP_SELF"],'d.phone_perso','',$param,'',$sortfield,$sortorder); +if (! empty($arrayfields['d.phone_mobile']['checked'])) print_liste_field_titre($arrayfields['d.phone_mobile']['label'],$_SERVER["PHP_SELF"],'d.phone_mobile','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['d.email']['checked'])) print_liste_field_titre($arrayfields['d.email']['label'],$_SERVER["PHP_SELF"],'d.email','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['d.datefin']['checked'])) print_liste_field_titre($arrayfields['d.datefin']['label'],$_SERVER["PHP_SELF"],'d.datefin','',$param,'align="center"',$sortfield,$sortorder); // Extra fields @@ -434,32 +434,32 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) if (! empty($arrayfields['d.ref']['checked'])) { print ''; - print ''; + print ''; print ''; } if (! empty($arrayfields['d.firstname']['checked'])) { print ''; - print ''; + print ''; } if (! empty($arrayfields['d.lastname']['checked'])) { print ''; - print ''; + print ''; } if (! empty($arrayfields['d.company']['checked'])) { print ''; - print ''; + print ''; } if (! empty($arrayfields['d.login']['checked'])) { print ''; - print ''; + print ''; } if (! empty($arrayfields['d.morphy']['checked'])) @@ -479,24 +479,24 @@ if (! empty($arrayfields['t.libelle']['checked'])) if (! empty($arrayfields['d.address']['checked'])) { print ''; - print ''; + print ''; } if (! empty($arrayfields['d.zip']['checked'])) { print ''; - print ''; + print ''; } if (! empty($arrayfields['d.town']['checked'])) { print ''; - print ''; + print ''; } // State if (! empty($arrayfields['state.nom']['checked'])) { print ''; - print ''; + print ''; print ''; } // Country @@ -510,25 +510,25 @@ if (! empty($arrayfields['country.code_iso']['checked'])) if (! empty($arrayfields['d.phone']['checked'])) { print ''; - print ''; + print ''; } // Phone perso if (! empty($arrayfields['d.phone_perso']['checked'])) { print ''; - print ''; + print ''; } // Phone mobile if (! empty($arrayfields['d.phone_mobile']['checked'])) { print ''; - print ''; + print ''; } // Email if (! empty($arrayfields['d.email']['checked'])) { print ''; - print ''; + print ''; } if (! empty($arrayfields['d.datefin']['checked'])) @@ -597,7 +597,7 @@ print "\n"; $var=True; $i = 0; -while ($i < $num && $i < $conf->liste_limit) +while ($i < min($num, $limit)) { $obj = $db->fetch_object($resql);