lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug v16

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-14 11:47:56 +02:00
parent f0f24291d4
commit 293b08ab1d
8 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/ihm.php
View File

@ -99,6 +99,8 @@ if ($action == 'update') {
$error = 0;
if ($mode == 'template') {
//dolibarr_del_const($db, "MAIN_THEME", 0); // To be sure we don't have this constant set for all entities
dolibarr_set_const($db, "MAIN_THEME", GETPOST("main_theme", 'aZ09'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);

7
htdocs/core/lib/usergroups.lib.php
View File

@ -372,7 +372,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print '</th></tr>';
}
print '<tr><td colspan="'.$colspan.'">';
print '<tr><td colspan="'.$colspan.'" class="center">';
if (!empty($conf->global->MAIN_FORCETHEME)) {
$langs->load("errors");
print $langs->trans("WarningThemeForcedTo", $conf->global->MAIN_FORCETHEME);
}
print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';

3
htdocs/langs/en_US/errors.lang
View File

@ -322,7 +322,8 @@ WarningCreateSubAccounts=Warning, you can't create directly a sub account, you m
WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
# Validate
RequireValidValue = Value not valid
RequireAtLeastXString = Requires at least %s character(s)

9
htdocs/theme/eldy/global.inc.php
View File

@ -2377,6 +2377,9 @@ img.photoref, div.photoref {
width: 80px;
object-fit: contain;
}
img.photokanban, div.photokanban {
padding: 0;
}
div.photoref .fa, div.photoref .fas, div.photoref .far {
font-size: 2.5em;
}
@ -5339,11 +5342,11 @@ td.cal_other_month {
/* ============================================================================== */
/* CSS for treeview */
.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 2px !important; }
.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 30px; }
.treeview ul { background-color: transparent !important; margin-top: 0 !important; /* margin-bottom: 4px !important; padding-top: 2px !important; */ }
.treeview li { background-color: transparent !important; padding: 0 0 0 20px !important; min-height: 30px; }
.treeview .hitarea { width: 20px !important; margin-left: -20px !important; margin-top: 3px; }
.treeview li table { min-height: 30px; }
.treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
.treeview .hitarea { margin-top: 3px; }
/* ============================================================================== */

1
htdocs/theme/eldy/info-box.inc.php
View File

@ -489,6 +489,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
.box-flex-container {
margin: 0 0 0 0px !important;
width: 100% !important;
justify-content: space-between;
}
.info-box-module {
width: 100%;

2
htdocs/theme/md/info-box.inc.php
View File

@ -193,7 +193,9 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
filter: saturate(<?php echo $conf->global->THEME_SATURATE_RATIO; ?>);
<?php } ?>
}
.info-box-sm .info-box-icon {
height: 80px;
width: 80px;
font-size: 25px;
line-height: 92px;

14
htdocs/theme/md/style.css.php
View File

@ -2399,6 +2399,11 @@ img.photoref, div.photoref {
object-fit: contain;
}
img.photokanban, div.photokanban {
padding: 0;
border: none;
}
div.photoref .fa, div.photoref .fas, div.photoref .far {
font-size: 2.5em;
}
@ -4110,7 +4115,8 @@ tr.liste_titre_topborder td {
background: transparent;
}
tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_titre_sel, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */
border-bottom: 1px solid var(--colortopbordertitle1);
/* border-bottom: 1px solid var(--colortopbordertitle1); */
border-bottom: none;
}
div.liste_titre {
@ -5180,11 +5186,11 @@ td.gtaskname {
/* ============================================================================== */
/* CSS for treeview */
.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 8px !important; }
.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 30px; }
.treeview ul { background-color: transparent !important; margin-top: 0 !important; /* margin-bottom: 4px !important; padding-top: 2px !important; */ }
.treeview li { background-color: transparent !important; padding: 0 0 0 20px !important; min-height: 30px; }
.treeview .hitarea { width: 20px !important; margin-left: -20px !important; margin-top: 3px; }
.treeview li table { min-height: 30px; }
.treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
.treeview .hitarea { margin-top: 3px; }

16
htdocs/user/class/user.class.php
View File

@ -2964,7 +2964,18 @@ class User extends CommonObject
$return = '<div class="box-flex-item box-flex-grow-zero">';
$return .= '<div class="info-box info-box-sm">';
$return .= '<span class="info-box-icon bg-infobox-action">';
$return .= img_picto('', $this->picto);
$label = '';
if (!empty($this->photo)) {
//$label .= '<div class="photointooltip floatright">';
$label .= Form::showphoto('userphoto', $this, 0, 60, 0, 'photokanban photoref photowithmargin photologintooltip', 'small', 0, 1); // Force height to 60 so we total height of tooltip can be calculated and collision can be managed
//$label .= '</div>';
//$label .= '<div style="clear: both;"></div>';
$return .= $label;
} else {
$return .= img_picto('', $this->picto);
}
//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
$return .= '</span>';
$return .= '<div class="info-box-content">';
@ -2972,6 +2983,9 @@ class User extends CommonObject
if (property_exists($this, 'label')) {
$return .= '<br><span class="info-box-label opacitymedium">'.$this->label.'</span>';
}
if ($this->email) {
$return .= '<br><span class="info-box-label opacitymedium small">'.img_picto('', 'email').' '.$this->email.'</span>';
}
if (method_exists($this, 'getLibStatut')) {
$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
}