This commit is contained in:
Laurent Destailleur 2026-01-02 04:05:03 +01:00
parent e3f7947cc5
commit b2e609d8dc
5 changed files with 55 additions and 11 deletions

View file

@ -987,6 +987,12 @@ class Conf extends stdClass
if (!isset($this->global->MAIN_ENABLE_AJAX_TOOLTIP)) {
$this->global->MAIN_ENABLE_AJAX_TOOLTIP = 1; // Try to have it enabled by default with v21+
}
if (!isset($this->global->THEME_SHOW_BORDER_ON_INPUT)) {
$this->global->THEME_SHOW_BORDER_ON_INPUT = 1;
}
if (!isset($this->global->THEME_ELDY_BORDER_RADIUS)) {
$this->global->THEME_ELDY_BORDER_RADIUS = 6;
}
// By default, suppliers objects can be linked to all projects
if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) {

View file

@ -938,10 +938,10 @@ class FormOther
);
});
</script>';
$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="colorpicker flat valignmiddle'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
} else {
$color = ($set_color !== '' ? $set_color : ($default !== '' ? $default : 'FFFFFF'));
$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat input-nobottom colorselector valignmiddle '.($morecss ? ' '.$morecss : '').'" type="color" data-default="'.$default.'" value="'.dol_escape_htmltag(preg_match('/^#/', $color) ? $color : '#'.$color).'" />';
$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="colorpicker flat input-nobottom colorselector valignmiddle '.($morecss ? ' '.$morecss : '').'" type="color" data-default="'.$default.'" value="'.dol_escape_htmltag(preg_match('/^#/', $color) ? $color : '#'.$color).'" />';
$out .= '<script nonce="'.getNonce().'" type="text/javascript">
jQuery(document).ready(function(){
var originalhex = null;
@ -977,7 +977,7 @@ class FormOther
});
</script>';
}
$out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
$out .= '<select id="colorpicker'.$prefix.'" class="colorpicker flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
//print '<option value="-1">&nbsp;</option>';
foreach ($arrayofcolors as $val) {
$out .= '<option value="'.$val.'"';

View file

@ -2370,8 +2370,9 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
$nophoto = '/public/theme/common/user_woman.png';
}
$userImage = '<img class="photo photouserphoto userphoto" alt="" src="'.DOL_URL_ROOT.$nophoto.'" aria-hidden="true">';
$userDropDownImage = '<img class="photo dropdown-user-image" alt="" src="'.DOL_URL_ROOT.$nophoto.'">';
$userImage = img_picto('', 'user', 'class="photo photouserphoto userphoto"');
//$userImage = '<img class="photo photouserphoto userphoto" alt="" src="'.DOL_URL_ROOT.$nophoto.'" aria-hidden="true">';
$userDropDownImage = '<img class="photo dropdown-user-image" alt="" src="'.DOL_URL_ROOT.$nophoto.'" aria-hidden="true">';
}
$dropdownBody = '';

View file

@ -3733,7 +3733,8 @@ img.login, img.printer, img.entity {
}
.userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto { /* size for user photo in login bar */
.userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto,
.userimg.atoplogin span.userphoto, .userimgatoplogin span.userphoto { /* size for user photo in login bar */
width: <?php echo $disableimages ? '26' : '30'; ?>px;
height: <?php echo $disableimages ? '26' : '30'; ?>px;
border-radius: 50%;
@ -3748,6 +3749,16 @@ img.userphoto { /* size for user photo in lists */
background-size: contain;
vertical-align: middle;
}
.userimg.atoplogin span.userphoto, .userimgatoplogin span.userphoto {
vertical-align: middle;
color: unset;
}
.userimg.atoplogin span.userphoto::before, .userimgatoplogin span.userphoto::before {
margin-top: 7px;
display: inline-block;
margin-right: 8px;
}
span.userimg div.userphoto {
background-color: #eee;
border-radius: 0.72em;
@ -5070,9 +5081,9 @@ tr.liste_titre_topborder td {
border-top-color: var(--colortopbordertitle1);
border-top-style: solid;
}
.liste_titre td a {
.liste_titre td a, .liste_titre td a span {
text-shadow: none !important;
color: var(--colortexttitle);
color: var(--colortexttitle) !important;
}
.liste_titre td a.notasortlink {
color: var(--colortextlink);
@ -6771,6 +6782,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
.colorselector {
border: solid 1px #ddd !important;
}
input.colorpicker {
color: unset !important;
background-color: unset !important;
}
/* ============================================================================== */

View file

@ -1629,7 +1629,7 @@ div.divsearchfield {
.divsearchfieldfilter {
text-overflow: clip;
overflow: auto;
white-space: nowrap;
/* white-space: nowrap; */
padding-bottom: 5px;
opacity: 0.6;
font-size: small;
@ -3808,7 +3808,8 @@ img.login, img.printer, img.entity {
color: white;
font-weight: bold;
}
.userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto { /* size for user photo in login bar */
.userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto,
.userimg.atoplogin span.userphoto, .userimgatoplogin span.userphoto { /* size for user photo in login bar */
/* border-radius: 8px; */
width: <?php echo $disableimages ? '26' : '30'; ?>px;
height: <?php echo $disableimages ? '26' : '30'; ?>px;
@ -3823,6 +3824,16 @@ img.userphoto { /* size for user photo in lists */
background-size: contain;
vertical-align: middle;
}
.userimg.atoplogin span.userphoto, .userimgatoplogin span.userphoto {
vertical-align: middle;
color: unset;
}
.userimg.atoplogin span.userphoto::before, .userimgatoplogin span.userphoto::before {
margin-top: 7px;
display: inline-block;
margin-right: 1px;
}
span.userimg div.userphoto {
background-color: #eee;
border-radius: 0.72em;
@ -5564,12 +5575,19 @@ div.fiche div.info, div.fiche div.warning, div.fiche div.neutral {
margin: 1em 0em 1.2em 0em;
}
/* Info message */
/* Neutral message */
div.neutral {
border-<?php print $left; ?>: solid 5px #aaa;
background: #f8f8f8;
}
/* Info message */
div.info {
border-<?php print $left; ?>: solid 5px #87cfd2;
background: #eff8fc;
color: #558;
}
/* Ok message */
div.green div.greenborder, section.green, section.greenborder {
border-<?php print $left; ?>: solid 5px #118822;
@ -6655,6 +6673,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
.colorselector {
border: solid 1px #ddd !important;
}
input.colorpicker {
color: unset !important;
background-color: unset !important;
}
/* ============================================================================== */