This commit is contained in:
Laurent Destailleur 2022-01-23 02:06:47 +01:00
parent e0956c1765
commit e3cf5fecbe
6 changed files with 42 additions and 17 deletions

View File

@ -1,6 +1,5 @@
div.divsearchfield {
float: left;
margin: 4px 12px 4px 2px;
padding-left: 2px;
}

View File

@ -535,11 +535,11 @@ if ($mode == 'common' || $mode == 'commonkanban') {
//$moreforfilter .= '<div class="floatright center marginrightonly hideonsmartphone" style="padding-top: 3px"><span class="paddingright">'.$moreinfo.'</span> '.$moreinfo2.'</div>';
$moreforfilter .= '<div class="colorbacktimesheet float valignmiddle">';
$moreforfilter .= '<div class="divsearchfield paddingtop">';
$moreforfilter .= '<div class="divfilteralone colorbacktimesheet float valignmiddle">';
$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
$moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh hideonsmartphone"').'<input type="text" id="search_keyword" name="search_keyword" class="maxwidth125" value="'.dol_escape_htmltag($search_keyword).'" placeholder="'.dol_escape_htmltag($langs->trans('Keyword')).'">';
$moreforfilter .= '</div>';
$moreforfilter .= '<div class="divsearchfield paddingtop">';
$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
$moreforfilter .= '</div>';
if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
@ -553,16 +553,16 @@ if ($mode == 'common' || $mode == 'commonkanban') {
if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
$array_version['development'] = $langs->trans("Development");
}
$moreforfilter .= '<div class="divsearchfield paddingtop">';
$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
$moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->trans('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
$moreforfilter .= '</div>';
}
$moreforfilter .= '<div class="divsearchfield paddingtop">';
$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
$moreforfilter .= $form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, $langs->trans('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
$moreforfilter .= '</div>';
$moreforfilter .= ' ';
$moreforfilter .= '<div class="divsearchfield">';
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
$moreforfilter .= '<div class="divsearchfield valignmiddle inline-block">';
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) {
$moreforfilter .= ' ';
$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';

View File

@ -7,6 +7,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
* Dropdown of user popup
*/
.bookmark-footer a.top-menu-dropdown-link {
white-space: normal;
word-break: break-word;
}
button.dropdown-item.global-search-item {
outline: none;
}
@ -15,6 +20,12 @@ button.dropdown-item.global-search-item {
display: block;
}
#topmenu-bookmark-dropdown .dropdown-menu {
min-width: 300px;
max-width: 360px;
}
.dropdown-search {
border-color: #eee;

View File

@ -261,7 +261,7 @@ input:invalid, select:invalid, input.--error , select.--error {
div.tabBar textarea:focus {
border: 1px solid #aaa !important;
}
input:focus:not(.select2-search__field), select:focus, .select2-container--open .select2-selection--single {
input:focus:not(.select2-search__field):not(#top-bookmark-search-input), select:focus, .select2-container--open .select2-selection--single {
/* div.tabBar input:focus, div.tabBar select:focus { */
border-bottom: 1px solid #666 !important;
border-bottom-left-radius: 0 !important;
@ -985,12 +985,18 @@ span.fa.fa-plus-circle.paddingleft {
padding-<?php print $right; ?>: 20px;
}
div.divsearchfield {
float: <?php print $left; ?>;
/* float: <?php print $left; ?>; */
display: inline-block;
margin-<?php print $right; ?>: 12px;
margin-<?php print $left; ?>: 2px;
margin-top: 4px;
margin-bottom: 4px;
padding-left: 2px;
padding-left: 2px;
}
.divfilteralone {
background-color: #e8e8e8;
border-radius: 5px;
padding-left: 5px;
}
.divsearchfieldfilter {
text-overflow: clip;
@ -2808,8 +2814,8 @@ div.login a:hover {
div.login_block_user {
display: inline-block;
vertical-align: middle;
line-height: <?php echo $disableimages ? '25' : '50'; ?>px;
height: <?php echo $disableimages ? '25' : '50'; ?>px;
line-height: <?php echo $disableimages ? '25' : '52'; ?>px;
height: <?php echo $disableimages ? '25' : '52'; ?>px;
}
div.login_block_other {
display: inline-block;
@ -3396,6 +3402,7 @@ input.buttonreset {
padding: 8px 15px;
text-decoration: underline;
color: var(--colortextlink);
background-color: transparent;
cursor: pointer;
}
.nopaddingleft {

View File

@ -2,7 +2,6 @@
if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > dont remove this line it's an ide hack */
/*
* Dropdown of user popup
@ -10,6 +9,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
.bookmark-footer a.top-menu-dropdown-link {
white-space: normal;
word-break: break-word;
}
button.dropdown-item.global-search-item {
@ -35,7 +35,8 @@ div#topmenu-bookmark-dropdown {
}
#topmenu-bookmark-dropdown .dropdown-menu {
width: 300px;
min-width: 300px;
max-width: 360px;
}
button.dropdown-item.global-search-item {

View File

@ -1098,13 +1098,19 @@ a.editfielda.nohover *:hover:before {
.divsocialnetwork:not(:last-child) {
padding-<?php print $right; ?>: 20px;
}
.divfilteralone {
background-color: #e8e8e8;
border-radius: 5px;
padding-left: 5px;
}
div.divsearchfield {
float: <?php print $left; ?>;
/* float: <?php print $left; ?>; */
display: inline-block;
margin-<?php print $right; ?>: 12px;
margin-<?php print $left; ?>: 2px;
margin-top: 4px;
margin-bottom: 4px;
padding-left: 2px;
padding-left: 2px;
}
.divsearchfieldfilter {
text-overflow: clip;
@ -3442,6 +3448,7 @@ input.buttonreset {
padding: 8px 15px;
text-decoration: underline;
color: var(--colortextlink);
background-color: transparent;
cursor: pointer;
}