Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0

Browse Source
This commit is contained in:
Laurent Destailleur
2024-08-03 15:01:24 +02:00
parent 64b535acd3
commit 35293e75c8
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/multicompany_page.php
View File

@@ -58,6 +58,9 @@ $langs->load("main");
$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
if (!isModEnabled('multicompany')) {
httponly_accessforbidden('No multicompany module enabled');
}
/*
@@ -113,15 +116,15 @@ if (!isModEnabled('multicompany')) {
$listofentities = array();
}
$multicompanyList .= '<ul class="ullistonly left" style="list-style: none;">';
$multicompanyList .= '<ul class="ullistonly left" style="list-style: none; padding: 0">';
foreach ($listofentities as $entityid => $entitycursor) {
$url = DOL_URL_ROOT.'/core/multicompany_page.php?action=switchentity&token='.newToken().'&entity='.((int) $entityid).($backtourl ? '&backtourl='.urlencode($backtourl) : '');
$multicompanyList .= '<li class="lilistonly" style="height: 2.5em; font-size: 1.15em;">';
$multicompanyList .= '<a class="dropdown-item multicompany-item" id="multicompany-item-'.$entityid.'" data-id="'.$entityid.'" href="'.dol_escape_htmltag($url).'">';
$multicompanyList .= '<a class="dropdown-item multicompany-item paddingtopimp paddingbottomimp" id="multicompany-item-'.$entityid.'" data-id="'.$entityid.'" href="'.dol_escape_htmltag($url).'">';
$multicompanyList .= img_picto('', 'entity', 'class="pictofixedwidth"');
$multicompanyList .= dol_escape_htmltag($entitycursor);
if ($conf->entity == $entityid) {
$multicompanyList .= ' <span class="opacitymedium">('.$langs->trans("Currently").')</span>';
$multicompanyList .= ' <span class="opacitymedium">'.img_picto($langs->trans("Currently"), 'tick').'</span>';
}
$multicompanyList .= '</a>';
$multicompanyList .= '</li>';

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

@@ -1024,12 +1024,18 @@ td.wordbreak img, td.wordbreakimp img {
.paddingtop {
padding-top: 4px;
}
.paddingtopimp {
padding-top: 4px !important;
}
.paddingtop2 {
padding-top: 2px;
}
.paddingbottom {
padding-bottom: 4px;
}
.paddingbottomimp {
padding-bottom: 4px !important;
}
.paddingbottom2 {
padding-bottom: 2px;
}