From d9682df682254fa2096774b4ac00d535533d6e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 10 Dec 2020 17:37:44 +0100 Subject: [PATCH 1/4] hide also topmenu if disabled --- htdocs/core/js/lib_foot.js.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php index d04379210a6..8419f76bfc1 100644 --- a/htdocs/core/js/lib_foot.js.php +++ b/htdocs/core/js/lib_foot.js.php @@ -196,3 +196,7 @@ print ' } }); });'."\n"; +// hide topmenus disabled +if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { + print '$("li:has(.tmenudisabled)").hide();'; +} From 8882759e7af40641826cbc893c37f18dcf10c79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 11 Dec 2020 17:55:08 +0100 Subject: [PATCH 2/4] hide topmenu option in config/display --- htdocs/admin/ihm.php | 14 ++++++++++++-- htdocs/core/js/lib_foot.js.php | 4 ---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index ad2cd408471..417fccafdb6 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -156,7 +156,8 @@ if ($action == 'update') dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT", GETPOST("main_size_shortliste_limit", 'int'), 'chaine', 0, '', $conf->entity); //dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", GETPOST("MAIN_DISABLE_JAVASCRIPT", 'aZ09'), 'chaine', 0, '', $conf->entity); - dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity); + //dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity); + //dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", GETPOST("MAIN_MENU_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_START_WEEK", GETPOST("MAIN_START_WEEK", 'int'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", GETPOST("MAIN_DEFAULT_WORKING_DAYS", 'alphanohtml'), 'chaine', 0, '', $conf->entity); @@ -327,9 +328,18 @@ print ''; print ' '; print ''; +// Hide unauthorized menus +print ''.$langs->trans("HideUnauthorizedMenu").''; +//print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1); +print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0); +print ''; +print ' '; +print ''; + // Hide unauthorized button print ''.$langs->trans("ButtonHideUnauthorized").''; -print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1); +//print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1); +print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0); print ''; print ' '; print ''; diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php index 8419f76bfc1..d04379210a6 100644 --- a/htdocs/core/js/lib_foot.js.php +++ b/htdocs/core/js/lib_foot.js.php @@ -196,7 +196,3 @@ print ' } }); });'."\n"; -// hide topmenus disabled -if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { - print '$("li:has(.tmenudisabled)").hide();'; -} From e9288ce0dacf013f4a03a92ad42f7d5bca85cdb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 11 Dec 2020 17:58:43 +0100 Subject: [PATCH 3/4] fix translation --- htdocs/admin/ihm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 417fccafdb6..ba223efb103 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -364,7 +364,7 @@ print ''; // Hide wiki link on login page $pictohelp = ''; -print ''.$langs->trans("DisableLinkToHelp", $pictohelp).''; +print ''.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).''; print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0); //print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1); print ''; From 0b3a5dc7968c9abfab97e9394ab96958ddc71634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 11 Dec 2020 18:09:37 +0100 Subject: [PATCH 4/4] fix style --- htdocs/admin/ihm.php | 4 ++++ htdocs/core/lib/usergroups.lib.php | 2 ++ 2 files changed, 6 insertions(+) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index ba223efb103..3652c04518d 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -242,6 +242,7 @@ print ''; clearstatcache(); print '
'; +print '
'; print ''; print ''; print ''; @@ -260,12 +261,14 @@ print ''; print ''; print '
'.img_picto('', 'language').' '.$langs->trans("Language").'

'."\n"; +print '
'; // Themes and themes options showSkins(null, 1); print '
'; // Other +print '
'; print ''; print ''; print ''."\n"; print '
'.$langs->trans("Miscellaneous").' '; @@ -391,6 +394,7 @@ $doleditor->Create(); print '
'."\n"; +print '
'; print '
'; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 9277ebbd81b..913112e04e6 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -315,6 +315,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) if ($foruserprofile) $colspan = 4; $thumbsbyrow = 6; + print '
'; print ''; // Title @@ -911,4 +912,5 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) } else { } print '
'; + print '
'; }