From 27a27e02a1decf4e7d025a60340a5b5bf9b8cc6e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 22 Jun 2018 22:53:53 +0200 Subject: [PATCH] Fix css --- htdocs/adherents/list.php | 2 +- htdocs/asset/list.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/compta/bank/list.php | 2 +- htdocs/compta/facture/list.php | 2 +- htdocs/contact/list.php | 4 ++-- htdocs/contrat/list.php | 2 +- htdocs/contrat/services_list.php | 2 +- htdocs/don/list.php | 2 +- htdocs/expedition/list.php | 2 +- htdocs/expensereport/list.php | 2 +- htdocs/fichinter/list.php | 2 +- htdocs/fourn/commande/list.php | 2 +- htdocs/fourn/facture/list.php | 2 +- htdocs/holiday/list.php | 2 +- htdocs/modulebuilder/template/myobject_list.php | 2 +- htdocs/product/inventory/list.php | 2 +- htdocs/product/list.php | 2 +- htdocs/product/stock/list.php | 2 +- htdocs/product/stock/mouvement.php | 2 +- htdocs/product/stock/productlot_list.php | 2 +- htdocs/projet/list.php | 2 +- htdocs/projet/tasks/list.php | 2 +- htdocs/societe/list.php | 2 +- htdocs/societe/website.php | 2 +- htdocs/supplier_proposal/list.php | 2 +- htdocs/theme/eldy/style.css.php | 7 +++++++ htdocs/theme/md/style.css.php | 7 +++++++ htdocs/ticket/list.php | 2 +- htdocs/user/group/list.php | 8 +------- htdocs/user/list.php | 2 +- 32 files changed, 45 insertions(+), 37 deletions(-) diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 7b1d9416dc2..3a1dd04443f 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -379,7 +379,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . implode(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } // Filter on categories diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index 903ebc83aad..bcc2329f870 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -317,7 +317,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall).'
'; } $moreforfilter = ''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 08860bc3c08..1a23c0b8728 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -488,7 +488,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall).'
'; } $i = 0; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 22d2e00a0c2..a63847421eb 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -526,7 +526,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index a262a63e045..e52e285742c 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -257,7 +257,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 9d3e87f2d3c..8858577c91e 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -633,7 +633,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } // If the user can view prospects other than his' diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 7a5503d07ca..d98eed5decb 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -448,11 +448,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } if ($search_firstlast_only) { - print $langs->trans("FilterOnInto", $search_firstlast_only) . $langs->trans("Lastname").", ".$langs->trans("Firstname"); + print '
'.$langs->trans("FilterOnInto", $search_firstlast_only) . $langs->trans("Lastname").", ".$langs->trans("Firstname").'
'; } $moreforfilter=''; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 49b35fdf7e1..18e78c7ff0a 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -401,7 +401,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index 290226f815e..de44410e505 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -336,7 +336,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $morefilter = ''; diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 6c1e3b7efbc..1e7d93302d8 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -160,7 +160,7 @@ if ($resql) if ($search_all) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'
'; } print '
'; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 99b44e72fc1..14f9eb41f44 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -298,7 +298,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 5565512f7f5..b8f88210780 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -488,7 +488,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 9b054e66545..96a1199255c 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -306,7 +306,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index f0e9793f9a1..773e9da06c0 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -711,7 +711,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 8c77feb2187..7f96bab0b09 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -547,7 +547,7 @@ if ($resql) if ($search_all) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'
'; } // If the user can view prospects other than his' diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 070b735d09d..5df3fdb314b 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -399,7 +399,7 @@ else if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index b6e2b351494..0e43aedc4e7 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -369,7 +369,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter = ''; diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index 3a483291a75..74422cc2601 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -333,7 +333,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter = ''; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index cc985eada40..d1ea3d08a4c 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -473,7 +473,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } // Filter on categories diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 6ec624bb281..aba8655fae1 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -151,7 +151,7 @@ if ($result) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 02498dbe8ff..410396a152b 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -735,7 +735,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index 5ea3df84839..7c15b3fa7c5 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -302,7 +302,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } /*$moreforfilter = ''; diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 49250154455..779091d069f 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -487,7 +487,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($search_all) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 02549454e8e..14703f6d3eb 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -437,7 +437,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($search_all) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'
'; } $morehtmlfilter = ''; diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index ec31cefdd52..411c0d4c2d5 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -642,7 +642,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($search_all) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'
'; } // Filter on categories diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 2ff40f83764..3ce1477a9c3 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -343,7 +343,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } /*$moreforfilter = ''; diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 7ab88474bac..3dcf9601944 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -415,7 +415,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $i = 0; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index fe23817ecc7..57905f6954d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -692,6 +692,13 @@ div.divsearchfield { margin-bottom: 4px; padding-left: 2px; } +.divsearchfieldfilter { + text-overflow: clip; + overflow: auto; + white-space: nowrap; + padding-bottom: 5px; + opacity: 0.6; +} div.confirmmessage { padding-top: 6px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index a5d2d404571..dc330685b9c 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -685,6 +685,13 @@ div.divsearchfield { margin-bottom: 4px; padding-left: 2px; } +.divsearchfieldfilter { + text-overflow: clip; + overflow: auto; + white-space: nowrap; + padding-bottom: 5px; + opacity: 0.6; +} div.confirmmessage { padding-top: 6px; } diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index d654c763f9b..b3df986cde7 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -471,7 +471,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } print '
'; diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index b478f99bd59..946ba132af8 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -162,13 +162,7 @@ if ($resql) if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); - } - - if ($sall) - { - foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter=''; diff --git a/htdocs/user/list.php b/htdocs/user/list.php index 29a3d0fc647..a1f0cdd5471 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -298,7 +298,7 @@ print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sorto if ($sall) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); + print '
'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'
'; } $moreforfilter='';