2
0
forked from Wavyzz/dolibarr
This commit is contained in:
Laurent Destailleur
2020-03-12 12:01:40 +01:00
parent d6a35db754
commit c1e5178eeb
3 changed files with 39 additions and 23 deletions

View File

@@ -8077,9 +8077,13 @@ class Form
$ret .= $langs->trans("Filters");
$ret .= '</a>';
//$ret .= '<button type="submit" class="liste_titre button_search paddingleftonly" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
$ret .= '<div name="search_component_params" class="search_component_params inline-block minwidth500 maxwidth300onsmartphone">';
$ret .= '<input type="text" name="search_component_params_input" class="search_component_params_input" placeholder="'.$langs->trans("Search").'" value="'.GETPOST("search_component_params_input").'">';
$ret .= '<div name="search_component_params" class="search_component_params inline-block minwidth500 maxwidth300onsmartphone valignmiddle">';
$texttoshow = '<div class="opacitymedium inline-block search_component_searchtext">'.$langs->trans("Search").'</div>';
$ret .= '<div class="search_component inline-block valignmiddle">'.$texttoshow.'</div>';
$ret .= '</div>';
$ret .= '<input type="hidden" name="search_component_params_hidden" class="search_component_params_hidden" value="'.GETPOST("search_component_params_hidden").'">';
// For compatibility with forms that show themself the search criteria in addition of this component, we output the fields
foreach ($arrayofcriterias as $criterias) {
foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;

View File

@@ -702,14 +702,24 @@ div.divsearchfield {
-webkit-flex-flow: row wrap;
flex-flow: row wrap;
background: #fff;
padding: 3px;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 10px;
padding-right: 10px;
border-bottom: solid 1px rgba(0,0,0,.2);
height: 24px;
}
.search_component_params_input, .search_component_params_input:focus {
.search_component_searchtext {
padding-top: 2px;
}
.search_component_params_text, .search_component_params_text:focus {
border-bottom: none;
width: auto;
margin: 0 !important;
padding: 3px;
}
<?php
// Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip
if ($conf->browser->layout == 'phone') {