Skip to content

Commit e06888e

Browse files
eldyeldy
committed
Debug v23
1 parent feeda2a commit e06888e

File tree

4 files changed

+42
-11
lines changed

4 files changed

+42
-11
lines changed

‎htdocs/core/class/html.formother.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ public static function getBoxesArea($user, $areacode)
12611261

12621262
// Define selectboxlist
12631263
$arrayboxtoactivatelabel = array();
1264-
if (!empty($user->conf->$confuserzone)) {
1264+
if (getDolUserString($confuserzone)) {
12651265
$boxorder = '';
12661266
$langs->load("boxes"); // Load label of boxes
12671267
foreach ($boxactivated as $box) {
@@ -1293,7 +1293,7 @@ public static function getBoxesArea($user, $areacode)
12931293
$selectboxlist .= '<input type="hidden" name="userid" value="'.$user->id.'">';
12941294
$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';
12951295
$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';
1296-
$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth300 hideonprint', 0, 'hidden selected', 0, 0);
1296+
$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'noborderfocus selectwidget maxwidth300 hideonprint', 0, 'hidden selected', 0, 0);
12971297
if (empty($conf->use_javascript_ajax)) {
12981298
$selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
12991299
}

‎htdocs/theme/eldy/global.inc.php‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@
520520
}
521521
input:focus:not(.noborderfocus):not(.inputsearch_dropdownselectedfields):not(.button):not(.buttonwebsite):not(.buttonreset):not(.select2-search__field):not(#top-bookmark-search-input):not(.search_component_input):not(.input-nobottom),
522522
select:focus, .select2-container--open [aria-expanded="false"].select2-selection--single,
523-
.select2-container--focus span.selection span.select2-selection:not(.massactionselect) {
523+
.select2-container--focus span.selection span.select2-selection:not(.noborderfocus):not(.massactionselect) {
524524
<?php if (getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
525525
border: 1px solid #666 !important;
526526
<?php } else { ?>
@@ -7463,7 +7463,7 @@
74637463
border-top: 1px solid #ccc;
74647464
border-bottom: solid 1px var(--inputbordercolor);
74657465
}
7466-
.select2-container--default .select2-selection--single {
7466+
.select2-container--default .select2-selection--single:not(.selectwidget) {
74677467
outline: none;
74687468
<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
74697469
border-top: none;
@@ -7478,6 +7478,17 @@
74787478

74797479
box-shadow: none !important;
74807480
}
7481+
.select2-container--default .select2-selection--single.selectwidget,
7482+
.select2-container--default .select2-selection--single.selectwidget:hover,
7483+
.select2-container--default .select2-selection--single.selectwidget:focus {
7484+
outline: none;
7485+
border-top: none;
7486+
border-left: none;
7487+
border-right: none;
7488+
border-bottom: solid 1px var(--inputbordercolor);
7489+
border-radius: 0;
7490+
box-shadow: none !important;
7491+
}
74817492
.select2-container--default .select2-selection--multiple {
74827493
border<?php echo getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '' : '-bottom'; ?>: solid 1px var(--inputbordercolor);
74837494
}

‎htdocs/theme/md/info-box.inc.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,8 @@
303303
}
304304
.info-box-line-text {
305305
overflow: hidden;
306-
width: calc(100% - 76px);
306+
width: calc(100% - 92px);
307+
max-width: calc(100% - 82px);
307308
text-overflow: ellipsis;
308309
}
309310

‎htdocs/theme/md/style.css.php‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
}
583583
input:focus:not(.input-icon-user, .input-icon-password, .input-icon-security):not(.noborderfocus):not(.inputsearch_dropdownselectedfields):not(.button):not(.buttonwebsite):not(.buttonreset):not(.select2-search__field):not(#top-bookmark-search-input):not(.search_component_input):not(.input-nobottom),
584584
select:focus, .select2-container--open [aria-expanded="false"].select2-selection--single,
585-
.select2-container--focus span.selection span.select2-selection:not(.massactionselect) {
585+
.select2-container--focus span.selection span.select2-selection:not(.noborderfocus):not(.massactionselect) {
586586
<?php if (getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
587587
border: 1px solid #666 !important;
588588
<?php } else { ?>
@@ -3026,7 +3026,7 @@
30263026

30273027
.pictofixedwidth {
30283028
text-align: start;
3029-
width: 20px; /* do not use em unit here */
3029+
width: 22px; /* do not use em unit here */
30303030
/* padding-right: 0; */
30313031
}
30323032
img.pictofixedwidth {
@@ -3890,6 +3890,11 @@
38903890

38913891
.vmenusearchselectcombo {
38923892
width: <?php echo $leftmenuwidth - 20; ?>px;
3893+
height: 38px !important;
3894+
}
3895+
.vmenusearchselectcombo > .select2-selection__rendered, .vmenusearchselectcombo > .select2-selection__arrow {
3896+
line-height: 38px !important;
3897+
height: 38px !important;
38933898
}
38943899

38953900
.menu_contenu {
@@ -4716,8 +4721,8 @@
47164721
table.liste td, table.noborder > tr > td,
47174722
table.noborder > tbody > tr > td,
47184723
div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
4719-
padding: 4px 8px 4px 10px; /* t r b l */
4720-
height: 28px;
4724+
padding: 8px 12px 8px 12px; /* t r b l */
4725+
height: 32px;
47214726
}
47224727
table.liste tr.trkanban td {
47234728
padding: 12px 15px 12px 15px; /* t r b l */
@@ -7259,7 +7264,10 @@
72597264
border: none;
72607265
}
72617266

7262-
.blockvmenusearch .select2-container--default .select2-selection--single,
7267+
.blockvmenusearch .select2-container--default .select2-selection--single
7268+
{
7269+
/* background-color: var(--colorbackvmenu1); */
7270+
}
72637271
.blockvmenubookmarks .select2-container--default .select2-selection--single
72647272
{
72657273
background-color: var(--colorbackvmenu1);
@@ -7315,7 +7323,7 @@
73157323
border-top: 1px solid #ccc;
73167324
border-bottom: 1px solid #ccc;
73177325
}
7318-
.select2-container--default .select2-selection--single {
7326+
.select2-container--default .select2-selection--single:not(.selectwidget) {
73197327
outline: none;
73207328
<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
73217329
border-top: none;
@@ -7330,6 +7338,17 @@
73307338

73317339
box-shadow: none !important;
73327340
}
7341+
.select2-container--default .select2-selection--single.selectwidget,
7342+
.select2-container--default .select2-selection--single.selectwidget:hover,
7343+
.select2-container--default .select2-selection--single.selectwidget:focus {
7344+
outline: none;
7345+
border-top: none;
7346+
border-left: none;
7347+
border-right: none;
7348+
border-bottom: solid 1px var(--inputbordercolor);
7349+
border-radius: 0;
7350+
box-shadow: none !important;
7351+
}
73337352
.select2-container--default.select2-container--focus .select2-selection--multiple {
73347353
border-top: none;
73357354
border-left: none;

0 commit comments

Comments
 (0)