diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 70bf1eeb2df..32319e46cef 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -8126,8 +8126,15 @@ class Form } $out .= '};'."\n"; $out .= '$(document).ready(function () { - $(\'#'.$htmlname.'\').'.$tmpplugin.'({ - dir: \'ltr\', + $(\'#'.$htmlname.'\').'.$tmpplugin.'({'; + if ($placeholder) { + $out .= ' + placeholder: { + id: \'-1\', + text: \''.dol_escape_js($placeholder).'\' + },'; + } + $out .= ' dir: \'ltr\', // Specify format function for dropdown item formatResult: formatResult, templateResult: formatResult, /* For 4.0 */ diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php index dcedf1405f8..3a4ab5d1a75 100644 --- a/htdocs/core/customreports.php +++ b/htdocs/core/customreports.php @@ -431,8 +431,8 @@ if ($object->isextrafieldmanaged) { } } } -print '
'.$langs->trans("Measures").'
'; -print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth400', 1); // Fill the array $arrayofmeasures with possible fields +print '
'; +print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth400', 1, 0, '', '', $langs->trans("Measures")); // Fill the array $arrayofmeasures with possible fields print ''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 2890d29e0e8..7eb552517ee 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -5932,7 +5932,7 @@ input.select2-input { color: #FFF !important; } .select2-container .select2-selection--multiple { - min-height: 30px !important; + min-height: 28px !important; } .select2-container--default .select2-selection--multiple .select2-selection__choice { margin-top: 5px !important; @@ -6045,6 +6045,9 @@ input.select2-input { background-color: #ddd; margin-top: 4px !important; } +.select2-selection--multiple input.select2-search__field { + border-bottom: none !important; +} .select2-search__field { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 7879368eee3..da706095e17 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1197,6 +1197,17 @@ div.divsearchfield { padding-left: 4px; } +.caretleftaxis { + margin-left: -13px; + margin-top: -1px; + position: absolute; +} +.caretdownaxis { + margin-left: -12px; + margin-top: 0; + position: absolute; +} + browser->layout == 'phone') { @@ -5843,6 +5854,10 @@ input.select2-input { color: #FFF !important; } +.select2-container .select2-selection--multiple { + min-height: 28px !important; +} + .select2-container--default .select2-selection--multiple .select2-selection__choice { border: 1px solid #e4e4e4; } @@ -5920,6 +5935,9 @@ input.select2-input { border-right: none; border-radius: 0 !important; } +.select2-selection--multiple input.select2-search__field { + border-bottom: none !important; +} .select2-search__field { outline: none;