Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Apr 28, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6b46d3
NEW: Param to show main menu logo in color look and feel
Apr 10, 2024
a81bd73
Update ChangeLog
Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to add entry here. Just put the label to have it as the label of your PR.
ChangeLog will be generated automatically before the release.

...

For developers or integrators:
Expand Down
17 changes: 17 additions & 0 deletions htdocs/core/lib/usergroups.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion htdocs/langs/en_US/admin.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,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
Expand Down
6 changes: 5 additions & 1 deletion htdocs/theme/eldy/main_menu_fa_icons.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 5 additions & 1 deletion htdocs/theme/md/main_menu_fa_icons.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading