From 015cd543d6d241fed3ae1e7ef0d48304e3b8ef28 Mon Sep 17 00:00:00 2001 From: jpb Date: Fri, 21 Jan 2022 09:52:52 +0100 Subject: [PATCH 01/11] add minwidth to selectArray --- htdocs/core/class/html.formticket.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 81912207f57..3eb59d761d1 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -1261,7 +1261,7 @@ class FormTicket // Zone to select its email template if (count($modelmail_array) > 0) { print '
'."\n"; - print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1); + print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1,0,"","",0,0,0,'','minwidth200'); if ($user->admin) { print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); } @@ -1375,7 +1375,7 @@ class FormTicket print ''; //$toolbarname = 'dolibarr_details'; From 15c39db35ca0c5046a838c1ffc2863962fc378e5 Mon Sep 17 00:00:00 2001 From: jpb Date: Fri, 21 Jan 2022 09:55:14 +0100 Subject: [PATCH 02/11] add minwidth to selectArray --- htdocs/core/class/html.formticket.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 3eb59d761d1..814c30374f9 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -1375,7 +1375,7 @@ class FormTicket print ''; //$toolbarname = 'dolibarr_details'; From 3e84a999651594fda2607d7329a4ab8bb3930048 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Fri, 21 Jan 2022 08:58:06 +0000 Subject: [PATCH 03/11] Fixing style errors. --- htdocs/core/class/html.formticket.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 814c30374f9..6866bfa8356 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -1261,7 +1261,7 @@ class FormTicket // Zone to select its email template if (count($modelmail_array) > 0) { print '
'."\n"; - print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1,0,"","",0,0,0,'','minwidth200'); + print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1, 0, "", "", 0, 0, 0, '', 'minwidth200'); if ($user->admin) { print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); } From e3cf5fecbedeef0922d992bd6595d604101b8e03 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Jan 2022 02:06:47 +0100 Subject: [PATCH 04/11] css --- htdocs/admin/dolistore/css/dolistore.css | 1 - htdocs/admin/modules.php | 14 +++++++------- htdocs/theme/eldy/dropdown.inc.php | 11 +++++++++++ htdocs/theme/eldy/global.inc.php | 17 ++++++++++++----- htdocs/theme/md/dropdown.inc.php | 5 +++-- htdocs/theme/md/style.css.php | 11 +++++++++-- 6 files changed, 42 insertions(+), 17 deletions(-) diff --git a/htdocs/admin/dolistore/css/dolistore.css b/htdocs/admin/dolistore/css/dolistore.css index fb4dc2d5bb1..3d8f163caf2 100644 --- a/htdocs/admin/dolistore/css/dolistore.css +++ b/htdocs/admin/dolistore/css/dolistore.css @@ -1,6 +1,5 @@ div.divsearchfield { - float: left; margin: 4px 12px 4px 2px; padding-left: 2px; } diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index f720e411717..215d66eb693 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -535,11 +535,11 @@ if ($mode == 'common' || $mode == 'commonkanban') { //$moreforfilter .= '
'.$moreinfo.' '.$moreinfo2.'
'; - $moreforfilter .= '
'; - $moreforfilter .= '
'; + $moreforfilter .= '
'; + $moreforfilter .= '
'; $moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh hideonsmartphone"').''; $moreforfilter .= '
'; - $moreforfilter .= '
'; + $moreforfilter .= '
'; $moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1); $moreforfilter .= '
'; 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 .= '
'; + $moreforfilter .= '
'; $moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->trans('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1); $moreforfilter .= '
'; } - $moreforfilter .= '
'; + $moreforfilter .= '
'; $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 .= '
'; $moreforfilter .= ' '; - $moreforfilter .= '
'; - $moreforfilter .= ''; + $moreforfilter .= '
'; + $moreforfilter .= ''; if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) { $moreforfilter .= ' '; $moreforfilter .= ''; diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index 81734c817b8..5c62a703f67 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -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; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index a830002d197..ff8a07c8ac0 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -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-: 20px; } div.divsearchfield { - float: ; + /* float: ; */ + display: inline-block; margin-: 12px; margin-: 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: px; - height: px; + line-height: px; + height: 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 { diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php index 1aec654410f..ff7285a2772 100644 --- a/htdocs/theme/md/dropdown.inc.php +++ b/htdocs/theme/md/dropdown.inc.php @@ -2,7 +2,6 @@ if (!defined('ISLOADEDBYSTEELSHEET')) { die('Must be call by steelsheet'); } ?> - /*