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

Fix logo background and hidden conf

Browse Source
This commit is contained in:
John Botella 2019-10-11 10:02:59 +02:00
parent e7f56b67d8
commit 13115a55a2
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/menus/standard/eldy.lib.php
View File

@ -480,6 +480,12 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
{ {
$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI); $mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
$mysoc->logo_squarred_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI); $mysoc->logo_squarred_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
$logoContainerAdditionalClass = 'backgroundforcompanylogo';
if(!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND)){
$logoContainerAdditionalClass = '';
}
if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
{ {
$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini); $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
@ -497,7 +503,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
print "\n".'<!-- Show logo on menu -->'."\n"; print "\n".'<!-- Show logo on menu -->'."\n";
print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo"', 1); print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo"', 1);
print '<div class="center backgroundforcompanylogo"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px"></div>'."\n";
print '<div class="center '.$logoContainerAdditionalClass.' menu-logo-container"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px"></div>'."\n";
print_end_menu_entry(4); print_end_menu_entry(4);
} }

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

@ -1085,19 +1085,21 @@ div.blockvmenulogo
{ {
border-bottom: 0 !important; border-bottom: 0 !important;
} }
.backgroundforcompanylogo { .menu-logo-container {
margin: <?php echo $disableimages?'0':'6'; ?>px; margin: <?php echo $disableimages?'0':'6'; ?>px;
margin-left: 8px; margin-left: 8px;
margin-right: 8px; margin-right: 8px;
background-color: rgba(255,255,255,0.7);
padding: 0; padding: 0;
border-radius: 5px;
height: <?php echo $disableimages?'20':'32'; ?>px; height: <?php echo $disableimages?'20':'32'; ?>px;
/* width: 100px; */ /* width: 100px; */
max-width: 100px; max-width: 100px;
vertical-align: middle; vertical-align: middle;
} }
.backgroundforcompanylogo img.mycompany { .backgroundforcompanylogo {
background-color: rgba(255,255,255,0.7);
border-radius: 5px;
}
.menu-logo-container img.mycompany {
object-fit: contain; object-fit: contain;
width: inherit; width: inherit;
height: inherit; height: inherit;

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

@ -2253,19 +2253,21 @@ div.blockvmenulogo
{ {
border-bottom: 0 !important; border-bottom: 0 !important;
} }
.backgroundforcompanylogo { .menu-logo-container {
margin: <?php echo $disableimages?'0':'6'; ?>px; margin: <?php echo $disableimages?'0':'6'; ?>px;
margin-left: 12px; margin-left: 12px;
margin-right: 6px; margin-right: 6px;
background-color: rgba(255,255,255,0.7);
padding: 0; padding: 0;
border-radius: 5px;
height: <?php echo $disableimages?'20':'32'; ?>px; height: <?php echo $disableimages?'20':'32'; ?>px;
/* width: 100px; */ /* width: 100px; */
max-width: 100px; max-width: 100px;
vertical-align: middle; vertical-align: middle;
} }
.backgroundforcompanylogo img.mycompany { .backgroundforcompanylogo {
background-color: rgba(255,255,255,0.7);
border-radius: 5px;
}
.menu-logo-container img.mycompany {
object-fit: contain; object-fit: contain;
width: inherit; width: inherit;
height: inherit; height: inherit;