diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index b07a7984e09..53b75aa0c11 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -264,7 +264,7 @@ if ($action == 'edit') // Edit // Other print ''; - print ''; + print ''; print ''; print ''; @@ -330,13 +330,6 @@ if ($action == 'edit') // Edit print ''; print ''; - // Show logo - print ''; - print ''; - print ''; - // Hide version link /* @@ -472,7 +465,7 @@ else // Show // Other print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'.$langs->trans("Miscellaneous").' 
 
'.$langs->trans("EnableShowLogo").''; - print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1); - print ' 
'; - print ''; + print ''; // Disable javascript/ajax print ''; print ''; - // DefaultWorkingDays + // Default Working Days print ''; print ''; - // DefaultWorkingHours + // Default Working Hours print ''; @@ -519,10 +512,6 @@ else // Show print yn((isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0), 1); print ''; - // Show logo - print ''; - print ""; - // Hide version link /* print ''; + $dirthemestring = ''; + foreach($dirthemes as $dirtheme) + { + $dirthemestring .= '"'.$dirtheme.'" '; + } + + print ''; print ''; - - print ''; - print ''; - print ''; - print ''; } print ''; + // Show logo + if ($foruserprofile) + { + // Nothing + } + else + { + // Show logo + print ''; + print ''; + /* + print ''; + print "";*/ + } + + // TopMenuDisableImages if ($foruserprofile) { diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 22515f9a76f..e38b8a66736 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -794,7 +794,7 @@ table[summary="list_of_modules"] .fa-cog { .hideobject { display: none; } .minwidth50 { min-width: 50px; } /* rule for not too small screen only */ -@media only screen and (min-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) +@media only screen and (min-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) { .width25 { width: 25px; } .width50 { width: 50px; } @@ -1166,7 +1166,7 @@ div.vmenu, td.vmenu { .menuhider { display: none !important; } /* rule to reduce top menu - 3rd reduction: The menu for user is on left */ -@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */ +@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */ { body.sidebar-collapse .side-nav { display: none; @@ -5759,7 +5759,7 @@ div.tabsElem a.tab { } } /* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */ -@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px) /* reduction 2 */ +@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px) /* reduction 2 */ { li.tmenucompanylogo { display: none; @@ -5786,7 +5786,7 @@ div.tabsElem a.tab { } } /* rule to reduce top menu - 3rd reduction: The menu for user is on left */ -@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */ +@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */ { .side-nav { z-index: 200; diff --git a/htdocs/theme/eldy/thumb.png b/htdocs/theme/eldy/thumb.png index 6b4c467bead..5c385e6a6ea 100644 Binary files a/htdocs/theme/eldy/thumb.png and b/htdocs/theme/eldy/thumb.png differ diff --git a/htdocs/theme/md/thumb.png b/htdocs/theme/md/thumb.png index 97102ab78ca..f7d11f9a536 100644 Binary files a/htdocs/theme/md/thumb.png and b/htdocs/theme/md/thumb.png differ
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'.$langs->trans("Miscellaneous").'
'.$langs->trans("DisableJavascript").''; @@ -495,13 +488,13 @@ else // Show print '
'.$langs->trans("DefaultWorkingDays").''; print isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5'; print '
'.$langs->trans("DefaultWorkingHours").''; print isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18'; print '
'.$langs->trans("EnableShowLogo").'' . yn($conf->global->MAIN_SHOW_LOGO) . '
'.$langs->trans("HideVersionLink").''; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index b4140ba90a7..66698be76cc 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -348,23 +348,21 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) } else { - print '
'.$langs->trans("DefaultSkin").'
'; + print $form->textwithpicto($langs->trans("DefaultSkin"), $langs->trans("ThemeDir").' : '.$dirthemestring); + print ''; $url='https://www.dolistore.com/4-skins'; print ''; print $langs->trans('DownloadMoreSkins'); print ''; print '
'.$langs->trans("ThemeDir").''; - foreach($dirthemes as $dirtheme) - { - echo '"'.$dirtheme.'" '; - } - print '
'; @@ -422,6 +420,31 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) print '
'.$langs->trans("EnableShowLogo").''; + if ($edit) + { + print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1); + } + else + { + print yn($conf->global->MAIN_SHOW_LOGO); + } + print '
'.$langs->trans("EnableShowLogo").'' . yn($conf->global->MAIN_SHOW_LOGO) . '