NEW: Param to show main menu logo in color look and feel (#29305)

* NEW: Param to show main menu logo in color look and feel * Update ChangeLog --------- Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Dolibarr · Apr 28, 2024 · 499a493 · 499a493
1 parent a08714e
commit 499a493
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -8,7 +8,8 @@ English Dolibarr ChangeLog
 For users:
 ----------
 NEW: Compatibility with PHP 8.2 (with no need to disable warnings)
-NEW: Font param Look and Feel THEME_FONT_FAMILY
+NEW: Font param Look and Feel THEME_FONT_FAMILY (#29302)
+NEW: Param to show main menu logo in color (#29305)
 ...
 
 For developers or integrators:

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
@@ -588,6 +588,23 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 print "</tr>";*/
 	}
 
+	// Main menu color logo
+	if ($foruserprofile) {
+		// Nothing
+	} else {
+		// Show logo
+		print '<tr class="oddeven"><td class="titlefieldmiddle">'.$langs->trans("THEME_MENU_COLORLOGO").'</td>';
+		print '<td colspan="'.($colspan - 1).'" class="valignmiddle">';
+		if ($edit) {
+			print ajax_constantonoff('THEME_MENU_COLORLOGO', array(), null, 0, 0, 1);
+		} else {
+			print yn(getDolGlobalString('THEME_MENU_COLORLOGO'));
+		}
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');
+		print '</td>';
+		print '</tr>';
+	}
+
 	// BorderTableActive
 	if ($foruserprofile) {
 	} else {

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
@@ -1216,7 +1216,8 @@ BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
 EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
+EnableShowLogo=Show the company logos in the menu
+THEME_MENU_COLORLOGO=Show main menu logo in color 
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
 CompanyAddress=Address

diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -116,7 +116,11 @@
 	margin-left: 30px;
 }
 .tmenu span.fas, .tmenu span.far {
-	color: unset !important;
+	<?php
+	if (!getDolGlobalString('THEME_MENU_COLORLOGO')) {
+		echo "color: unset !important;";
+	}
+	?>;
 	line-height: 28px;
 	text-align: center;
 }

diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -98,7 +98,11 @@
 }
 
 .tmenu span.fas, .tmenu span.far {
-	color: unset !important;
+	<?php
+	if (!getDolGlobalString('THEME_MENU_COLORLOGO')) {
+		echo "color: unset !important;";
+	}
+	?>;
 	line-height: 28px;
 	text-align: center;
 }